add changelog

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

diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index 5c16fa349d4811ee268d09ea5a2078a6dbc8a311..d1ecd9f985496dfb1d824cc5843bf47184e618be 100644 (file)
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -1,11 +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,10 +16,6 @@ pkgcfg_DATA = \
 
 if LINUX
 VPNBIN = gnunet-helper-vpn
-install-exec-hook:
-       $(top_srcdir)/src/vpn/install-vpn-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true
-else
-install-exec-hook:
 endif
 
 
@@ -39,25 +30,13 @@ 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/cadet/libgnunetcadet.la \
   $(top_builddir)/src/regex/libgnunetregex.la \
@@ -69,7 +48,6 @@ 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)
 
@@ -78,4 +56,5 @@ libgnunetvpn_la_SOURCES = \
 libgnunetvpn_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
 libgnunetvpn_la_LDFLAGS = \
+  $(GN_LIBINTL) \
   $(GN_LIB_LDFLAGS)