-simplify

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

diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index 16161a6355e28876e0d217f5b313576eab6af416..726251aec03851ac6f04c1a3e2aea947a1d3221c 100644 (file)
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -1,5 +1,12 @@
 INCLUDES = -I$(top_srcdir)/src/include
 
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+dist_pkgcfg_DATA = \
+  hostlist.conf
+
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
 endif
@@ -9,8 +16,10 @@ if HAVE_MHD
  GN_LIBMHD = -lmicrohttpd
 endif
 
-bin_PROGRAMS = \
+if HAVE_LIBCURL
+libexec_PROGRAMS = \
  gnunet-daemon-hostlist
+endif
 
 gnunet_daemon_hostlist_SOURCES = \
  gnunet-daemon-hostlist.c gnunet-daemon-hostlist.h \
@@ -25,42 +34,54 @@ gnunet_daemon_hostlist_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBMHD) \
-  @LIBCURL@ \
+  @LIBCURL@  \
   $(GN_LIBINTL)
 
 gnunet_daemon_hostlist_CPPFLAGS = \
  @LIBCURL_CPPFLAGS@ 
 
+if HAVE_LIBCURL
 check_PROGRAMS = \
  test_gnunet_daemon_hostlist \
+ test_gnunet_daemon_hostlist_reconnect \
  test_gnunet_daemon_hostlist_learning
 
 if HAVE_MHD
+if ENABLE_TEST_RUN
 TESTS = \
  test_gnunet_daemon_hostlist \
+ test_gnunet_daemon_hostlist_reconnect \
  test_gnunet_daemon_hostlist_learning
 endif
+endif
+endif
 
 test_gnunet_daemon_hostlist_SOURCES = \
  test_gnunet_daemon_hostlist.c
 test_gnunet_daemon_hostlist_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la \
-  $(top_builddir)/src/arm/libgnunetarm.la \
+  $(top_builddir)/src/util/libgnunetutil.la  
+
+test_gnunet_daemon_hostlist_reconnect_SOURCES = \
+ test_gnunet_daemon_hostlist_reconnect.c
+test_gnunet_daemon_hostlist_reconnect_LDADD = \
+  $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/util/libgnunetutil.la  
 
 test_gnunet_daemon_hostlist_learning_SOURCES = \
  test_gnunet_daemon_hostlist_learning.c
 test_gnunet_daemon_hostlist_learning_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la \
-  $(top_builddir)/src/arm/libgnunetarm.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la  
 
 EXTRA_DIST = \
+  test_hostlist_defaults.conf \
   test_gnunet_daemon_hostlist_data.conf \
   test_gnunet_daemon_hostlist_peer1.conf \
   test_gnunet_daemon_hostlist_peer2.conf \
-  learning_data.conf \
-  learning_peer1.conf \
-  learning_peer2.conf
\ No newline at end of file
+  test_learning_adv_peer.conf \
+  test_learning_learn_peer.conf \
+  test_learning_learn_peer2.conf \
+  learning_data.conf