-introduce #define for + in GADS

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

diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 038f9f4d35e48405294dc8ee669d92e522b4f2ff..3f212eabd2a8ab806a08b65dd7a57c760f691359 100644 (file)
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -10,6 +10,8 @@ EXTRA_DIST = \
   test_gns_defaults.conf \
   test_gns_simple_lookup.conf \
   test_gns_dht_default.conf \
+  gns-helper-service-w32.conf \
+  gnunet-gns-proxy-setup-ca \
   zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey \
   zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey \
   zonefiles/test_zonekey
@@ -20,6 +22,8 @@ if MINGW
   DO_W32_NSP = libw32nsp.la
   DO_W32_NSPTOOLS = w32nsp-install w32nsp-uninstall w32nsp-resolve
   DO_W32_HS_CONF = gns-helper-service-w32.conf
+else
+  USE_VPN = $(top_builddir)/src/vpn/libgnunetvpn.la
 endif
 
 if USE_COVERAGE
@@ -50,10 +54,9 @@ endif
 endif
 
 libexec_PROGRAMS = \
-  gnunet-service-gns 
+  gnunet-service-gns $(DO_FCFSD)
 
 bin_PROGRAMS = \
-  $(DO_FCFSD) \
   $(DO_PROXY) \
   $(DO_W32_HELPER) \
   $(DO_W32_NSPTOOLS) \
@@ -130,7 +133,7 @@ gnunet_service_gns_LDADD = \
        $(top_builddir)/src/dns/libgnunetdnsparser.la \
        $(top_builddir)/src/dht/libgnunetdht.la \
        $(top_builddir)/src/namestore/libgnunetnamestore.la \
-       $(top_builddir)/src/vpn/libgnunetvpn.la \
+       $(USE_VPN) \
   $(GN_LIBINTL)
 gnunet_service_gns_DEPENDENCIES = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -140,7 +143,7 @@ gnunet_service_gns_DEPENDENCIES = \
        $(top_builddir)/src/dns/libgnunetdnsparser.la \
        $(top_builddir)/src/dht/libgnunetdht.la \
        $(top_builddir)/src/namestore/libgnunetnamestore.la \
-       $(top_builddir)/src/vpn/libgnunetvpn.la
+       $(USE_VPN)