30 files changed, 16 insertions, 19 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index fdfcf9260..317caef67 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,13 +17,6 @@ CONVERSATION_DIR = conversation
 endif
 endif
 
-if HAVE_SQLITE
- SQLITE_DIR = sq
-endif
-
-if HAVE_POSTGRESQL
- POSTGRES_DIR = pq
-endif
 
 REST_DIR = rest
 
@@ -38,8 +31,6 @@ SUBDIRS = \
   arm \
   $(TESTING) \
   $(REST_DIR) \
-  $(SQLITE_DIR) \
-  $(POSTGRES_DIR) \
   datacache \
   datastore \
   template \
diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index def1eb58e..fd5d28d89 100644
--- a/src/datacache/Makefile.am
+++ b/src/datacache/Makefile.am
@@ -56,7 +56,7 @@ libgnunet_plugin_datacache_sqlite_la_SOURCES = \
   plugin_datacache_sqlite.c
 libgnunet_plugin_datacache_sqlite_la_LIBADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/sq/libgnunetsq.la \
+  $(top_builddir)/src/lib/sq/libgnunetsq.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
   $(LTLIBINTL)
 libgnunet_plugin_datacache_sqlite_la_LDFLAGS = \
@@ -74,7 +74,7 @@ libgnunet_plugin_datacache_heap_la_LDFLAGS = \
 libgnunet_plugin_datacache_postgres_la_SOURCES = \
   plugin_datacache_postgres.c
 libgnunet_plugin_datacache_postgres_la_LIBADD = \
-  $(top_builddir)/src/pq/libgnunetpq.la \
+  $(top_builddir)/src/lib/pq/libgnunetpq.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(GN_PLUGIN_LDFLAGS) -lpq
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
index e8ede4b3e..cecce6d58 100644
--- a/src/datastore/Makefile.am
+++ b/src/datastore/Makefile.am
@@ -97,7 +97,7 @@ noinst_LTLIBRARIES = \
 libgnunet_plugin_datastore_sqlite_la_SOURCES = \
   plugin_datastore_sqlite.c
 libgnunet_plugin_datastore_sqlite_la_LIBADD = \
-  $(top_builddir)/src/sq/libgnunetsq.la \
+  $(top_builddir)/src/lib/sq/libgnunetsq.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
   $(LTLIBINTL)
@@ -118,7 +118,7 @@ libgnunet_plugin_datastore_postgres_la_SOURCES = \
   plugin_datastore_postgres.c
 libgnunet_plugin_datastore_postgres_la_LIBADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/pq/libgnunetpq.la \
+  $(top_builddir)/src/lib/pq/libgnunetpq.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq
 libgnunet_plugin_datastore_postgres_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 27cbfcb14..c9871d8c7 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,7 +1,13 @@
+if HAVE_POSTGRESQL
+ POSTGRES_DIR = pq
+endif
+
 SUBDIRS = \
         util \
         hello \
         block \
         gnsrecord \
         curl \
