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

diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index e22c0e2c3..3ad9b1a54 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -1,10 +1,6 @@
+# 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,--export-all-symbols
-  VPNBIN = gnunet-helper-vpn
-endif
-
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
 endif
@@ -21,7 +17,7 @@ pkgcfg_DATA = \
 if LINUX
 VPNBIN = gnunet-helper-vpn
 install-exec-hook:
-	$(top_srcdir)/src/vpn/install-vpn-helper.sh $(libexecdir) $(SUDO_BINARY) || true
+	$(top_srcdir)/src/vpn/install-vpn-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true
 else
 install-exec-hook:
 endif
@@ -38,27 +34,15 @@ libexec_PROGRAMS = \
 bin_PROGRAMS = \
   gnunet-vpn
 
-if MINGW
-  gnunet_helper_vpn_LDFLAGS = \
-    -no-undefined -Wl,--export-all-symbols
+gnunet_helper_vpn_SOURCES = \
+gnunet-helper-vpn.c
 
-  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/mesh/libgnunetmesh.la \
+  $(top_builddir)/src/cadet/libgnunetcadet.la \
   $(top_builddir)/src/regex/libgnunetregex.la \
   $(GN_LIBINTL)
 gnunet_service_vpn_CFLAGS = \
@@ -67,12 +51,9 @@ gnunet_service_vpn_CFLAGS = \
 gnunet_vpn_SOURCES = \
  gnunet-vpn.c
 gnunet_vpn_LDADD = \
-  $(top_builddir)/src/vpn/libgnunetvpn.la \
-  $(top_builddir)/src/tun/libgnunettun.la \
+  libgnunetvpn.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_vpn_DEPENDENCIES = \
-  libgnunetvpn.la
 
 libgnunetvpn_la_SOURCES = \
  vpn_api.c vpn.h
@@ -80,5 +61,3 @@ libgnunetvpn_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
 libgnunetvpn_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
-
-