[gnunet] 03/10: BUILD: Move pq/sq to lib

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit 00407f6a36880fda570604cf4e64858bb08a025b
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Wed Oct 18 13:53:00 2023 +0200

    BUILD: Move pq/sq to lib
---
 configure.ac                        |  4 ++--
 po/POTFILES.in                      | 28 ++++++++++++++--------------
 src/Makefile.am                     |  9 ---------
 src/datacache/Makefile.am           |  4 ++--
 src/datastore/Makefile.am           |  4 ++--
 src/lib/Makefile.am                 |  8 +++++++-
 src/{ => lib}/pq/.gitignore         |  0
 src/{ => lib}/pq/Makefile.am        |  0
 src/{ => lib}/pq/meson.build        |  0
 src/{ => lib}/pq/pq.c               |  0
 src/{ => lib}/pq/pq.h               |  0
 src/{ => lib}/pq/pq_connect.c       |  0
 src/{ => lib}/pq/pq_eval.c          |  0
 src/{ => lib}/pq/pq_event.c         |  0
 src/{ => lib}/pq/pq_exec.c          |  0
 src/{ => lib}/pq/pq_prepare.c       |  0
 src/{ => lib}/pq/pq_query_helper.c  |  0
 src/{ => lib}/pq/pq_result_helper.c |  0
 src/{ => lib}/pq/test_pq.c          |  0
 src/{ => lib}/pq/versioning.sql     |  0
 src/{ => lib}/sq/.gitignore         |  0
 src/{ => lib}/sq/Makefile.am        |  0
 src/{ => lib}/sq/meson.build        |  0
 src/{ => lib}/sq/sq.c               |  0
 src/{ => lib}/sq/sq_exec.c          |  0
 src/{ => lib}/sq/sq_prepare.c       |  0
 src/{ => lib}/sq/sq_query_helper.c  |  0
 src/{ => lib}/sq/sq_result_helper.c |  0
 src/{ => lib}/sq/test_sq.c          |  0
 src/namecache/Makefile.am           |  4 ++--
 src/namestore/Makefile.am           |  4 ++--
 src/peerstore/Makefile.am           |  2 +-
 32 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/configure.ac b/configure.ac
index 70483ebe1..d27189169 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1235,6 +1235,8 @@ src/lib/block/Makefile
 src/lib/curl/Makefile
 src/lib/gnsrecord/Makefile
 src/lib/json/Makefile
+src/lib/sq/Makefile
+src/lib/pq/Makefile
 src/plugin/Makefile
 src/plugin/block/Makefile
 src/plugin/gnsrecord/Makefile
@@ -1278,7 +1280,6 @@ src/nse/Makefile
 src/nse/nse.conf
 src/peerstore/Makefile
 src/peerstore/peerstore.conf
-src/pq/Makefile
 src/pt/Makefile
 src/regex/Makefile
 src/regex/regex.conf
@@ -1296,7 +1297,6 @@ src/seti/Makefile
 src/seti/seti.conf
 src/setu/Makefile
 src/setu/setu.conf
-src/sq/Makefile
 src/statistics/Makefile
 src/statistics/statistics.conf
 src/template/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ca1a7fe0b..54f8e9cc7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -188,6 +188,19 @@ src/lib/json/json_generator.c
 src/lib/json/json_helper.c
 src/lib/json/json_mhd.c
 src/lib/json/json_pack.c
+src/lib/pq/pq.c
+src/lib/pq/pq_connect.c
+src/lib/pq/pq_eval.c
+src/lib/pq/pq_event.c
+src/lib/pq/pq_exec.c
+src/lib/pq/pq_prepare.c
+src/lib/pq/pq_query_helper.c
+src/lib/pq/pq_result_helper.c
+src/lib/sq/sq.c
+src/lib/sq/sq_exec.c
+src/lib/sq/sq_prepare.c
+src/lib/sq/sq_query_helper.c
+src/lib/sq/sq_result_helper.c
 src/lib/util/bandwidth.c
 src/lib/util/benchmark.c
 src/lib/util/bio.c
@@ -338,14 +351,6 @@ src/peerstore/plugin_peerstore_sqlite.c
 src/plugin/block/plugin_block_template.c
 src/plugin/block/plugin_block_test.c
 src/plugin/gnsrecord/plugin_gnsrecord_dns.c
-src/pq/pq.c
-src/pq/pq_connect.c
-src/pq/pq_eval.c
-src/pq/pq_event.c
-src/pq/pq_exec.c
-src/pq/pq_prepare.c
-src/pq/pq_query_helper.c
-src/pq/pq_result_helper.c
 src/pt/gnunet-daemon-pt.c
 src/reclaim/did_core.c
 src/reclaim/did_helper.c
@@ -434,11 +439,6 @@ src/setu/ibf.c
 src/setu/ibf_sim.c
 src/setu/plugin_block_setu_test.c
 src/setu/setu_api.c
