BUILD: Move namecache to service

31 files changed, 121 insertions, 82 deletions

diff --git a/configure.ac b/configure.ac
index bb3868651..df0f29095 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1241,6 +1241,7 @@ src/plugin/Makefile
 src/plugin/block/Makefile
 src/plugin/dhtu/Makefile
 src/plugin/gnsrecord/Makefile
+src/plugin/namecache/Makefile
 src/service/Makefile
 src/service/arm/Makefile
 src/service/arm/arm.conf
@@ -1258,6 +1259,8 @@ src/service/dns/dns.conf
 src/service/hostlist/Makefile
 src/service/identity/Makefile
 src/service/identity/identity.conf
+src/service/namecache/Makefile
+src/service/namecache/namecache.conf
 src/service/nat/Makefile
 src/service/nat/nat.conf
 src/service/nat-auto/Makefile
@@ -1285,6 +1288,7 @@ src/cli/cadet/Makefile
 src/cli/core/Makefile
 src/cli/datastore/Makefile
 src/cli/dht/Makefile
+src/cli/namecache/Makefile
 src/cli/nat/Makefile
 src/cli/nat-auto/Makefile
 src/cli/nse/Makefile
@@ -1312,8 +1316,6 @@ src/gns/nss/Makefile
 src/lib/hello/Makefile
 src/include/Makefile
 src/include/gnunet_config.h
-src/namecache/Makefile
-src/namecache/namecache.conf
 src/namestore/Makefile
 src/namestore/namestore.conf
 src/pt/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9086d5edc..d34922beb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,6 +7,7 @@ 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/namecache/gnunet-namecache.c
 src/cli/nat-auto/gnunet-nat-auto.c
 src/cli/nat-auto/gnunet-nat-server.c
 src/cli/nat/gnunet-nat.c
@@ -255,12 +256,6 @@ src/messenger/messenger_api_util.c
 src/messenger/plugin_gnsrecord_messenger.c
 src/messenger/testing_messenger_barrier.c
 src/messenger/testing_messenger_setup.c
-src/namecache/gnunet-namecache.c
-src/namecache/gnunet-service-namecache.c
-src/namecache/namecache_api.c
-src/namecache/plugin_namecache_flat.c
-src/namecache/plugin_namecache_postgres.c
-src/namecache/plugin_namecache_sqlite.c
 src/namestore/gnunet-namestore-dbtool.c
 src/namestore/gnunet-namestore-fcfsd.c
 src/namestore/gnunet-namestore-zonefile.c
@@ -279,6 +274,9 @@ src/plugin/dhtu/plugin_dhtu_gnunet.c
 src/plugin/dhtu/plugin_dhtu_ip.c
 src/plugin/dhtu/testing_dhtu_cmd_send.c
 src/plugin/gnsrecord/plugin_gnsrecord_dns.c
+src/plugin/namecache/plugin_namecache_flat.c
+src/plugin/namecache/plugin_namecache_postgres.c
+src/plugin/namecache/plugin_namecache_sqlite.c
 src/pt/gnunet-daemon-pt.c
 src/reclaim/did_core.c
 src/reclaim/did_helper.c
@@ -381,6 +379,8 @@ 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/namecache/gnunet-service-namecache.c
+src/service/namecache/namecache_api.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
diff --git a/src/Makefile.am b/src/Makefile.am
index 16eafc57b..d166fd788 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,6 @@ SUBDIRS = \
         rest-plugin \
         cli \
         contrib \
-  namecache \
   namestore \
   set \
   seti \
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index 69f440f21..0235c0a1c 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -8,4 +8,5 @@ SUBDIRS = \
         nse \
         datastore \
         dht \
+        namecache \
         cadet
