BUILD: Move vpn to service

20 files changed, 32 insertions, 18 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 8bf3b72a3..f55c535bf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,6 @@ SUBDIRS = \
         rest-plugin \
         cli \
         contrib \
-  vpn \
   gns \
   zonemaster \
   $(CONVERSATION_DIR) \
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index b06927edc..c7682bb36 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -11,4 +11,5 @@ SUBDIRS = \
         namecache \
         namestore \
         revocation \
+        vpn \
         cadet
diff --git a/src/cli/vpn/.gitignore b/src/cli/vpn/.gitignore
new file mode 100644
index 000000000..dbd75eb25
--- /dev/null
+++ b/src/cli/vpn/.gitignore
@@ -0,0 +1 @@
+gnunet-vpn
diff --git a/src/cli/vpn/Makefile.am b/src/cli/vpn/Makefile.am
new file mode 100644
index 000000000..0c7c459ef
--- /dev/null
+++ b/src/cli/vpn/Makefile.am
@@ -0,0 +1,22 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+bin_PROGRAMS = \
+  gnunet-vpn
+
+gnunet_vpn_SOURCES = \
+ gnunet-vpn.c
+gnunet_vpn_LDADD = \
+  $(top_builddir)/src/service/vpn/libgnunetvpn.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
diff --git a/src/vpn/gnunet-vpn.c b/src/cli/vpn/gnunet-vpn.c
index a67e17016..a67e17016 100644
--- a/src/vpn/gnunet-vpn.c
+++ b/src/cli/vpn/gnunet-vpn.c
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index c5d81ca76..6907df0ed 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -22,7 +22,7 @@ else
   LIBIDN2=
 endif
 
-USE_VPN = $(top_builddir)/src/vpn/libgnunetvpn.la
+USE_VPN = $(top_builddir)/src/service/vpn/libgnunetvpn.la
 
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index 5ecaaa10c..7622f2c1a 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -20,7 +20,7 @@ libexec_PROGRAMS = \
 gnunet_daemon_pt_SOURCES = \
  gnunet-daemon-pt.c
 gnunet_daemon_pt_LDADD = \
-  $(top_builddir)/src/vpn/libgnunetvpn.la \
+  $(top_builddir)/src/service/vpn/libgnunetvpn.la \
   $(top_builddir)/src/service/cadet/libgnunetcadet.la \
   $(top_builddir)/src/service/dht/libgnunetdht.la \
   $(top_builddir)/src/service/dns/libgnunetdns.la \
@@ -63,7 +63,7 @@ test_gns_vpn_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 test_gnunet_vpn_4_over_SOURCES = \
  test_gnunet_vpn.c
 test_gnunet_vpn_4_over_LDADD = $(MHD_LIBS) @LIBCURL@ \
- $(top_builddir)/src/vpn/libgnunetvpn.la \
+ $(top_builddir)/src/service/vpn/libgnunetvpn.la \
  $(top_builddir)/src/service/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gnunet_vpn_4_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
@@ -71,7 +71,7 @@ test_gnunet_vpn_4_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 test_gnunet_vpn_6_over_SOURCES = \
  test_gnunet_vpn.c
 test_gnunet_vpn_6_over_LDADD = $(MHD_LIBS) @LIBCURL@ \
- $(top_builddir)/src/vpn/libgnunetvpn.la \
+ $(top_builddir)/src/service/vpn/libgnunetvpn.la \
  $(top_builddir)/src/service/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gnunet_vpn_6_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
@@ -79,7 +79,7 @@ test_gnunet_vpn_6_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 test_gnunet_vpn_4_to_6_SOURCES = \
  test_gnunet_vpn.c
 test_gnunet_vpn_4_to_6_LDADD = $(MHD_LIBS) @LIBCURL@ \
- $(top_builddir)/src/vpn/libgnunetvpn.la \
+ $(top_builddir)/src/service/vpn/libgnunetvpn.la \
  $(top_builddir)/src/service/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gnunet_vpn_4_to_6_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
@@ -87,7 +87,7 @@ test_gnunet_vpn_4_to_6_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 test_gnunet_vpn_6_to_4_SOURCES = \
  test_gnunet_vpn.c
 test_gnunet_vpn_6_to_4_LDADD = $(MHD_LIBS) @LIBCURL@ \
