X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fvpn%2FMakefile.am;h=3ad9b1a5441502deefcff5800492d55d174e8205;hb=04b6df21cd281e8cd540139f8d9ae85defc1961c;hp=28eb86b7dd04f8f67af5151ddfdd7496614a329b;hpb=428ea7205a76b37863e7d987512aaae45029f37b;p=oweals%2Fgnunet.git

diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index 28eb86b7d..3ad9b1a54 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -1,8 +1,5 @@
-INCLUDES = -I$(top_srcdir)/src/include
-
-if MINGW
-  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
-endif
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
@@ -10,16 +7,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 $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true
 else
 install-exec-hook:
 endif
@@ -29,49 +27,33 @@ 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-helper-vpn.c
 
 gnunet_service_vpn_SOURCES = \
- gnunet-service-vpn.c 
+ gnunet-service-vpn.c
 gnunet_service_vpn_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.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 \
+  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/regex/libgnunetregex.la \
   $(GN_LIBINTL)
+gnunet_service_vpn_CFLAGS = \
+  -I$(top_srcdir)/src/exit $(CFLAGS)
 
 gnunet_vpn_SOURCES = \
  gnunet-vpn.c
 gnunet_vpn_LDADD = \
-  $(top_builddir)/src/vpn/libgnunetvpn.la \
+  libgnunetvpn.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_vpn_DEPENDENCIES = \
-  libgnunetvpn.la
 
 libgnunetvpn_la_SOURCES = \
  vpn_api.c vpn.h
@@ -79,19 +61,3 @@ libgnunetvpn_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
 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