-misc DNS related bugfixes

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

diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am
index 9e2566bcadc00419b1dc2c35583d295ce49c6f10..674f4bf57707bff731d6d360b856fe6961a57f45 100644 (file)
--- a/src/dns/Makefile.am
+++ b/src/dns/Makefile.am
@@ -12,25 +12,38 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 
 plugindir = $(libdir)/gnunet
 
+dist_pkgcfg_DATA = \
+  dns.conf
+
 if LINUX
-HIJACKBIN = gnunet-helper-hijack-dns
+HIJACKBIN = gnunet-helper-hijack-dns gnunet-helper-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
+       $(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-dns || true
+       $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-dns || true
 else
 install-exec-hook:
 endif
 
 lib_LTLIBRARIES = \
   libgnunetdnsparser.la \
+  libgnunetdnsnew.la \
   libgnunetdns.la
 
 bin_PROGRAMS = \
-  gnunet-service-dns $(HIJACKBIN)
+  gnunet-service-dns gnunet-service-dns-new $(HIJACKBIN)
+
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_block_dns.la 
+
 
 gnunet_helper_hijack_dns_SOURCES = \
  gnunet-helper-hijack-dns.c
 
+gnunet_helper_dns_SOURCES = \
+ gnunet-helper-dns.c
+
 gnunet_service_dns_SOURCES = \
  gnunet-service-dns.c gnunet-service-dns-p.h 
 gnunet_service_dns_LDADD = \
@@ -39,8 +52,15 @@ gnunet_service_dns_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/mesh/libgnunetmesh.la \
-  $(GN_LIBINTL) -lgnunetdnsparser
+  $(top_builddir)/src/dns/libgnunetdnsparser.la \
+  $(GN_LIBINTL)
 
+gnunet_service_dns_new_SOURCES = \
+ gnunet-service-dns_new.c 
+gnunet_service_dns_new_LDADD = \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
 
 libgnunetdnsparser_la_SOURCES = \
  dnsparser.c 
@@ -49,10 +69,26 @@ libgnunetdnsparser_la_LIBADD = \
 libgnunetdnsparser_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
-
 libgnunetdns_la_SOURCES = \
- dns_api.c 
+ 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_LIB_LDFLAGS)
+
+libgnunetdnsnew_la_SOURCES = \
+ dns_api_new.c dns_new.h
+libgnunetdnsnew_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
+libgnunetdnsnew_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
+
+libgnunet_plugin_block_dns_la_SOURCES = \
+  plugin_block_dns.c
+libgnunet_plugin_block_dns_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la
+libgnunet_plugin_block_dns_la_LDFLAGS = \
+  $(top_builddir)/src/block/$(GN_PLUGIN_LDFLAGS)
+
+
+