X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fgns%2FMakefile.am;h=4d9791a9985a2dce3f89804ff4b15a164d0fdf6c;hb=8fbe0346067f02c079b4b0da8c44f03b7b93becb;hp=2991bd0c82f2f8a479f0a7d1d9f45f4a3f6972ff;hpb=d1e93089ddeb129ed8d37c55996959eb3dcad11c;p=oweals%2Fgnunet.git

diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 2991bd0c8..4d9791a99 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -8,6 +8,10 @@ SUBDIRS = . $(NSS_SUBDIR)
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
+  DO_W32_HELPER = gnunet-gns-helper-service-w32
+  DO_W32_NSP = libw32nsp.la
+  DO_W32_NSPTOOLS = w32nsp-install w32nsp-uninstall w32nsp-resolve
+  DO_W32_HS_CONF = gns-helper-service-w32.conf
 endif
 
 if USE_COVERAGE
@@ -19,24 +23,30 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 plugindir = $(libdir)/gnunet
 
 pkgcfg_DATA = \
-  gns.conf
+  gns.conf \
+  $(DO_W32_HS_CONF)
 
 lib_LTLIBRARIES = \
+  $(DO_W32_NSP) \
   libgnunetgns.la
 
 if HAVE_MHD
  DO_FCFSD=gnunet-gns-fcfsd
+if HAVE_GNUTLS
  DO_PROXY=gnunet-gns-proxy
 endif
+endif
 
 bin_PROGRAMS = \
   gnunet-service-gns \
   $(DO_FCFSD) \
 	$(DO_PROXY) \
-  gnunet-gns
+  $(DO_W32_HELPER) \
+  $(DO_W32_NSPTOOLS) \
+  gnunet-gns \
+  gnunet-dns2gns
 
-#noinst_PROGRAMS = \
-#  gnunet-gns-lookup
+bin_SCRIPTS=gnunet-gns-proxy-setup-ca
 
 check_PROGRAMS = \
   test_gns_simple_shorten \
@@ -44,11 +54,17 @@ check_PROGRAMS = \
   test_gns_simple_lookup \
   test_gns_simple_delegated_lookup \
   test_gns_simple_mx_lookup \
+  test_gns_simple_srv_lookup \
   test_gns_simple_zkey_lookup \
   test_gns_dht_delegated_lookup \
   test_gns_pseu_shorten \
   test_gns_max_queries \
-  test_gns_dht_threepeer
+  test_gns_cname_lookup \
+  test_gns_ns_lookup \
+  test_gns_revocation \
+  test_gns_proxy
+#test_gns_dht_three_peers
+  
 
 
 #  test_gns_simple_lookup
@@ -59,19 +75,34 @@ check_PROGRAMS = \
 plugin_LTLIBRARIES = \
   libgnunet_plugin_block_gns.la
 
-test_gns_dht_threepeer_SOURCES = \
-  test_gns_dht_threepeer.c
-test_gns_dht_threepeer_LDADD = \
+test_gns_proxy_SOURCES = \
+  test_gns_proxy.c
+test_gns_proxy_LDADD = -lmicrohttpd @LIBCURL@ \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/gns/libgnunetgns.la \
   $(top_builddir)/src/testing/libgnunettesting.la
-test_gns_dht_threepeer_DEPENDENCIES = \
+test_gns_proxy_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/gns/libgnunetgns.la \
   $(top_builddir)/src/testing/libgnunettesting.la
 
+test_gns_dht_three_peers_SOURCES = \
+  test_gns_dht_three_peers.c
+test_gns_dht_three_peers_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la
+test_gns_dht_three_peers_DEPENDENCIES = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la
+
 test_gns_simple_lookup_SOURCES = \
   test_gns_simple_lookup.c
 test_gns_simple_lookup_LDADD = \
@@ -111,6 +142,19 @@ test_gns_simple_mx_lookup_DEPENDENCIES = \
   $(top_builddir)/src/gns/libgnunetgns.la \
   $(top_builddir)/src/testing/libgnunettesting.la
 
+test_gns_simple_srv_lookup_SOURCES = \
+  test_gns_simple_srv_lookup.c
+test_gns_simple_srv_lookup_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/testing/libgnunettesting.la
+test_gns_simple_srv_lookup_DEPENDENCIES = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/testing/libgnunettesting.la
+
 test_gns_simple_zkey_lookup_SOURCES = \
   test_gns_simple_zkey_lookup.c
 test_gns_simple_zkey_lookup_LDADD = \