-        json
+        json \
+        sq \
+        $(POSTGRES_DIR)
diff --git a/src/pq/.gitignore b/src/lib/pq/.gitignore
index 8de68ddc9..8de68ddc9 100644
--- a/src/pq/.gitignore
+++ b/src/lib/pq/.gitignore
diff --git a/src/pq/Makefile.am b/src/lib/pq/Makefile.am
index 6a42499ca..6a42499ca 100644
--- a/src/pq/Makefile.am
+++ b/src/lib/pq/Makefile.am
diff --git a/src/pq/meson.build b/src/lib/pq/meson.build
index b9b20d93c..b9b20d93c 100644
--- a/src/pq/meson.build
+++ b/src/lib/pq/meson.build
diff --git a/src/pq/pq.c b/src/lib/pq/pq.c
index 65e051bfc..65e051bfc 100644
--- a/src/pq/pq.c
+++ b/src/lib/pq/pq.c
diff --git a/src/pq/pq.h b/src/lib/pq/pq.h
index 65b72cedd..65b72cedd 100644
--- a/src/pq/pq.h
+++ b/src/lib/pq/pq.h
diff --git a/src/pq/pq_connect.c b/src/lib/pq/pq_connect.c
index c46d865a3..c46d865a3 100644
--- a/src/pq/pq_connect.c
+++ b/src/lib/pq/pq_connect.c
diff --git a/src/pq/pq_eval.c b/src/lib/pq/pq_eval.c
index e31475e13..e31475e13 100644
--- a/src/pq/pq_eval.c
+++ b/src/lib/pq/pq_eval.c
diff --git a/src/pq/pq_event.c b/src/lib/pq/pq_event.c
index fff9e16f7..fff9e16f7 100644
--- a/src/pq/pq_event.c
+++ b/src/lib/pq/pq_event.c
diff --git a/src/pq/pq_exec.c b/src/lib/pq/pq_exec.c
index 1fd8c5068..1fd8c5068 100644
--- a/src/pq/pq_exec.c
+++ b/src/lib/pq/pq_exec.c
diff --git a/src/pq/pq_prepare.c b/src/lib/pq/pq_prepare.c
index b4292dea3..b4292dea3 100644
--- a/src/pq/pq_prepare.c
+++ b/src/lib/pq/pq_prepare.c
diff --git a/src/pq/pq_query_helper.c b/src/lib/pq/pq_query_helper.c
index 1e2f7a965..1e2f7a965 100644
--- a/src/pq/pq_query_helper.c
+++ b/src/lib/pq/pq_query_helper.c
diff --git a/src/pq/pq_result_helper.c b/src/lib/pq/pq_result_helper.c
index f230826cb..f230826cb 100644
--- a/src/pq/pq_result_helper.c
+++ b/src/lib/pq/pq_result_helper.c
diff --git a/src/pq/test_pq.c b/src/lib/pq/test_pq.c
index d70e18e6d..d70e18e6d 100644
--- a/src/pq/test_pq.c
+++ b/src/lib/pq/test_pq.c
diff --git a/src/pq/versioning.sql b/src/lib/pq/versioning.sql
index c7fa81213..c7fa81213 100644
--- a/src/pq/versioning.sql
+++ b/src/lib/pq/versioning.sql
diff --git a/src/sq/.gitignore b/src/lib/sq/.gitignore
index 951587047..951587047 100644
--- a/src/sq/.gitignore
+++ b/src/lib/sq/.gitignore
diff --git a/src/sq/Makefile.am b/src/lib/sq/Makefile.am
index a77a380af..a77a380af 100644
--- a/src/sq/Makefile.am
+++ b/src/lib/sq/Makefile.am
diff --git a/src/sq/meson.build b/src/lib/sq/meson.build
index 482d1c40a..482d1c40a 100644
--- a/src/sq/meson.build
+++ b/src/lib/sq/meson.build
diff --git a/src/sq/sq.c b/src/lib/sq/sq.c
index 96d1d333d..96d1d333d 100644
--- a/src/sq/sq.c
+++ b/src/lib/sq/sq.c
diff --git a/src/sq/sq_exec.c b/src/lib/sq/sq_exec.c
index d4690ee99..d4690ee99 100644
--- a/src/sq/sq_exec.c
+++ b/src/lib/sq/sq_exec.c
diff --git a/src/sq/sq_prepare.c b/src/lib/sq/sq_prepare.c
index d1ca0e8bd..d1ca0e8bd 100644
--- a/src/sq/sq_prepare.c
+++ b/src/lib/sq/sq_prepare.c
diff --git a/src/sq/sq_query_helper.c b/src/lib/sq/sq_query_helper.c
index ead1b5bdd..ead1b5bdd 100644
--- a/src/sq/sq_query_helper.c
+++ b/src/lib/sq/sq_query_helper.c
diff --git a/src/sq/sq_result_helper.c b/src/lib/sq/sq_result_helper.c
index 5ea3f1e56..5ea3f1e56 100644
--- a/src/sq/sq_result_helper.c
+++ b/src/lib/sq/sq_result_helper.c
diff --git a/src/sq/test_sq.c b/src/lib/sq/test_sq.c
index ecd9918d7..ecd9918d7 100644
--- a/src/sq/test_sq.c
+++ b/src/lib/sq/test_sq.c
diff --git a/src/namecache/Makefile.am b/src/namecache/Makefile.am
index 9ece350de..3c0a70252 100644
--- a/src/namecache/Makefile.am
+++ b/src/namecache/Makefile.am
@@ -120,7 +120,7 @@ libgnunet_plugin_namecache_sqlite_la_SOURCES = \
   plugin_namecache_sqlite.c
 libgnunet_plugin_namecache_sqlite_la_LIBADD = \
   libgnunetnamecache.la  \
-  $(top_builddir)/src/sq/libgnunetsq.la \
+  $(top_builddir)/src/lib/sq/libgnunetsq.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
@@ -134,7 +134,7 @@ libgnunet_plugin_namecache_postgres_la_SOURCES = \
   plugin_namecache_postgres.c
 libgnunet_plugin_namecache_postgres_la_LIBADD = \
   libgnunetnamecache.la  \
-  $(top_builddir)/src/pq/libgnunetpq.la  \
+  $(top_builddir)/src/lib/pq/libgnunetpq.la  \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 1e2423cf0..39a75772e 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -201,7 +201,7 @@ libgnunet_plugin_namestore_sqlite_la_SOURCES = \
 libgnunet_plugin_namestore_sqlite_la_LIBADD = \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la  \
   $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/sq/libgnunetsq.la \
+  $(top_builddir)/src/lib/sq/libgnunetsq.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
   $(LTLIBINTL)
@@ -213,7 +213,7 @@ libgnunet_plugin_namestore_postgres_la_SOURCES = \
 libgnunet_plugin_namestore_postgres_la_LIBADD = \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la  \
   $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/pq/libgnunetpq.la  \
+  $(top_builddir)/src/lib/pq/libgnunetpq.la  \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq \
   $(LTLIBINTL)
diff --git a/src/peerstore/Makefile.am b/src/peerstore/Makefile.am
index e9835eb31..6f62c0e71 100644
--- a/src/peerstore/Makefile.am
+++ b/src/peerstore/Makefile.am
@@ -71,7 +71,7 @@ libgnunet_plugin_peerstore_sqlite_la_SOURCES = \
   plugin_peerstore_sqlite.c
 libgnunet_plugin_peerstore_sqlite_la_LIBADD = \
   libgnunetpeerstore.la  \
-  $(top_builddir)/src/sq/libgnunetsq.la \
+  $(top_builddir)/src/lib/sq/libgnunetsq.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(XLIBS) -lsqlite3 \
   $(LTLIBINTL)