diff --git a/src/cli/namecache/.gitignore b/src/cli/namecache/.gitignore
new file mode 100644
index 000000000..54aa17e9f
--- /dev/null
+++ b/src/cli/namecache/.gitignore
@@ -0,0 +1 @@
+gnunet-namecache
diff --git a/src/cli/namecache/Makefile.am b/src/cli/namecache/Makefile.am
new file mode 100644
index 000000000..48ee216be
--- /dev/null
+++ b/src/cli/namecache/Makefile.am
@@ -0,0 +1,20 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include $(POSTGRESQL_CPPFLAGS)
+
+plugindir = $(libdir)/gnunet
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+bin_PROGRAMS = \
+ gnunet-namecache
+
+gnunet_namecache_SOURCES = \
+ gnunet-namecache.c
+gnunet_namecache_LDADD = \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
+  $(GN_LIBINTL)
diff --git a/src/namecache/gnunet-namecache.c b/src/cli/namecache/gnunet-namecache.c
index 0236609aa..0236609aa 100644
--- a/src/namecache/gnunet-namecache.c
+++ b/src/cli/namecache/gnunet-namecache.c
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 4a84f914f..379d6697a 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -205,7 +205,7 @@ gnunet_service_gns_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/dns/libgnunetdns.la \
   $(top_builddir)/src/service/dht/libgnunetdht.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
   $(LIBIDN) $(LIBIDN2) \
   $(GN_LIBINTL)
 
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 3dbec4a25..685829cc2 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -186,7 +186,7 @@ gnunet_namestore_fcfsd_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
 gnunet_service_namestore_SOURCES = \
  gnunet-service-namestore.c
 gnunet_service_namestore_LDADD = \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
@@ -245,7 +245,7 @@ test_namestore_api_store_update_sqlite_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
   libgnunetnamestore.la
 
 test_namestore_api_store_update_postgres_SOURCES = \
@@ -255,7 +255,7 @@ test_namestore_api_store_update_postgres_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
   libgnunetnamestore.la
 
 test_namestore_api_lookup_nick_sqlite_SOURCES = \
@@ -265,7 +265,7 @@ test_namestore_api_lookup_nick_sqlite_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
   libgnunetnamestore.la
 
 test_namestore_api_lookup_nick_postgres_SOURCES = \
@@ -275,7 +275,7 @@ test_namestore_api_lookup_nick_postgres_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
   libgnunetnamestore.la
 
 test_namestore_api_remove_sqlite_SOURCES = \
diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am
index 891777369..2939d3379 100644
--- a/src/plugin/Makefile.am
+++ b/src/plugin/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS = \
         block \
         gnsrecord \
-        dhtu
+        dhtu \
+        namecache
diff --git a/src/namecache/Makefile.am b/src/plugin/namecache/Makefile.am
index 36e70813a..ac2e2592b 100644
--- a/src/namecache/Makefile.am
+++ b/src/plugin/namecache/Makefile.am
@@ -7,9 +7,6 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
 
-pkgcfg_DATA = \
-   namecache.conf
-
 sqldir = $(prefix)/share/gnunet/sql/
 
 sql_DATA = \
@@ -55,50 +52,6 @@ TESTS = \
   $(check_PROGRAMS)
 endif
 
-lib_LTLIBRARIES = \
-  libgnunetnamecache.la
-
-
-libgnunetnamecache_la_SOURCES = \
-  namecache_api.c \
-  namecache.h
-libgnunetnamecache_la_LIBADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-libgnunetnamecache_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 0:0:0
-
-
-libexec_PROGRAMS = \
- gnunet-service-namecache
-
-bin_PROGRAMS = \
- gnunet-namecache
-
-gnunet_namecache_SOURCES = \
- gnunet-namecache.c
-gnunet_namecache_LDADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetnamecache.la \
-  $(GN_LIBINTL)
-
-gnunet_service_namecache_SOURCES = \
- gnunet-service-namecache.c
-
-gnunet_service_namecache_LDADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetnamecache.la \
-  $(GN_LIBINTL)
-
-
 plugin_LTLIBRARIES = \
   $(SQLITE_PLUGIN) \
         $(FLAT_PLUGIN) \
@@ -107,7 +60,7 @@ plugin_LTLIBRARIES = \
 libgnunet_plugin_namecache_flat_la_SOURCES = \
   plugin_namecache_flat.c
 libgnunet_plugin_namecache_flat_la_LIBADD = \
-  libgnunetnamecache.la  \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la  \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
@@ -119,7 +72,7 @@ libgnunet_plugin_namecache_flat_la_LDFLAGS = \
 libgnunet_plugin_namecache_sqlite_la_SOURCES = \
   plugin_namecache_sqlite.c
 libgnunet_plugin_namecache_sqlite_la_LIBADD = \
-  libgnunetnamecache.la  \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la  \
   $(top_builddir)/src/lib/sq/libgnunetsq.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -133,7 +86,7 @@ libgnunet_plugin_namecache_sqlite_la_LDFLAGS = \
 libgnunet_plugin_namecache_postgres_la_SOURCES = \
   plugin_namecache_postgres.c
 libgnunet_plugin_namecache_postgres_la_LIBADD = \
