RECLAIM/OIDC: code cleanup

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

diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index 38c065cbf5a95956a4069d87d62bc54492ee29c9..17f0bdfa08cf670411f7856c737e76db5642ee06 100644 (file)
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -1,29 +1,42 @@
+# This Makefile.am is in the public domain
 AM_CPPFLAGS = -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
 
 if HAVE_MHD
- HOSTLIST_SERVER_SOURCES =  hostlist-server.c hostlist-server.h 
+ HOSTLIST_SERVER_SOURCES = \
+   gnunet-daemon-hostlist_server.c gnunet-daemon-hostlist_server.h
  GN_LIBMHD = -lmicrohttpd
 endif
 
+if HAVE_LIBGNURL
+libexec_PROGRAMS = \
+ gnunet-daemon-hostlist
+LIB_GNURL=@LIBGNURL@
+CPP_GNURL=@LIBGNURL_CPPFLAGS@
+dist_pkgcfg_DATA = \
+  hostlist.conf
+else
 if HAVE_LIBCURL
 libexec_PROGRAMS = \
  gnunet-daemon-hostlist
+LIB_GNURL=@LIBCURL@
+CPP_GNURL=@LIBCURL_CPPFLAGS@
+dist_pkgcfg_DATA = \
+  hostlist.conf
+endif
 endif
 
 gnunet_daemon_hostlist_SOURCES = \
  gnunet-daemon-hostlist.c gnunet-daemon-hostlist.h \
- hostlist-client.c hostlist-client.h \
+ gnunet-daemon-hostlist_client.c gnunet-daemon-hostlist_client.h \
  $(HOSTLIST_SERVER_SOURCES)
 
 gnunet_daemon_hostlist_LDADD = \
@@ -34,25 +47,32 @@ gnunet_daemon_hostlist_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBMHD) \
-  @LIBCURL@  \
+  $(LIB_GNURL) \
   $(GN_LIBINTL)
 
 gnunet_daemon_hostlist_CPPFLAGS = \
- @LIBCURL_CPPFLAGS@  $(AM_CPPFLAGS)
+ $(CPP_GNURL) \
+ $(AM_CPPFLAGS)
 
+if HAVE_LIBGNURL
+check_PROGRAMS = \
+ test_gnunet_daemon_hostlist \
+ test_gnunet_daemon_hostlist_reconnect \
+ test_gnunet_daemon_hostlist_learning
+else
 if HAVE_LIBCURL
 check_PROGRAMS = \
  test_gnunet_daemon_hostlist \
  test_gnunet_daemon_hostlist_reconnect \
  test_gnunet_daemon_hostlist_learning
+endif
+endif
 
 if HAVE_MHD
 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_gnunet_daemon_hostlist \
- test_gnunet_daemon_hostlist_reconnect \
- test_gnunet_daemon_hostlist_learning
-endif
+ $(check_PROGRAMS)
 endif
 endif
 
@@ -60,13 +80,13 @@ test_gnunet_daemon_hostlist_SOURCES = \
  test_gnunet_daemon_hostlist.c
 test_gnunet_daemon_hostlist_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la \
-  $(top_builddir)/src/util/libgnunetutil.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  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_gnunet_daemon_hostlist_learning_SOURCES = \
  test_gnunet_daemon_hostlist_learning.c
@@ -74,7 +94,7 @@ test_gnunet_daemon_hostlist_learning_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 EXTRA_DIST = \
   test_hostlist_defaults.conf \