19 files changed, 42 insertions, 32 deletions

diff --git a/configure.ac b/configure.ac
index 199081918..3407ea68a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1257,6 +1257,8 @@ src/service/identity/Makefile
 src/service/identity/identity.conf
 src/service/nat/Makefile
 src/service/nat/nat.conf
+src/service/nat-auto/Makefile
+src/service/nat-auto/nat-auto.conf
 src/service/nse/Makefile
 src/service/nse/nse.conf
 src/service/peerstore/Makefile
@@ -1278,6 +1280,7 @@ src/cli/core/Makefile
 src/cli/datastore/Makefile
 src/cli/dht/Makefile
 src/cli/nat/Makefile
+src/cli/nat-auto/Makefile
 src/cli/nse/Makefile
 src/cli/statistics/Makefile
 src/cli/util/Makefile
@@ -1310,8 +1313,6 @@ src/namecache/Makefile
 src/namecache/namecache.conf
 src/namestore/Makefile
 src/namestore/namestore.conf
-src/nat-auto/Makefile
-src/nat-auto/nat-auto.conf
 src/pt/Makefile
 src/regex/Makefile
 src/regex/regex.conf
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c58c36658..1982dedd1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,6 +7,8 @@ src/cli/dht/gnunet-dht-hello.c
 src/cli/dht/gnunet-dht-monitor.c
 src/cli/dht/gnunet-dht-put.c
 src/cli/identity/gnunet-identity.c
+src/cli/nat-auto/gnunet-nat-auto.c
+src/cli/nat-auto/gnunet-nat-server.c
 src/cli/nat/gnunet-nat.c
 src/cli/nse/gnunet-nse.c
 src/cli/statistics/gnunet-statistics.c
@@ -281,13 +283,6 @@ src/namestore/plugin_namestore_flat.c
 src/namestore/plugin_namestore_postgres.c
 src/namestore/plugin_namestore_sqlite.c
 src/namestore/plugin_rest_namestore.c
-src/nat-auto/gnunet-nat-auto.c
-src/nat-auto/gnunet-nat-auto_legacy.c
-src/nat-auto/gnunet-nat-server.c
-src/nat-auto/gnunet-service-nat-auto.c
-src/nat-auto/gnunet-service-nat-auto_legacy.c
-src/nat-auto/nat_auto_api.c
-src/nat-auto/nat_auto_api_test.c
 src/plugin/block/plugin_block_template.c
 src/plugin/block/plugin_block_test.c
 src/plugin/dhtu/plugin_dhtu_gnunet.c
@@ -400,6 +395,11 @@ src/service/identity/gnunet-service-identity.c
 src/service/identity/identity_api.c
 src/service/identity/identity_api_lookup.c
 src/service/identity/identity_api_suffix_lookup.c
+src/service/nat-auto/gnunet-nat-auto_legacy.c
+src/service/nat-auto/gnunet-service-nat-auto.c
+src/service/nat-auto/gnunet-service-nat-auto_legacy.c
+src/service/nat-auto/nat_auto_api.c
+src/service/nat-auto/nat_auto_api_test.c
 src/service/nat/gnunet-helper-nat-client.c
 src/service/nat/gnunet-helper-nat-server.c
 src/service/nat/gnunet-service-nat.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 8e950ee68..10af79519 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,6 @@ SUBDIRS = \
         rest-plugin \
         cli \
         contrib \
-  nat-auto \
   hostlist \
   topology \
   regex \
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index cc716dda4..69f440f21 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -4,6 +4,7 @@ SUBDIRS = \
         statistics \
         core \
         nat \
+        nat-auto \
         nse \
         datastore \
         dht \
diff --git a/src/nat-auto/.gitignore b/src/cli/nat-auto/.gitignore
index 6ba53d72f..c750bf612 100644
--- a/src/nat-auto/.gitignore
+++ b/src/cli/nat-auto/.gitignore
@@ -1,3 +1,2 @@
-gnunet-service-nat-auto
 gnunet-nat-auto
 gnunet-nat-server
diff --git a/src/cli/nat-auto/Makefile.am b/src/cli/nat-auto/Makefile.am
new file mode 100644
index 000000000..4b2d74280
--- /dev/null
+++ b/src/cli/nat-auto/Makefile.am
@@ -0,0 +1,26 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+bin_PROGRAMS = \
+ gnunet-nat-auto \
+ gnunet-nat-server
+
+gnunet_nat_server_SOURCES = \
+ gnunet-nat-server.c
+gnunet_nat_server_LDADD = \
+  $(top_builddir)/src/service/nat/libgnunetnatnew.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la
+gnunet_nat_server_LDFLAGS = \
+  $(GN_LIBINTL)
+
+gnunet_nat_auto_SOURCES = \
+  gnunet-nat-auto.c
+gnunet_nat_auto_LDADD = \
+  $(top_builddir)/src/service/nat-auto/libgnunetnatauto.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la
+gnunet_nat_auto_LDFLAGS = \
+  $(GN_LIBINTL)
diff --git a/src/nat-auto/gnunet-nat-auto.c b/src/cli/nat-auto/gnunet-nat-auto.c
index 055a949bd..055a949bd 100644
--- a/src/nat-auto/gnunet-nat-auto.c
+++ b/src/cli/nat-auto/gnunet-nat-auto.c
diff --git a/src/nat-auto/gnunet-nat-server.c b/src/cli/nat-auto/gnunet-nat-server.c
index 0ff71ca8c..baa610e8f 100644
--- a/src/nat-auto/gnunet-nat-server.c
+++ b/src/cli/nat-auto/gnunet-nat-server.c
@@ -27,7 +27,8 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_nat_service.h"
 #include "gnunet_protocols.h"
