X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fvpn%2FMakefile.am;h=027ce687f018e878062cf7ad8f3a8ff664087093;hb=2f1ab9bfd9b7417b5f9ba47e47ce39a17e2ea27c;hp=afb6a7ba96679ba53c74488a9c23f67175e3a55d;hpb=622360c41aa24d27c07a2118d4fcb80d4d8fa25c;p=oweals%2Fgnunet.git

diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index afb6a7ba9..027ce687f 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -9,47 +9,58 @@ if USE_COVERAGE
 endif
 
 if LINUX
-VPNBIN = gnunet-vpn-helper
+VPNBIN = gnunet-helper-vpn
+HIJACKBIN = gnunet-helper-hijack-dns
 install-exec-hook:
-	chown root $(bindir)/gnunet-vpn-helper || true
-	chmod u+s $(bindir)/gnunet-vpn-helper || true
+	chown root $(bindir)/gnunet-helper-vpn || true
+	chmod u+s $(bindir)/gnunet-helper-vpn || true
+	chown root $(bindir)/gnunet-helper-hijack-dns || true
+	chmod u+s $(bindir)/gnunet-helper-hijack-dns || true
 else
 install-exec-hook:
 endif
 
 
 bin_PROGRAMS = \
- gnunet-daemon-vpn $(VPNBIN)
+  gnunet-daemon-vpn gnunet-service-dns $(VPNBIN) $(HIJACKBIN)
 
 
-gnunet_vpn_helper_SOURCES = \
- gnunet-vpn-helper.c \
+gnunet_helper_vpn_SOURCES = \
+ gnunet-helper-vpn.c \
  gnunet-vpn-helper-p.h \
  gnunet-vpn-tun.h gnunet-vpn-tun.c
 
-# debug.c  debug.h \
-# packet.h packet.c \
-# pretty-print.c  pretty-print.h \
-# tcp.c  tcp.h \
-# test.c \
-# tun.c  tun.h \
-# udp.c udp.h
+gnunet_helper_hijack_dns_SOURCES = \
+ gnunet-helper-hijack-dns.c
 
 gnunet_daemon_vpn_SOURCES = \
- gnunet-daemon-vpn.c gnunet-vpn-pretty-print.c
+ gnunet-daemon-vpn.c \
+ gnunet-vpn-pretty-print.c \
+ gnunet-dns-parser.c
 gnunet_daemon_vpn_LDADD = \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 
+gnunet_service_dns_SOURCES = \
+ gnunet-service-dns.c \
+ gnunet-vpn-pretty-print.c \
+ gnunet-dns-parser.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 \
+  $(GN_LIBINTL)
 
 #check_PROGRAMS = \
 # test_XXX
 
+if !DISABLE_TEST_RUN
 #TESTS = \
 # test_transport_api_tcp 
-
+endif
 
 #test_transport_api_tcp_SOURCES = \
 # test_transport_api.c