-  libgnunetnamecache.la  \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la  \
   $(top_builddir)/src/lib/pq/libgnunetpq.la  \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -143,16 +96,6 @@ libgnunet_plugin_namecache_postgres_la_LIBADD = \
 libgnunet_plugin_namecache_postgres_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
 
-test_namecache_api_cache_block_SOURCES = \
- test_namecache_api_cache_block.c
-test_namecache_api_cache_block_LDADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetnamecache.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-
 test_plugin_namecache_flat_SOURCES = \
  test_plugin_namecache.c
 test_plugin_namecache_flat_LDADD = \
@@ -172,7 +115,6 @@ test_plugin_namecache_postgres_LDADD = \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 EXTRA_DIST = \
-  test_namecache_api.conf \
   test_plugin_namecache_sqlite.conf \
   test_plugin_namecache_postgres.conf \
   test_plugin_namecache_flat.conf \
diff --git a/src/namecache/namecache-0001.sql b/src/plugin/namecache/namecache-0001.sql
index 8509b078f..8509b078f 100644
--- a/src/namecache/namecache-0001.sql
+++ b/src/plugin/namecache/namecache-0001.sql
diff --git a/src/namecache/namecache-drop.sql b/src/plugin/namecache/namecache-drop.sql
index 197ee78c1..197ee78c1 100644
--- a/src/namecache/namecache-drop.sql
+++ b/src/plugin/namecache/namecache-drop.sql
diff --git a/src/namecache/plugin_namecache_flat.c b/src/plugin/namecache/plugin_namecache_flat.c
index eb7800051..ba118bf02 100644
--- a/src/namecache/plugin_namecache_flat.c
+++ b/src/plugin/namecache/plugin_namecache_flat.c
@@ -28,7 +28,6 @@
 #include "gnunet_namecache_plugin.h"
 #include "gnunet_namecache_service.h"
 #include "gnunet_gnsrecord_lib.h"
