RECLAIM/OIDC: code cleanup

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

diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index 5d5a94b5d2f3925b186677b72ca01e7d590e79b6..17f0bdfa08cf670411f7856c737e76db5642ee06 100644 (file)
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -1,11 +1,10 @@
+# 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
@@ -22,12 +21,16 @@ 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
 
@@ -56,16 +59,21 @@ check_PROGRAMS = \
  test_gnunet_daemon_hostlist \
  test_gnunet_daemon_hostlist_reconnect \
  test_gnunet_daemon_hostlist_learning
-
-if HAVE_MHD
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
-TESTS = \
+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 = \
+ $(check_PROGRAMS)
+endif
 endif
 
 test_gnunet_daemon_hostlist_SOURCES = \