[gnunet] 02/10: BUILD: Move json 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 5b2527d8d81f92e00a0835e3039a0a2eee0ee566
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Wed Oct 18 13:49:14 2023 +0200

    BUILD: Move json to lib
---
 configure.ac                        |  2 +-
 po/POTFILES.in                      | 10 +++++-----
 src/Makefile.am                     |  3 ---
 src/gns/Makefile.am                 |  2 +-
 src/lib/Makefile.am                 |  3 ++-
 src/{ => lib}/json/.gitignore       |  0
 src/{ => lib}/json/Makefile.am      |  0
 src/{ => lib}/json/json.c           |  0
 src/{ => lib}/json/json_generator.c |  0
 src/{ => lib}/json/json_helper.c    |  0
 src/{ => lib}/json/json_mhd.c       |  0
 src/{ => lib}/json/json_pack.c      |  0
 src/{ => lib}/json/meson.build      |  0
 src/{ => lib}/json/test_json.c      |  0
 src/{ => lib}/json/test_json_mhd.c  |  0
 src/namestore/Makefile.am           |  4 ++--
 src/reclaim/Makefile.am             |  4 ++--
 17 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index 32f758fe0..70483ebe1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1234,6 +1234,7 @@ src/auction/Makefile
 src/lib/block/Makefile
 src/lib/curl/Makefile
 src/lib/gnsrecord/Makefile
+src/lib/json/Makefile
 src/plugin/Makefile
 src/plugin/block/Makefile
 src/plugin/gnsrecord/Makefile
@@ -1264,7 +1265,6 @@ src/identity/Makefile
 src/identity/identity.conf
 src/include/Makefile
 src/include/gnunet_config.h
-src/json/Makefile
 src/hostlist/Makefile
 src/namecache/Makefile
 src/namecache/namecache.conf
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5077e8ae4..ca1a7fe0b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -169,11 +169,6 @@ src/identity/identity_api.c
 src/identity/identity_api_lookup.c
 src/identity/identity_api_suffix_lookup.c
 src/identity/plugin_rest_identity.c
-src/json/json.c
-src/json/json_generator.c
-src/json/json_helper.c
-src/json/json_mhd.c
-src/json/json_pack.c
 src/lib/block/bg_bf.c
 src/lib/block/block.c
 src/lib/curl/curl.c
@@ -188,6 +183,11 @@ src/lib/hello/address.c
 src/lib/hello/hello-ng.c
 src/lib/hello/hello-uri.c
 src/lib/hello/hello.c
+src/lib/json/json.c
+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/util/bandwidth.c
 src/lib/util/benchmark.c
 src/lib/util/bio.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 049d809ea..fdfcf9260 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,8 +9,6 @@ if HAVE_EXPERIMENTAL
   auction
 endif
 
-JSON_DIR = json
-
 if BUILD_PULSE_HELPERS
 CONVERSATION_DIR = conversation
 else
@@ -39,7 +37,6 @@ SUBDIRS = \
   statistics \
   arm \
   $(TESTING) \
-  $(JSON_DIR) \
   $(REST_DIR) \
   $(SQLITE_DIR) \
   $(POSTGRES_DIR) \
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index b1f4e5ab8..e50cf4281 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -89,7 +89,7 @@ libgnunet_plugin_rest_gns_la_LIBADD = \
   libgnunetgns.la \
   $(top_builddir)/src/rest/libgnunetrest.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/json/libgnunetjson.la \
+  $(top_builddir)/src/lib/json/libgnunetjson.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
   $(LTLIBINTL) -ljansson $(MHD_LIBS)
 libgnunet_plugin_rest_gns_la_LDFLAGS = \
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 4e37f6234..27cbfcb14 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -3,4 +3,5 @@ SUBDIRS = \
        hello \
        block \
        gnsrecord \
-       curl
+       curl \
+       json
diff --git a/src/json/.gitignore b/src/lib/json/.gitignore
similarity index 100%
rename from src/json/.gitignore
rename to src/lib/json/.gitignore
diff --git a/src/json/Makefile.am b/src/lib/json/Makefile.am
similarity index 100%
rename from src/json/Makefile.am
rename to src/lib/json/Makefile.am
diff --git a/src/json/json.c b/src/lib/json/json.c
similarity index 100%
rename from src/json/json.c
rename to src/lib/json/json.c
diff --git a/src/json/json_generator.c b/src/lib/json/json_generator.c
similarity index 100%
rename from src/json/json_generator.c
rename to src/lib/json/json_generator.c
diff --git a/src/json/json_helper.c b/src/lib/json/json_helper.c
similarity index 100%
rename from src/json/json_helper.c
rename to src/lib/json/json_helper.c
diff --git a/src/json/json_mhd.c b/src/lib/json/json_mhd.c
similarity index 100%
rename from src/json/json_mhd.c
rename to src/lib/json/json_mhd.c
diff --git a/src/json/json_pack.c b/src/lib/json/json_pack.c
similarity index 100%
rename from src/json/json_pack.c
rename to src/lib/json/json_pack.c
diff --git a/src/json/meson.build b/src/lib/json/meson.build
similarity index 100%
rename from src/json/meson.build
rename to src/lib/json/meson.build
diff --git a/src/json/test_json.c b/src/lib/json/test_json.c
similarity index 100%
rename from src/json/test_json.c
rename to src/lib/json/test_json.c
diff --git a/src/json/test_json_mhd.c b/src/lib/json/test_json_mhd.c
similarity index 100%
rename from src/json/test_json_mhd.c
rename to src/lib/json/test_json_mhd.c
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 8edc3b658..1e2423cf0 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -110,7 +110,7 @@ libgnunet_plugin_rest_namestore_la_LIBADD = \
   libgnunetnamestore.la \
   $(top_builddir)/src/rest/libgnunetrest.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/json/libgnunetjson.la \
+  $(top_builddir)/src/lib/json/libgnunetjson.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecordjson.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
@@ -178,7 +178,7 @@ gnunet_namestore_fcfsd_LDADD = $(MHD_LIBS) \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   libgnunetnamestore.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/json/libgnunetjson.la \
+  $(top_builddir)/src/lib/json/libgnunetjson.la \
   $(GN_LIBINTL) -ljansson
 gnunet_namestore_fcfsd_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
 
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
index ac3332ecf..a3bb58e23 100644
--- a/src/reclaim/Makefile.am
+++ b/src/reclaim/Makefile.am
@@ -60,7 +60,7 @@ libgnunet_plugin_rest_reclaim_la_SOURCES = \
 libgnunet_plugin_rest_reclaim_la_LIBADD = \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   libgnunetreclaim.la \
-  $(top_builddir)/src/json/libgnunetjson.la \
+  $(top_builddir)/src/lib/json/libgnunetjson.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/rest/libgnunetrest.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
@@ -96,7 +96,7 @@ libgnunet_plugin_rest_pabc_la_SOURCES = \
   pabc_helper.c
 libgnunet_plugin_rest_pabc_la_LIBADD = \
   libgnunetreclaim.la \
-  $(top_builddir)/src/json/libgnunetjson.la \
+  $(top_builddir)/src/lib/json/libgnunetjson.la \
   $(top_builddir)/src/rest/libgnunetrest.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
   $(LTLIBINTL) -ljansson -lpabc $(MHD_LIBS)

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