- $(top_builddir)/src/vpn/libgnunetvpn.la \
+ $(top_builddir)/src/service/vpn/libgnunetvpn.la \
  $(top_builddir)/src/service/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gnunet_vpn_6_to_4_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 52dec5726..a8738997f 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -23,5 +23,6 @@ SUBDIRS = \
   seti \
   setu \
   regex \
-  revocation
+  revocation \
+        vpn
 
diff --git a/src/vpn/.gitignore b/src/service/vpn/.gitignore
index b76ea0f93..b76ea0f93 100644
--- a/src/vpn/.gitignore
+++ b/src/service/vpn/.gitignore
diff --git a/src/vpn/Makefile.am b/src/service/vpn/Makefile.am
index 6fc1bff20..123ec77de 100644
--- a/src/vpn/Makefile.am
+++ b/src/service/vpn/Makefile.am
@@ -27,9 +27,6 @@ libexec_PROGRAMS = \
   $(VPNBIN) \
   gnunet-service-vpn
 
-bin_PROGRAMS = \
-  gnunet-vpn
-
 gnunet_helper_vpn_SOURCES = \
   gnunet-helper-vpn.c
 gnunet_helper_vpn_LDADD = \
@@ -47,13 +44,6 @@ gnunet_service_vpn_LDADD = \
 gnunet_service_vpn_CFLAGS = \
   -I$(top_srcdir)/src/exit $(CFLAGS)
 
-gnunet_vpn_SOURCES = \
- gnunet-vpn.c
-gnunet_vpn_LDADD = \
-  libgnunetvpn.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
 libgnunetvpn_la_SOURCES = \
  vpn_api.c vpn.h
 libgnunetvpn_la_LIBADD = \
diff --git a/src/vpn/gnunet-helper-vpn.c b/src/service/vpn/gnunet-helper-vpn.c
index 30901da45..30901da45 100644
--- a/src/vpn/gnunet-helper-vpn.c
+++ b/src/service/vpn/gnunet-helper-vpn.c
diff --git a/src/vpn/gnunet-service-vpn.c b/src/service/vpn/gnunet-service-vpn.c
index aa3f6ffe3..aa3f6ffe3 100644
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/service/vpn/gnunet-service-vpn.c
diff --git a/src/vpn/meson.build b/src/service/vpn/meson.build
index e77b88432..e77b88432 100644
--- a/src/vpn/meson.build
+++ b/src/service/vpn/meson.build
diff --git a/src/vpn/tests/expected b/src/service/vpn/tests/expected
index 26ed82af9..26ed82af9 100644
--- a/src/vpn/tests/expected
+++ b/src/service/vpn/tests/expected
diff --git a/src/vpn/tests/ping b/src/service/vpn/tests/ping
index ccc855538..ccc855538 100644
--- a/src/vpn/tests/ping
+++ b/src/service/vpn/tests/ping
diff --git a/src/vpn/tests/test-helper-icmp.sh b/src/service/vpn/tests/test-helper-icmp.sh
index 2d0c8425a..2d0c8425a 100755
--- a/src/vpn/tests/test-helper-icmp.sh
+++ b/src/service/vpn/tests/test-helper-icmp.sh
diff --git a/src/vpn/tests/test-helper-ifaddr.sh b/src/service/vpn/tests/test-helper-ifaddr.sh
index b8fde999d..b8fde999d 100755
--- a/src/vpn/tests/test-helper-ifaddr.sh
+++ b/src/service/vpn/tests/test-helper-ifaddr.sh
diff --git a/src/vpn/vpn.conf.in b/src/service/vpn/vpn.conf.in
index c0f4c59ed..c0f4c59ed 100644
--- a/src/vpn/vpn.conf.in
+++ b/src/service/vpn/vpn.conf.in
diff --git a/src/vpn/vpn.h b/src/service/vpn/vpn.h
index 77cfd34e6..77cfd34e6 100644
--- a/src/vpn/vpn.h
+++ b/src/service/vpn/vpn.h
diff --git a/src/vpn/vpn_api.c b/src/service/vpn/vpn_api.c
index 8a3464786..8a3464786 100644
--- a/src/vpn/vpn_api.c
+++ b/src/service/vpn/vpn_api.c