-#include "nat-auto.h"
+// FIXME can we build this without this header?
+#include "../../service/nat-auto/nat-auto.h"
 
 
 /**
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index aa87eb34a..f25006a37 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -5,6 +5,7 @@ SUBDIRS = \
         peerstore \
         testing \
         nat \
+        nat-auto \
         transport \
         core \
         nse \
diff --git a/src/service/nat-auto/.gitignore b/src/service/nat-auto/.gitignore
new file mode 100644
index 000000000..9bb5406ed
--- /dev/null
+++ b/src/service/nat-auto/.gitignore
@@ -0,0 +1,2 @@
+gnunet-service-nat-auto
+
diff --git a/src/nat-auto/Makefile.am b/src/service/nat-auto/Makefile.am
index 7c3f8e11d..a82afbea2 100644
--- a/src/nat-auto/Makefile.am
+++ b/src/service/nat-auto/Makefile.am
@@ -8,29 +8,9 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 pkgcfg_DATA = \
   nat-auto.conf
 
-bin_PROGRAMS = \
- gnunet-nat-auto \
- gnunet-nat-server
-
 libexec_PROGRAMS = \
  gnunet-service-nat-auto
 
-gnunet_nat_server_SOURCES = \
- gnunet-nat-server.c nat-auto.h
-gnunet_nat_server_LDADD = \
-  $(top_builddir)/src/service/nat/libgnunetnatnew.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_nat_server_LDFLAGS = \
-  $(GN_LIBINTL)
-
-gnunet_nat_auto_SOURCES = \
-  gnunet-nat-auto.c nat-auto.h
-gnunet_nat_auto_LDADD = \
-  libgnunetnatauto.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_nat_auto_LDFLAGS = \
-  $(GN_LIBINTL)
-
 if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
diff --git a/src/nat-auto/gnunet-nat-auto_legacy.c b/src/service/nat-auto/gnunet-nat-auto_legacy.c
index 4334cc953..4334cc953 100644
--- a/src/nat-auto/gnunet-nat-auto_legacy.c
+++ b/src/service/nat-auto/gnunet-nat-auto_legacy.c
diff --git a/src/nat-auto/gnunet-service-nat-auto.c b/src/service/nat-auto/gnunet-service-nat-auto.c
index 7d7c732a0..7d7c732a0 100644
--- a/src/nat-auto/gnunet-service-nat-auto.c
+++ b/src/service/nat-auto/gnunet-service-nat-auto.c
diff --git a/src/nat-auto/gnunet-service-nat-auto_legacy.c b/src/service/nat-auto/gnunet-service-nat-auto_legacy.c
index de7910588..de7910588 100644
--- a/src/nat-auto/gnunet-service-nat-auto_legacy.c
+++ b/src/service/nat-auto/gnunet-service-nat-auto_legacy.c
diff --git a/src/nat-auto/meson.build b/src/service/nat-auto/meson.build
index 9b5ff4cdf..9b5ff4cdf 100644
--- a/src/nat-auto/meson.build
+++ b/src/service/nat-auto/meson.build
diff --git a/src/nat-auto/nat-auto.conf.in b/src/service/nat-auto/nat-auto.conf.in
index d5f5c4eef..d5f5c4eef 100644
--- a/src/nat-auto/nat-auto.conf.in
+++ b/src/service/nat-auto/nat-auto.conf.in
diff --git a/src/nat-auto/nat-auto.h b/src/service/nat-auto/nat-auto.h
index ac0e7c2d5..ac0e7c2d5 100644
--- a/src/nat-auto/nat-auto.h
+++ b/src/service/nat-auto/nat-auto.h
diff --git a/src/nat-auto/nat_auto_api.c b/src/service/nat-auto/nat_auto_api.c
index 3c982f883..3c982f883 100644
--- a/src/nat-auto/nat_auto_api.c
+++ b/src/service/nat-auto/nat_auto_api.c
diff --git a/src/nat-auto/nat_auto_api_test.c b/src/service/nat-auto/nat_auto_api_test.c
index 9067aafda..9067aafda 100644
--- a/src/nat-auto/nat_auto_api_test.c
+++ b/src/service/nat-auto/nat_auto_api_test.c