fix more 'make dist' issues

[oweals/gnunet.git] / src / dht / Makefile.am

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 2270d094b4a77c5df2f4efea9c1ff8c65fa13a47..d60ff62d6146e3e03d65b9555518924455bc1415 100644 (file)
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -1,4 +1,5 @@
-INCLUDES = -I$(top_srcdir)/src/include
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 if MINGW
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols -lole32 -lshell32 -liconv -lstdc++ -lcomdlg32 -lgdi32
 endif
@@ -10,11 +11,7 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 libexecdir= $(pkglibdir)/libexec/
 
 pkgcfg_DATA = \
-  dht.conf 
-
-if HAVE_ZLIB
- ZLIB_LNK = -lz
-endif
+  dht.conf
 
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
@@ -22,52 +19,54 @@ if USE_COVERAGE
 endif
 
 lib_LTLIBRARIES = \
- libgnunetdht.la 
+ libgnunetdht.la
 
 libgnunetdht_la_SOURCES = \
-  dht_api.c dht.h 
+  dht_api.c dht.h
 libgnunetdht_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(XLIB) \
   $(LTLIBINTL)
 libgnunetdht_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 1:0:1
+  -version-info 3:0:0
 
 
 plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_dht.la 
+  libgnunet_plugin_block_dht.la
 
 libgnunet_plugin_block_dht_la_SOURCES = \
   plugin_block_dht.c
 libgnunet_plugin_block_dht_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/block/libgnunetblock.la \
+  $(top_builddir)/src/block/libgnunetblockgroup.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(LTLIBINTL)
 libgnunet_plugin_block_dht_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_block_dht_la_DEPENDENCIES = \
-  $(top_builddir)/src/block/libgnunetblock.la 
-
 
 
 libexec_PROGRAMS = \
- gnunet-service-dht 
+ gnunet-service-dht
 
-noinst_PROGRAMS = \
+bin_PROGRAMS = \
  gnunet-dht-monitor \
  gnunet-dht-get \
  gnunet-dht-put
 
+if HAVE_TESTING
+noinst_PROGRAMS = \
+ gnunet-dht-profiler
+endif
+
 gnunet_service_dht_SOURCES = \
  gnunet-service-dht.c gnunet-service-dht.h \
- gnunet-service-dht_clients.c gnunet-service-dht_clients.h \
  gnunet-service-dht_datacache.c gnunet-service-dht_datacache.h \
  gnunet-service-dht_hello.c gnunet-service-dht_hello.h \
  gnunet-service-dht_nse.c gnunet-service-dht_nse.h \
  gnunet-service-dht_neighbours.c gnunet-service-dht_neighbours.h \
- gnunet-service-dht_routing.c gnunet-service-dht_routing.h 
+ gnunet-service-dht_routing.c gnunet-service-dht_routing.h
 gnunet_service_dht_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/core/libgnunetcore.la \
@@ -82,44 +81,46 @@ gnunet_service_dht_LDADD = \
   -lm
 
 gnunet_dht_get_SOURCES = \
- gnunet-dht-get.c         
+ gnunet-dht-get.c
 gnunet_dht_get_LDADD = \
-  $(top_builddir)/src/dht/libgnunetdht.la \
+  libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
-gnunet_dht_get_DEPENDENCIES = \
-  libgnunetdht.la                            
+  $(top_builddir)/src/util/libgnunetutil.la
 
 gnunet_dht_put_SOURCES = \
- gnunet-dht-put.c         
+ gnunet-dht-put.c
 gnunet_dht_put_LDADD = \
-  $(top_builddir)/src/dht/libgnunetdht.la \
+  libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
-gnunet_dht_put_DEPENDENCIES = \
-  libgnunetdht.la                            
+  $(top_builddir)/src/util/libgnunetutil.la
 
 gnunet_dht_monitor_SOURCES = \
- gnunet-dht-monitor.c         
+ gnunet-dht-monitor.c
 gnunet_dht_monitor_LDADD = \
-  $(top_builddir)/src/dht/libgnunetdht.la \
+  libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
-gnunet_dht_monitor_DEPENDENCIES = \
-  libgnunetdht.la                            
+  $(top_builddir)/src/util/libgnunetutil.la
 
