-removing legacy dns/vpn/exit code and renaming -new versions to current

1 files changed, 11 insertions, 36 deletions

diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am
index 99e78d7d6..f8bdae94e 100644
--- a/src/dns/Makefile.am
+++ b/src/dns/Makefile.am
@@ -16,26 +16,23 @@ pkgcfg_DATA = \
   dns.conf
 
 if LINUX
-HIJACKBIN = gnunet-helper-hijack-dns gnunet-helper-dns
+HIJACKBIN = 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 $(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-new || true
-        $(SUDO_BINARY) chmod 2755 $(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 \
-  libgnunetdnsnew.la \
   libgnunetdns.la
 
 bin_PROGRAMS = \
-  gnunet-service-dns gnunet-service-dns-new $(HIJACKBIN)
+  gnunet-service-dns $(HIJACKBIN)
 
 noinst_PROGRAMS = \
   gnunet-dns-monitor gnunet-dns-redirector
@@ -44,50 +41,35 @@ 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_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_service_dns_DEPENDENCIES = \
-  libgnunetdnsparser.la
 
 gnunet_dns_monitor_SOURCES = \
  gnunet-dns-monitor.c
 gnunet_dns_monitor_LDADD = \
   $(top_builddir)/src/dns/libgnunetdnsparser.la \
-  $(top_builddir)/src/dns/libgnunetdnsnew.la \
+  $(top_builddir)/src/dns/libgnunetdns.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 gnunet_dns_monitor_DEPENDENCIES = \
   libgnunetdnsparser.la \
-  libgnunetdnsnew.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/libgnunetdnsnew.la \
+  $(top_builddir)/src/dns/libgnunetdns.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 gnunet_dns_redirector_DEPENDENCIES = \
   libgnunetdnsparser.la \
-  libgnunetdnsnew.la
+  libgnunetdns.la
 
-gnunet_service_dns_new_SOURCES = \
- gnunet-service-dns_new.c 
-gnunet_service_dns_new_LDADD = \
+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)
@@ -106,13 +88,6 @@ libgnunetdns_la_LIBADD = \
 libgnunetdns_la_LDFLAGS = \
   $(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 = \