-moving DNS code into its own directory

1 files changed, 2 insertions, 19 deletions

diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index e69c5643e..dfba44f0a 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -17,30 +17,23 @@ dist_pkgcfg_DATA = \
 
 if LINUX
 VPNBIN = gnunet-helper-vpn
-HIJACKBIN = gnunet-helper-hijack-dns
 install-exec-hook:
         $(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-vpn || true
         $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-vpn || true
-        $(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:
 endif
 
 
 bin_PROGRAMS = \
-  gnunet-daemon-exit gnunet-daemon-vpn gnunet-service-dns $(VPNBIN) $(HIJACKBIN)
+  gnunet-daemon-exit gnunet-daemon-vpn $(VPNBIN) $(HIJACKBIN)
 
 
 gnunet_helper_vpn_SOURCES = \
  gnunet-helper-vpn.c
 
-gnunet_helper_hijack_dns_SOURCES = \
- gnunet-helper-hijack-dns.c
-
 gnunet_daemon_vpn_SOURCES = \
  gnunet-daemon-vpn.c gnunet-daemon-vpn.h \
- gnunet-dns-parser.c gnunet-dns-parser.h \
  gnunet-daemon-vpn-helper.c gnunet-daemon-vpn-helper.h \
  gnunet-daemon-vpn-dns.c gnunet-daemon-vpn-dns.h \
  gnunet-helper-vpn-api.c gnunet-helper-vpn-api.h \
@@ -50,17 +43,7 @@ gnunet_daemon_vpn_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/mesh/libgnunetmesh.la \
-  $(GN_LIBINTL)
-
-gnunet_service_dns_SOURCES = \
- gnunet-service-dns.c gnunet-service-dns-p.h \
- gnunet-dns-parser.c gnunet-dns-parser.h
-gnunet_service_dns_LDADD = \
-  $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.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_daemon_exit_SOURCES = \