-src/sq/sq.c
-src/sq/sq_exec.c
-src/sq/sq_prepare.c
-src/sq/sq_query_helper.c
-src/sq/sq_result_helper.c
 src/statistics/gnunet-service-statistics.c
 src/statistics/gnunet-statistics.c
 src/statistics/statistics_api.c
@@ -499,4 +499,4 @@ src/fs/fs_api.h
 src/include/gnunet_json_lib.h
 src/include/gnunet_pq_lib.h
 src/include/gnunet_transport_hello_service.h
-src/pq/pq.h
+src/lib/pq/pq.h
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
similarity index 100%
rename from src/pq/.gitignore
rename to src/lib/pq/.gitignore
diff --git a/src/pq/Makefile.am b/src/lib/pq/Makefile.am
similarity index 100%
rename from src/pq/Makefile.am
rename to src/lib/pq/Makefile.am
diff --git a/src/pq/meson.build b/src/lib/pq/meson.build
similarity index 100%
rename from src/pq/meson.build
rename to src/lib/pq/meson.build
diff --git a/src/pq/pq.c b/src/lib/pq/pq.c
similarity index 100%
rename from src/pq/pq.c
rename to src/lib/pq/pq.c
diff --git a/src/pq/pq.h b/src/lib/pq/pq.h
similarity index 100%
rename from src/pq/pq.h
rename to src/lib/pq/pq.h
diff --git a/src/pq/pq_connect.c b/src/lib/pq/pq_connect.c
similarity index 100%
rename from src/pq/pq_connect.c
rename to src/lib/pq/pq_connect.c
diff --git a/src/pq/pq_eval.c b/src/lib/pq/pq_eval.c
similarity index 100%
rename from src/pq/pq_eval.c
rename to src/lib/pq/pq_eval.c
diff --git a/src/pq/pq_event.c b/src/lib/pq/pq_event.c
similarity index 100%
rename from src/pq/pq_event.c
rename to src/lib/pq/pq_event.c
diff --git a/src/pq/pq_exec.c b/src/lib/pq/pq_exec.c
similarity index 100%
rename from src/pq/pq_exec.c
rename to src/lib/pq/pq_exec.c
diff --git a/src/pq/pq_prepare.c b/src/lib/pq/pq_prepare.c
similarity index 100%
rename from src/pq/pq_prepare.c
rename to src/lib/pq/pq_prepare.c
diff --git a/src/pq/pq_query_helper.c b/src/lib/pq/pq_query_helper.c
similarity index 100%
rename from src/pq/pq_query_helper.c
rename to src/lib/pq/pq_query_helper.c
diff --git a/src/pq/pq_result_helper.c b/src/lib/pq/pq_result_helper.c
similarity index 100%
rename from src/pq/pq_result_helper.c
rename to src/lib/pq/pq_result_helper.c
diff --git a/src/pq/test_pq.c b/src/lib/pq/test_pq.c
similarity index 100%
rename from src/pq/test_pq.c
rename to src/lib/pq/test_pq.c
diff --git a/src/pq/versioning.sql b/src/lib/pq/versioning.sql
similarity index 100%
rename from src/pq/versioning.sql
rename to src/lib/pq/versioning.sql
diff --git a/src/sq/.gitignore b/src/lib/sq/.gitignore
similarity index 100%
rename from src/sq/.gitignore
rename to src/lib/sq/.gitignore
diff --git a/src/sq/Makefile.am b/src/lib/sq/Makefile.am
similarity index 100%
rename from src/sq/Makefile.am
rename to src/lib/sq/Makefile.am
diff --git a/src/sq/meson.build b/src/lib/sq/meson.build
similarity index 100%
rename from src/sq/meson.build
rename to src/lib/sq/meson.build
diff --git a/src/sq/sq.c b/src/lib/sq/sq.c
similarity index 100%
rename from src/sq/sq.c
rename to src/lib/sq/sq.c
diff --git a/src/sq/sq_exec.c b/src/lib/sq/sq_exec.c
similarity index 100%
rename from src/sq/sq_exec.c
rename to src/lib/sq/sq_exec.c
diff --git a/src/sq/sq_prepare.c b/src/lib/sq/sq_prepare.c
similarity index 100%
rename from src/sq/sq_prepare.c
rename to src/lib/sq/sq_prepare.c
diff --git a/src/sq/sq_query_helper.c b/src/lib/sq/sq_query_helper.c
similarity index 100%
rename from src/sq/sq_query_helper.c
rename to src/lib/sq/sq_query_helper.c
diff --git a/src/sq/sq_result_helper.c b/src/lib/sq/sq_result_helper.c
similarity index 100%
rename from src/sq/sq_result_helper.c
rename to src/lib/sq/sq_result_helper.c
diff --git a/src/sq/test_sq.c b/src/lib/sq/test_sq.c
similarity index 100%
rename from src/sq/test_sq.c
rename to 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)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.