-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 480d58145b894be9807ae3a5cf284b06404bbbb5..47bee896d7aeb95a7a41e37058e3670045a67686 100644 (file)
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -1,60 +1,83 @@
-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
   AM_CFLAGS = --coverage -O0
 endif
 
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+pkgcfg_DATA = \
+  vpn.conf
+
 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
+       $(top_srcdir)/src/vpn/install-vpn-helper.sh $(libexecdir) $(SUDO_BINARY) || true
 else
 install-exec-hook:
 endif
 
 
+lib_LTLIBRARIES = \
+  libgnunetvpn.la
+
+
+libexec_PROGRAMS = \
+  $(VPNBIN) \
+  gnunet-service-vpn
+
 bin_PROGRAMS = \
- gnunet-daemon-vpn $(VPNBIN)
-
-
-gnunet_vpn_helper_SOURCES = \
- gnunet-vpn-helper.c \
- gnunet-vpn-helper-p.h \
- tun.h tun.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_daemon_vpn_SOURCES = \
- gnunet-daemon-vpn.c
-gnunet_daemon_vpn_LDADD = \
-  $(top_builddir)/src/core/libgnunetcore.la \
+  gnunet-vpn
+
+if MINGW
+  gnunet_helper_vpn_LDFLAGS = \
+    -no-undefined -Wl,--export-all-symbols
+
+  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_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/tun/libgnunettun.la \
   $(top_builddir)/src/util/libgnunetutil.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 = \
+  libgnunetvpn.la \
+  $(top_builddir)/src/tun/libgnunettun.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
 
-#check_PROGRAMS = \
-# test_XXX
-
-#TESTS = \
-# test_transport_api_tcp 
-
+libgnunetvpn_la_SOURCES = \
+ vpn_api.c vpn.h
+libgnunetvpn_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
+libgnunetvpn_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
 
-#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 = test_transport_api_data.conf