-improve indentation, reduce duplication of PIDs in core's neighbour map

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

diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index 857232a99d235bbb122ba13a2b5c1c345fc7881c..47bee896d7aeb95a7a41e37058e3670045a67686 100644 (file)
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -1,7 +1,9 @@
-INCLUDES = -I$(top_srcdir)/src/include
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
 if MINGW
-  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
+  WINFLAGS = -Wl,--no-undefined,--export-all-symbols
+  VPNBIN = gnunet-helper-vpn
 endif
 
 if USE_COVERAGE
@@ -10,16 +12,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,51 +32,46 @@ lib_LTLIBRARIES = \
   libgnunetvpn.la
 
 
+libexec_PROGRAMS = \
+  $(VPNBIN) \
+  gnunet-service-vpn
+
 bin_PROGRAMS = \
-  gnunet-daemon-exit gnunet-daemon-vpn $(VPNBIN) gnunet-service-vpn gnunet-vpn
+  gnunet-vpn
 
+if MINGW
+  gnunet_helper_vpn_LDFLAGS = \
+    -no-undefined -Wl,--export-all-symbols
 
-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_LDADD = \
+    -lsetupapi -lnewdev -lshell32 -liconv -lstdc++ \
+    -lcomdlg32 -lgdi32 -liphlpapi
 
+  gnunet_helper_vpn_SOURCES = \
+    gnunet-helper-vpn-windows.c
+else
+    gnunet_helper_vpn_SOURCES = \
+       gnunet-helper-vpn.c
+endif
 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/tun/libgnunettun.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_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_vpn_SOURCES = \
  gnunet-vpn.c
 gnunet_vpn_LDADD = \
-  $(top_builddir)/src/vpn/libgnunetvpn.la \
+  libgnunetvpn.la \
+  $(top_builddir)/src/tun/libgnunettun.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_vpn_DEPENDENCIES = \
-  libgnunetvpn.la
 
 libgnunetvpn_la_SOURCES = \
  vpn_api.c vpn.h
@@ -83,17 +81,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