assert

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

diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index 1fff59309175a9c958edc21f60d9f710d6aa8463..027ce687f018e878062cf7ad8f3a8ff664087093 100644 (file)
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -9,42 +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 = \
- debug.c  debug.h \
- packet.h packet.c \
- pretty-print.c  pretty-print.h \
- tcp.c  tcp.h \
- test.c \
- tun.c  tun.h
+gnunet_helper_vpn_SOURCES = \
+ gnunet-helper-vpn.c \
+ gnunet-vpn-helper-p.h \
+ gnunet-vpn-tun.h gnunet-vpn-tun.c
+
+gnunet_helper_hijack_dns_SOURCES = \
+ gnunet-helper-hijack-dns.c
 
 gnunet_daemon_vpn_SOURCES = \
- gnunet-daemon-vpn.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