X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdns%2FMakefile.am;h=17be841f531671ef5ac3115aff49cd33cc921df4;hb=dfcab34c5af80c0068299bacb16ffc461bf3c1ad;hp=a7aafa4fc8b764759b03f81907f97554c193666d;hpb=86a020dbabef7e047706f462840bfe66b036093c;p=oweals%2Fgnunet.git

diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am
index a7aafa4fc..17be841f5 100644
--- a/src/dns/Makefile.am
+++ b/src/dns/Makefile.am
@@ -1,8 +1,5 @@
-INCLUDES = -I$(top_srcdir)/src/include
-
-if MINGW
-  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
-endif
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
@@ -10,53 +7,92 @@ endif
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
+libexecdir= $(pkglibdir)/libexec/
+
 plugindir = $(libdir)/gnunet
 
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
   dns.conf
 
 if LINUX
-HIJACKBIN = gnunet-helper-hijack-dns
-install-exec-hook:
-	$(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-hijack-dns || true
-	$(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-hijack-dns || true
-else
-install-exec-hook:
+HIJACKBIN = gnunet-helper-dns
 endif
 
 lib_LTLIBRARIES = \
-  libgnunetdnsparser.la \
   libgnunetdns.la
 
-bin_PROGRAMS = \
+libexec_PROGRAMS = \
   gnunet-service-dns $(HIJACKBIN)
 
-gnunet_helper_hijack_dns_SOURCES = \
- gnunet-helper-hijack-dns.c
+noinst_PROGRAMS = \
+  gnunet-dns-monitor \
+  gnunet-dns-redirector \
+  gnunet-zonewalk
 
-gnunet_service_dns_SOURCES = \
- gnunet-service-dns.c gnunet-service-dns-p.h 
-gnunet_service_dns_LDADD = \
-  $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_block_dns.la
+
+if LINUX
+check_SCRIPTS = \
+ test_gnunet_dns.sh
+endif
+
+gnunet_helper_dns_SOURCES = \
+ gnunet-helper-dns.c
+
+
+gnunet_dns_monitor_SOURCES = \
+ gnunet-dns-monitor.c
+gnunet_dns_monitor_LDADD = \
+  libgnunetdns.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/mesh/libgnunetmesh.la \
-  $(top_builddir)/src/dns/libgnunetdnsparser.la \
   $(GN_LIBINTL)
 
+gnunet_zonewalk_SOURCES = \
+ gnunet-zonewalk.c
+gnunet_zonewalk_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
 
-libgnunetdnsparser_la_SOURCES = \
- dnsparser.c 
-libgnunetdnsparser_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
-libgnunetdnsparser_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)
+gnunet_dns_redirector_SOURCES = \
+ gnunet-dns-redirector.c
+gnunet_dns_redirector_LDADD = \
+  libgnunetdns.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
 
+gnunet_service_dns_SOURCES = \
+ gnunet-service-dns.c
+gnunet_service_dns_LDADD = \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
 
 libgnunetdns_la_SOURCES = \
  dns_api.c dns.h
 libgnunetdns_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
 libgnunetdns_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)
\ No newline at end of file
+  $(GN_LIBINTL) \
+  $(GN_LIB_LDFLAGS) \
+  -version-info 0:0:0
+
+libgnunet_plugin_block_dns_la_SOURCES = \
+  plugin_block_dns.c
+libgnunet_plugin_block_dns_la_LIBADD = \
+  $(top_builddir)/src/block/libgnunetblockgroup.la \
+  $(top_builddir)/src/util/libgnunetutil.la
+libgnunet_plugin_block_dns_la_LDFLAGS = \
+  $(GN_LIBINTL) \
+  $(top_builddir)/src/block/$(GN_PLUGIN_LDFLAGS)
+
+
+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)  $(check_SCRIPTS)
+endif
+
+EXTRA_DIST = \
+  $(check_SCRIPTS)
+
+