If the tun-if can't be initialized correctly, close the vpn-helper

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

diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index 480d58145b894be9807ae3a5cf284b06404bbbb5..8af6af749857a4b7261484feb94b4ed7cade74b3 100644 (file)
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -9,10 +9,10 @@ if USE_COVERAGE
 endif
 
 if LINUX
-VPNBIN = gnunet-vpn-helper
+VPNBIN = gnunet-helper-vpn
 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
 else
 install-exec-hook:
 endif
@@ -22,10 +22,10 @@ bin_PROGRAMS = \
  gnunet-daemon-vpn $(VPNBIN)
 
 
-gnunet_vpn_helper_SOURCES = \
- gnunet-vpn-helper.c \
+gnunet_helper_vpn_SOURCES = \
+ gnunet-helper-vpn.c \
  gnunet-vpn-helper-p.h \
- tun.h tun.c
+ gnunet-vpn-tun.h gnunet-vpn-tun.c
 
 # debug.c  debug.h \
 # packet.h packet.c \
@@ -36,7 +36,7 @@ gnunet_vpn_helper_SOURCES = \
 # udp.c udp.h
 
 gnunet_daemon_vpn_SOURCES = \
- gnunet-daemon-vpn.c
+ gnunet-daemon-vpn.c gnunet-vpn-pretty-print.c
 gnunet_daemon_vpn_LDADD = \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -47,9 +47,10 @@ gnunet_daemon_vpn_LDADD = \
 #check_PROGRAMS = \
 # test_XXX
 
+if !DISABLE_TEST_RUN
 #TESTS = \
 # test_transport_api_tcp 
-
+endif
 
 #test_transport_api_tcp_SOURCES = \
 # test_transport_api.c