check

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

diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index 480d58145b894be9807ae3a5cf284b06404bbbb5..5430ba3b951a334274058cd62ee804b329e1a973 100644 (file)
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -9,47 +9,71 @@ 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-exit gnunet-daemon-vpn gnunet-service-dns $(VPNBIN) $(HIJACKBIN)
 
 
-gnunet_vpn_helper_SOURCES = \
- gnunet-vpn-helper.c \
- gnunet-vpn-helper-p.h \
- tun.h tun.c
+gnunet_helper_vpn_SOURCES = \
+ gnunet-helper-vpn.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-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 \
+ gnunet-vpn-checksum.c gnunet-vpn-checksum.h
 gnunet_daemon_vpn_LDADD = \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(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 \
+  $(GN_LIBINTL)
+
+gnunet_daemon_exit_SOURCES = \
+ gnunet-daemon-exit.c \
+ gnunet-helper-vpn-api.c gnunet-helper-vpn-api.h \
+ gnunet-vpn-checksum.c gnunet-vpn-checksum.h
+gnunet_daemon_exit_LDADD = \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/mesh/libgnunetmesh.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
@@ -57,4 +81,5 @@ gnunet_daemon_vpn_LDADD = \
 # $(top_builddir)/src/transport/libgnunettransport.la \
 # $(top_builddir)/src/util/libgnunetutil.la  
 
-#EXTRA_DIST = test_transport_api_data.conf 
+EXTRA_DIST = \
+  gnunet-vpn-packet.h