-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 b80be77497c19e72cf041b6655b674b605d9c2a6..47bee896d7aeb95a7a41e37058e3670045a67686 100644 (file)
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -1,7 +1,8 @@
-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
 
@@ -39,19 +40,26 @@ bin_PROGRAMS = \
   gnunet-vpn
 
 if MINGW
-    gnunet_helper_vpn_SOURCES = \
-       gnunet-helper-vpn-windows.c
+  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.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 = \
@@ -60,11 +68,10 @@ gnunet_service_vpn_CFLAGS = \
 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