installing all service, daemon and helper binaries to lib/gnunet/libexec/; updating...

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

diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index 28eb86b7dd04f8f67af5151ddfdd7496614a329b..453b3b90876e6838135b808057d30a86e44e142a 100644 (file)
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -10,16 +10,17 @@ endif
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
+libexecdir= $(pkglibdir)/libexec/
+
 plugindir = $(libdir)/gnunet
 
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
   vpn.conf
 
 if LINUX
 VPNBIN = gnunet-helper-vpn
 install-exec-hook:
-       $(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-vpn || true
-       $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-vpn || true
+       $(top_srcdir)/src/vpn/install-vpn-helper.sh $(libexecdir) $(SUDO_BINARY) || true
 else
 install-exec-hook:
 endif
@@ -29,40 +30,26 @@ lib_LTLIBRARIES = \
   libgnunetvpn.la
 
 
-bin_PROGRAMS = \
-  gnunet-daemon-exit gnunet-daemon-vpn $(VPNBIN) gnunet-service-vpn gnunet-vpn
+libexec_PROGRAMS = \
+  $(VPNBIN) \
+  gnunet-service-vpn
 
+bin_PROGRAMS = \
+  gnunet-vpn
 
 gnunet_helper_vpn_SOURCES = \
  gnunet-helper-vpn.c
 
-gnunet_daemon_vpn_SOURCES = \
- gnunet-daemon-vpn.c 
-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 \
-  $(top_builddir)/src/dns/libgnunetdnsparser.la \
-  $(top_builddir)/src/dns/libgnunetdns.la \
-  $(GN_LIBINTL)
-
 gnunet_service_vpn_SOURCES = \
  gnunet-service-vpn.c 
 gnunet_service_vpn_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/tun/libgnunettun.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/mesh/libgnunetmesh.la \
   $(GN_LIBINTL)
-
-gnunet_daemon_exit_SOURCES = \
- gnunet-daemon-exit.c 
-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)
+gnunet_service_vpn_CFLAGS = \
+  -I$(top_srcdir)/src/exit $(CFLAGS)
 
 gnunet_vpn_SOURCES = \
  gnunet-vpn.c
@@ -81,17 +68,3 @@ libgnunetvpn_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
 
-if ENABLE_TEST_RUN
-#TESTS = \
-# test_transport_api_tcp 
-endif
-
-#test_transport_api_tcp_SOURCES = \
-# test_transport_api.c
-#test_transport_api_tcp_LDADD = \
-# $(top_builddir)/src/transport/libgnunettransport.la \
-# $(top_builddir)/src/util/libgnunetutil.la  
-
-EXTRA_DIST = \
-  gnunet-vpn-packet.h \
-  test-conf.conf