+gnunet_dht_profiler_SOURCES = \
+  gnunet_dht_profiler.c
+gnunet_dht_profiler_LDADD = \
+  libgnunetdht.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testbed/libgnunettestbed.la
 
+if HAVE_TESTING
 noinst_LIBRARIES = libgnunetdhttest.a
+endif
 
 libgnunetdhttest_a_SOURCES = \
   dht_test_lib.c dht_test_lib.h
 libgnunetdhttest_a_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la
-libgnunetdhttest_a_DEPENDENCIES = \
-  libgnunetdht.la   
+ libgnunetdht.la
 
+if HAVE_TESTING
 check_PROGRAMS = \
  test_dht_api \
  test_dht_twopeer \
@@ -127,19 +128,21 @@ check_PROGRAMS = \
  test_dht_line \
  test_dht_2dtorus \
  test_dht_monitor
+endif
 
 if HAVE_EXPERIMENTAL
 # These tests still do not work as testbed does
 # not support the respective topology op
- NEW_TESTS = test_dht_2dtorus test_dht_multipeer 
+ NEW_TESTS = test_dht_2dtorus test_dht_multipeer
 endif
 
 if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = test_dht_api $(check_SCRIPTS) \
  test_dht_twopeer \
  test_dht_line \
  test_dht_monitor \
- $(NEW_TESTS) 
+ $(NEW_TESTS)
 endif
 
 test_dht_api_SOURCES = \
@@ -148,65 +151,55 @@ test_dht_api_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/dht/libgnunetdht.la
-test_dht_api_DEPENDENCIES = \
-  libgnunetdht.la                          
+ libgnunetdht.la
 
 test_dht_twopeer_SOURCES = \
  test_dht_topo.c
 test_dht_twopeer_LDADD = \
+ libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing_old/libgnunettesting_old.la \
- $(top_builddir)/src/dht/libgnunetdht.la    
-test_dht_twopeer_DEPENDENCIES = \
-  libgnunetdht.la                          
+ libgnunetdhttest.a \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
+ libgnunetdht.la
 
 test_dht_2dtorus_SOURCES = \
  test_dht_topo.c
 test_dht_2dtorus_LDADD = \
- $(top_builddir)/src/dht/libgnunetdhttest.a \
+ libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la
-test_dht_2dtorus_DEPENDENCIES = \
-  libgnunetdht.la
+ libgnunetdht.la
 
 test_dht_line_SOURCES = \
  test_dht_topo.c
 test_dht_line_LDADD = \
- $(top_builddir)/src/dht/libgnunetdhttest.a \
+ libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la 
-test_dht_line_DEPENDENCIES = \
-  libgnunetdht.la
+ libgnunetdht.la
 
 test_dht_multipeer_SOURCES = \
  test_dht_topo.c
 test_dht_multipeer_LDADD = \
- $(top_builddir)/src/dht/libgnunetdhttest.a \
+ libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la  
-test_dht_multipeer_DEPENDENCIES = \
-  libgnunetdht.la                          
+ libgnunetdht.la
 
 test_dht_monitor_SOURCES = \
   test_dht_monitor.c
 test_dht_monitor_LDADD = \
- $(top_builddir)/src/dht/libgnunetdhttest.a \
+ libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la
-test_dht_monitor_DEPENDENCIES = \
-  libgnunetdht.la
+ libgnunetdht.la
 
 EXTRA_DIST = \
   $(check_SCRIPTS) \
+  gnunet-service-dht_clients.c \
   test_dht_api_data.conf \
   test_dht_api_peer1.conf \
-  test_dht_twopeer_data.conf \
   test_dht_monitor.conf \
   test_dht_multipeer.conf \
   test_dht_2dtorus.conf \
@@ -214,12 +207,15 @@ EXTRA_DIST = \
   test_dht_tools.py.in \
   test_dht_multipeer_topology.dat
 
+if HAVE_PYTHON
 check_SCRIPTS = \
   test_dht_tools.py
+endif
 
-do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
+do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' -e 's,[@]bindir[@],$(bindir),g'
 
-%.py: %.py.in Makefile
+SUFFIXES = .py.in .py
+.py.in.py:
        $(do_subst) < $(srcdir)/$< > $@
        chmod +x $@