-#include "namecache.h"
 
 /**
  * Context for all functions in this plugin.
diff --git a/src/namecache/plugin_namecache_postgres.c b/src/plugin/namecache/plugin_namecache_postgres.c
index cdbe248b6..7e2925d1a 100644
--- a/src/namecache/plugin_namecache_postgres.c
+++ b/src/plugin/namecache/plugin_namecache_postgres.c
@@ -28,7 +28,6 @@
 #include "gnunet_namecache_service.h"
 #include "gnunet_gnsrecord_lib.h"
 #include "gnunet_pq_lib.h"
-#include "namecache.h"
 
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "namecache-postgres", __VA_ARGS__)
diff --git a/src/namecache/plugin_namecache_sqlite.c b/src/plugin/namecache/plugin_namecache_sqlite.c
index 2271d1db5..d8b485381 100644
--- a/src/namecache/plugin_namecache_sqlite.c
+++ b/src/plugin/namecache/plugin_namecache_sqlite.c
@@ -28,7 +28,6 @@
 #include "gnunet_namecache_plugin.h"
 #include "gnunet_namecache_service.h"
 #include "gnunet_gnsrecord_lib.h"
-#include "namecache.h"
 #include <sqlite3.h>
 
 /**
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 45b24a4a2..02148d0c7 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -17,5 +17,6 @@ SUBDIRS = \
         datacache \
         datastore \
         dht \
+  namecache \
   regex \
         cadet
diff --git a/src/namecache/.gitignore b/src/service/namecache/.gitignore
index 2abc07dfb..280bf9f39 100644
--- a/src/namecache/.gitignore
+++ b/src/service/namecache/.gitignore
@@ -1,5 +1,4 @@
 gnunet-service-namecache
-gnunet-namecache
 test_namecache_api_cache_block
 test_plugin_namecache_postgres
 test_plugin_namecache_sqlite
diff --git a/src/service/namecache/Makefile.am b/src/service/namecache/Makefile.am
new file mode 100644
index 000000000..78e9eb48c
--- /dev/null
+++ b/src/service/namecache/Makefile.am
@@ -0,0 +1,76 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include $(POSTGRESQL_CPPFLAGS)
+
+plugindir = $(libdir)/gnunet
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfg_DATA = \
+   namecache.conf
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIBS = -lgcov
+endif
+
+# testcases do not even build yet; thus: experimental!
+TESTING_TESTS = \
+ test_namecache_api_cache_block
+
+if HAVE_SQLITE
+check_PROGRAMS = \
+ $(TESTING_TESTS)
+endif
+
+if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
+TESTS = \
+  $(check_PROGRAMS)
+endif
+
+lib_LTLIBRARIES = \
+  libgnunetnamecache.la
+
+
+libgnunetnamecache_la_SOURCES = \
+  namecache_api.c \
+  namecache.h
+libgnunetnamecache_la_LIBADD = \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+libgnunetnamecache_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)  \
+  -version-info 0:0:0
+
+
+libexec_PROGRAMS = \
+ gnunet-service-namecache
+
+gnunet_service_namecache_SOURCES = \
+ gnunet-service-namecache.c
+
+gnunet_service_namecache_LDADD = \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  libgnunetnamecache.la \
+  $(GN_LIBINTL)
+
+
+test_namecache_api_cache_block_SOURCES = \
+ test_namecache_api_cache_block.c
+test_namecache_api_cache_block_LDADD = \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  libgnunetnamecache.la \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la
+
+
+EXTRA_DIST = \
+  test_namecache_api.conf
diff --git a/src/namecache/gnunet-service-namecache.c b/src/service/namecache/gnunet-service-namecache.c
index dce843801..dce843801 100644
--- a/src/namecache/gnunet-service-namecache.c
+++ b/src/service/namecache/gnunet-service-namecache.c
diff --git a/src/namecache/meson.build b/src/service/namecache/meson.build
index ee6988a99..ee6988a99 100644
--- a/src/namecache/meson.build
+++ b/src/service/namecache/meson.build
diff --git a/src/namecache/namecache.conf.in b/src/service/namecache/namecache.conf.in
index 6bf75454b..6bf75454b 100644
--- a/src/namecache/namecache.conf.in
+++ b/src/service/namecache/namecache.conf.in
diff --git a/src/namecache/namecache.h b/src/service/namecache/namecache.h
index cb4d1bcdd..cb4d1bcdd 100644
--- a/src/namecache/namecache.h
+++ b/src/service/namecache/namecache.h
diff --git a/src/namecache/namecache_api.c b/src/service/namecache/namecache_api.c
index fb4b0e304..fb4b0e304 100644
--- a/src/namecache/namecache_api.c
+++ b/src/service/namecache/namecache_api.c
diff --git a/src/namecache/test_namecache_api.conf b/src/service/namecache/test_namecache_api.conf
index b1ae31f14..b1ae31f14 100644
--- a/src/namecache/test_namecache_api.conf
+++ b/src/service/namecache/test_namecache_api.conf
diff --git a/src/namecache/test_namecache_api_cache_block.c b/src/service/namecache/test_namecache_api_cache_block.c
index 3a18a72e1..3a18a72e1 100644
--- a/src/namecache/test_namecache_api_cache_block.c
+++ b/src/service/namecache/test_namecache_api_cache_block.c
diff --git a/src/namecache/test_plugin_namecache.c b/src/service/namecache/test_plugin_namecache.c
index 141698a23..141698a23 100644
--- a/src/namecache/test_plugin_namecache.c
+++ b/src/service/namecache/test_plugin_namecache.c
diff --git a/src/namecache/test_plugin_namecache_flat.conf b/src/service/namecache/test_plugin_namecache_flat.conf
index efe77e37a..efe77e37a 100644
--- a/src/namecache/test_plugin_namecache_flat.conf
+++ b/src/service/namecache/test_plugin_namecache_flat.conf
diff --git a/src/namecache/test_plugin_namecache_postgres.conf b/src/service/namecache/test_plugin_namecache_postgres.conf
index 8473857d5..8473857d5 100644
--- a/src/namecache/test_plugin_namecache_postgres.conf
+++ b/src/service/namecache/test_plugin_namecache_postgres.conf
diff --git a/src/namecache/test_plugin_namecache_sqlite.conf b/src/service/namecache/test_plugin_namecache_sqlite.conf
index 24eecd286..24eecd286 100644
--- a/src/namecache/test_plugin_namecache_sqlite.conf
+++ b/src/service/namecache/test_plugin_namecache_sqlite.conf
diff --git a/src/zonemaster/Makefile.am b/src/zonemaster/Makefile.am
index 1c0d882d6..8f4e74588 100644
--- a/src/zonemaster/Makefile.am
+++ b/src/zonemaster/Makefile.am
@@ -27,6 +27,6 @@ gnunet_service_zonemaster_LDADD = \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
   $(GN_LIBINTL) \
   -lpthread