[3516] added/updated Makefiles

diff --git a/Makefile.am b/Makefile.am
index f5803367797c868904249eaf879642f5eb167dc1..12bf76b326fe2d872beb13a949142e14c74c3361 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
 # ^^^^^^^^ This has to be the first line and cannot come later in this
 # Makefile.am due to some bork in some versions of autotools.
 
-SUBDIRS = compatcheck doc . ext src tests m4macros
+SUBDIRS = compatcheck tools doc . ext src tests m4macros
 USE_LCOV=@USE_LCOV@
 LCOV=@LCOV@
 GENHTML=@GENHTML@

diff --git a/configure.ac b/configure.ac
index e9161b341fc3d2cdbf5363d9227d6fd7d69c85a8..0eda398d2e7364ffb6050bc1cb43e6e18b381eb6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1473,6 +1473,7 @@ AC_CONFIG_FILES([compatcheck/Makefile
                  src/lib/util/threads/Makefile
                  src/lib/util/threads/tests/Makefile
                  src/lib/util/unittests/Makefile
+                 tools/Makefile
                  tools/path_replacer.sh
                  tests/Makefile
                  tests/tools/Makefile

diff --git a/doc/guide/Makefile.am b/doc/guide/Makefile.am
index 20e5bdfdd8fe68a077a0eed39fc3eb20e4e15558..6be5af0017ae60d703fa30d3938154554146304a 100644 (file)
--- a/doc/guide/Makefile.am
+++ b/doc/guide/Makefile.am
@@ -13,7 +13,7 @@ EXTRA_DIST = $(DOCBOOK)
 DISTCLEANFILES = $(HTMLDOCS) $(DOCS) kea-messages.xml
 
 kea-messages.xml:
-       $(PYTHON) $(top_srcdir)/tools/system_messages.py -o $@ \
+       $(top_srcdir)/tools/system_messages -o $@ \
        `find $(top_srcdir) -name "*.mes" -print`
 
 # This is not a "man" manual, but reuse this for now for docbook.

diff --git a/tools/Makefile.am b/tools/Makefile.am
new file mode 100644 (file)
index 0000000..d82fb78
--- /dev/null
+++ b/tools/Makefile.am
@@ -0,0 +1,16 @@
+AM_CPPFLAGS = $(BOOST_INCLUDES)
+
+AM_CXXFLAGS = $(KEA_CXXFLAGS)
+
+if USE_STATIC_LINK
+AM_LDFLAGS = -static
+endif
+
+CLEANFILES = *.gcno *.gcda
+
+if GENERATE_DOCS
+
+noinst_PROGRAMS = system_messages
+system_messages_SOURCES = system_messages.cc
+
+endif
\ No newline at end of file