projects / oweals / gnunet.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
-fix
[oweals/gnunet.git] / src / gns / Makefile.am
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 9f732257bf847660f47ce10e21d5a08b4ef335eb..bb8f0bf410375c7dbe87a489a06bf40edc8355f6 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
@@ -28,6 +32,8 @@ endif
 
 pkgcfgdir = $(pkgdatadir)/config.d/
 
+libexecdir= $(pkglibdir)/libexec/
+
 plugindir = $(libdir)/gnunet
 
 pkgcfg_DATA = \
@@ -43,19 +49,22 @@ lib_LTLIBRARIES = \
 if HAVE_MHD
  DO_FCFSD=gnunet-gns-fcfsd
 if HAVE_GNUTLS
+if HAVE_LIBCURL
  DO_PROXY=gnunet-gns-proxy
 endif
 endif
+endif
 
-bin_PROGRAMS = \
-  gnunet-service-gns \
-  $(DO_FCFSD) \
-       $(DO_PROXY) \
+libexec_PROGRAMS = \
+  gnunet-service-gns $(DO_FCFSD) \
+  $(DO_PROXY) \
   $(DO_W32_HELPER) \
-  $(DO_W32_NSPTOOLS) \
-  gnunet-gns \
   gnunet-dns2gns
 
+bin_PROGRAMS = \
+  $(DO_W32_NSPTOOLS) \
+  gnunet-gns 
+
 bin_SCRIPTS = gnunet-gns-proxy-setup-ca
 
 plugin_LTLIBRARIES = \
@@ -121,22 +130,22 @@ gnunet_service_gns_LDADD = \
   -lm \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/gns/libgnunetgns_common.la \
+  libgnunetgns_common.la \
        $(top_builddir)/src/dns/libgnunetdns.la \
        $(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 \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/gns/libgnunetgns_common.la \
+  libgnunetgns_common.la \
        $(top_builddir)/src/dns/libgnunetdns.la \
        $(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)
 
 
 
@@ -172,6 +181,8 @@ libgnunetgns_la_DEPENDENCIES = \
 
 libgnunetgns_common_la_SOURCES = \
  gns_common.c gns_common.h
+libgnunetgns_common_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
 libgnunetgns_common_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la 
 libgnunetgns_common_la_DEPENDENCIES = \
@@ -189,7 +200,7 @@ libgnunet_plugin_block_gns_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_block_gns_la_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/gns/libgnunetgns_common.la \
+  libgnunetgns_common.la \
   $(top_builddir)/src/block/libgnunetblock.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la
 
@@ -213,14 +224,11 @@ check_PROGRAMS = \
 
 if ENABLE_TEST_RUN
 if LINUX
+if HAVE_SQLITE
 TESTS = $(check_PROGRAMS)
 endif
 endif
-
-
-#  test_gns_simple_lookup
-#  test_gns_simple_delegated_lookup
-#  test_gns_dht_delegated_lookup
+endif
 
 
 #test_gns_proxy_SOURCES = \
@@ -233,7 +241,7 @@ endif
 #test_gns_proxy_DEPENDENCIES = \
 #  $(top_builddir)/src/util/libgnunetutil.la \
 #  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-#  $(top_builddir)/src/gns/libgnunetgns.la \
+#  libgnunetgns.la \
 #  $(top_builddir)/src/testing/libgnunettesting.la
 
 test_gns_dht_three_peers_SOURCES = \
@@ -247,7 +255,7 @@ test_gns_dht_three_peers_LDADD = \
 test_gns_dht_three_peers_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  libgnunetgns.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la
 
@@ -261,7 +269,7 @@ test_gns_simple_lookup_LDADD = \
 test_gns_simple_lookup_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  libgnunetgns.la \
   $(top_builddir)/src/testing/libgnunettesting.la
 
 test_gns_simple_delegated_lookup_SOURCES = \
@@ -274,7 +282,7 @@ test_gns_simple_delegated_lookup_LDADD = \
 test_gns_simple_delegated_lookup_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  libgnunetgns.la \
   $(top_builddir)/src/testing/libgnunettesting.la
 
 test_gns_simple_mx_lookup_SOURCES = \
@@ -287,7 +295,7 @@ test_gns_simple_mx_lookup_LDADD = \
 test_gns_simple_mx_lookup_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  libgnunetgns.la \
   $(top_builddir)/src/testing/libgnunettesting.la
 
 test_gns_simple_srv_lookup_SOURCES = \
@@ -300,7 +308,7 @@ test_gns_simple_srv_lookup_LDADD = \
 test_gns_simple_srv_lookup_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  libgnunetgns.la \
   $(top_builddir)/src/testing/libgnunettesting.la
 
 test_gns_simple_zkey_lookup_SOURCES = \
@@ -313,7 +321,7 @@ test_gns_simple_zkey_lookup_LDADD = \
 test_gns_simple_zkey_lookup_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  libgnunetgns.la \
   $(top_builddir)/src/testing/libgnunettesting.la
 
 test_gns_dht_delegated_lookup_SOURCES = \
@@ -328,7 +336,7 @@ test_gns_dht_delegated_lookup_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  libgnunetgns.la \
   $(top_builddir)/src/testing/libgnunettesting.la
 
 test_gns_simple_shorten_SOURCES = \
@@ -341,7 +349,7 @@ test_gns_simple_shorten_LDADD = \
 test_gns_simple_shorten_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  libgnunetgns.la \
   $(top_builddir)/src/testing/libgnunettesting.la
 
 test_gns_simple_get_authority_SOURCES = \
@@ -354,7 +362,7 @@ test_gns_simple_get_authority_LDADD = \
 test_gns_simple_get_authority_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  libgnunetgns.la \
   $(top_builddir)/src/testing/libgnunettesting.la
 
 
@@ -370,7 +378,7 @@ test_gns_pseu_shorten_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  libgnunetgns.la \
   $(top_builddir)/src/testing/libgnunettesting.la
 
 
@@ -384,7 +392,7 @@ test_gns_max_queries_LDADD = \
 test_gns_max_queries_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  libgnunetgns.la \
   $(top_builddir)/src/testing/libgnunettesting.la
 
 test_gns_cname_lookup_SOURCES = \
@@ -397,7 +405,7 @@ test_gns_cname_lookup_LDADD = \
 test_gns_cname_lookup_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  libgnunetgns.la \
   $(top_builddir)/src/testing/libgnunettesting.la
 
 
@@ -411,7 +419,7 @@ test_gns_ns_lookup_LDADD = \
 test_gns_ns_lookup_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  libgnunetgns.la \
   $(top_builddir)/src/testing/libgnunettesting.la
 
 
@@ -425,7 +433,7 @@ test_gns_revocation_LDADD = \
 test_gns_revocation_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  libgnunetgns.la \
   $(top_builddir)/src/testing/libgnunettesting.la
 
 
Unnamed repository; edit this file 'description' to name the repository.