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

diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am
index d8c2cd1c1..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,6 +7,8 @@ endif
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
+libexecdir= $(pkglibdir)/libexec/
+
 plugindir = $(libdir)/gnunet
 
 pkgcfg_DATA = \
@@ -17,32 +16,26 @@ pkgcfg_DATA = \
 
 if LINUX
 HIJACKBIN = gnunet-helper-dns
-install-exec-hook:
-	$(SUDO_BINARY) chown root $(bindir)/gnunet-helper-dns || true
-	$(SUDO_BINARY) chgrp $(GNUNETDNS_GROUP) $(bindir)/gnunet-helper-dns || true
-	$(SUDO_BINARY) chmod 4750 $(bindir)/gnunet-helper-dns || true
-	$(SUDO_BINARY) chgrp $(GNUNETDNS_GROUP) $(bindir)/gnunet-service-dns || true
-	$(SUDO_BINARY) chmod 2755 $(bindir)/gnunet-service-dns || true
-else
-install-exec-hook:
 endif
 
 lib_LTLIBRARIES = \
-  libgnunetdnsparser.la \
   libgnunetdns.la
 
-bin_PROGRAMS = \
+libexec_PROGRAMS = \
   gnunet-service-dns $(HIJACKBIN)
 
 noinst_PROGRAMS = \
-  gnunet-dns-monitor gnunet-dns-redirector
+  gnunet-dns-monitor \
+  gnunet-dns-redirector \
+  gnunet-zonewalk
 
 plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_dns.la 
+  libgnunet_plugin_block_dns.la
 
+if LINUX
 check_SCRIPTS = \
  test_gnunet_dns.sh
-
+endif
 
 gnunet_helper_dns_SOURCES = \
  gnunet-helper-dns.c
@@ -51,58 +44,55 @@ gnunet_helper_dns_SOURCES = \
 gnunet_dns_monitor_SOURCES = \
  gnunet-dns-monitor.c
 gnunet_dns_monitor_LDADD = \
-  $(top_builddir)/src/dns/libgnunetdnsparser.la \
-  $(top_builddir)/src/dns/libgnunetdns.la \
+  libgnunetdns.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+gnunet_zonewalk_SOURCES = \
+ gnunet-zonewalk.c
+gnunet_zonewalk_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_dns_monitor_DEPENDENCIES = \
-  libgnunetdnsparser.la \
-  libgnunetdns.la
 
 gnunet_dns_redirector_SOURCES = \
  gnunet-dns-redirector.c
 gnunet_dns_redirector_LDADD = \
-  $(top_builddir)/src/dns/libgnunetdnsparser.la \
-  $(top_builddir)/src/dns/libgnunetdns.la \
+  libgnunetdns.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_dns_redirector_DEPENDENCIES = \
-  libgnunetdnsparser.la \
-  libgnunetdns.la
 
 gnunet_service_dns_SOURCES = \
- gnunet-service-dns.c 
+ gnunet-service-dns.c
 gnunet_service_dns_LDADD = \
-  $(top_builddir)/src/tun/libgnunettun.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(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)
-
 libgnunetdns_la_SOURCES = \
  dns_api.c dns.h
 libgnunetdns_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
 libgnunetdns_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)
+  $(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) 
+  $(check_SCRIPTS)
+
+