@@ -195,6 +239,48 @@ test_gns_max_queries_DEPENDENCIES = \
   $(top_builddir)/src/gns/libgnunetgns.la \
   $(top_builddir)/src/testing/libgnunettesting.la
 
+test_gns_cname_lookup_SOURCES = \
+  test_gns_cname_lookup.c
+test_gns_cname_lookup_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/testing/libgnunettesting.la
+test_gns_cname_lookup_DEPENDENCIES = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/testing/libgnunettesting.la
+
+
+test_gns_ns_lookup_SOURCES = \
+  test_gns_ns_lookup.c
+test_gns_ns_lookup_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/testing/libgnunettesting.la
+test_gns_ns_lookup_DEPENDENCIES = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/testing/libgnunettesting.la
+
+
+test_gns_revocation_SOURCES = \
+  test_gns_revocation.c
+test_gns_revocation_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/testing/libgnunettesting.la
+test_gns_revocation_DEPENDENCIES = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/testing/libgnunettesting.la
+
+
 gnunet_gns_SOURCES = \
  gnunet-gns.c
 gnunet_gns_LDADD = \
@@ -205,26 +291,61 @@ gnunet_gns_LDADD = \
 gnunet_gns_DEPENDENCIES = \
   libgnunetgns.la
 
+gnunet_dns2gns_SOURCES = \
+ gnunet-dns2gns.c
+gnunet_dns2gns_LDADD = \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/dns/libgnunetdnsparser.la \
+	$(top_builddir)/src/dns/libgnunetdnsstub.la \
+  $(GN_LIBINTL)
+gnunet_dns2gns_DEPENDENCIES = \
+  libgnunetgns.la
+
 gnunet_gns_proxy_SOURCES = \
  gnunet-gns-proxy.c gns_proxy_proto.h 
-gnunet_gns_proxy_LDADD = -lmicrohttpd -lcurl -lssl \
+gnunet_gns_proxy_LDADD = -lmicrohttpd -lcurl -lgnutls \
   $(top_builddir)/src/gns/libgnunetgns.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 gnunet_gns_proxy_DEPENDENCIES = \
   libgnunetgns.la
 
+gnunet_gns_helper_service_w32_SOURCES = \
+  gnunet-gns-helper-service-w32.c
+gnunet_gns_helper_service_w32_LDADD = \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+gnunet_gns_helper_service_w32_DEPENDENCIES = \
+  libgnunetgns.la
+
+w32nsp_install_SOURCES = \
+  w32nsp-install.c
+w32nsp_install_LDADD = -lws2_32
+
+w32nsp_uninstall_SOURCES = \
+  w32nsp-uninstall.c
+w32nsp_uninstall_LDADD = -lws2_32
+
+w32nsp_resolve_SOURCES = \
+  w32nsp-resolve.c
+w32nsp_resolve_LDADD = -lws2_32
+
 gnunet_service_gns_SOURCES = \
  gnunet-service-gns.c \
  gnunet-service-gns_resolver.c gnunet-service-gns_resolver.h \
  gnunet-service-gns_interceptor.c gnunet-service-gns_interceptor.h 
 gnunet_service_gns_LDADD = \
+  -lm \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.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 \
   $(GN_LIBINTL)
 gnunet_service_gns_DEPENDENCIES = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -232,7 +353,8 @@ gnunet_service_gns_DEPENDENCIES = \
 	$(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/namestore/libgnunetnamestore.la \
+	$(top_builddir)/src/vpn/libgnunetvpn.la
 
 
 gnunet_gns_fcfsd_SOURCES = \
@@ -245,6 +367,13 @@ gnunet_gns_fcfsd_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la
 
+libw32nsp_la_SOURCES = \
+  w32nsp.c
+libw32nsp_la_LIBADD = \
+  -lole32 -lws2_32
+libw32nsp_la_LDFLAGS = \
+  -export-symbols $(top_srcdir)/src/gns/w32nsp.def \
+  $(GN_LIB_LDFLAGS)
 
 libgnunetgns_la_SOURCES = \
  gns_api.c gns.h
@@ -289,5 +418,8 @@ endif
 EXTRA_DIST = \
   test_gns_defaults.conf \
   test_gns_simple_lookup.conf \
-  test_gns_dht_default.conf
+  test_gns_dht_default.conf \
+	zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey \
+	zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey \
+	zonefiles/test_zonekey