-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 c4581df6f502377b99ac3325cc05d1caa33da144..47bee896d7aeb95a7a41e37058e3670045a67686 100644 (file)
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -1,3 +1,4 @@
+# This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
 if MINGW
@@ -40,7 +41,7 @@ bin_PROGRAMS = \
 
 if MINGW
   gnunet_helper_vpn_LDFLAGS = \
-    -no-undefined -Wl,--export-all-symbols 
+    -no-undefined -Wl,--export-all-symbols
 
   gnunet_helper_vpn_LDADD = \
     -lsetupapi -lnewdev -lshell32 -liconv -lstdc++ \
@@ -53,12 +54,12 @@ else
        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 = \
@@ -67,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