commit 5b2527d8d81f92e00a0835e3039a0a2eee0ee566 parent 84bbd6f1be6686b3c816ee5bb5c0c786ac193c6c Author: Martin Schanzenbach <schanzen@gnunet.org> Date: Wed, 18 Oct 2023 13:49:14 +0200 BUILD: Move json to lib Diffstat:
17 files changed, 13 insertions(+), 15 deletions(-)
diff --git 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 @@ -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 @@ -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 @@ -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 @@ -3,4 +3,5 @@ SUBDIRS = \ hello \ block \ gnsrecord \ - curl + curl \ + json diff --git a/src/json/.gitignore b/src/lib/json/.gitignore diff --git a/src/json/Makefile.am b/src/lib/json/Makefile.am diff --git a/src/json/json.c b/src/lib/json/json.c diff --git a/src/json/json_generator.c b/src/lib/json/json_generator.c diff --git a/src/json/json_helper.c b/src/lib/json/json_helper.c diff --git a/src/json/json_mhd.c b/src/lib/json/json_mhd.c diff --git a/src/json/json_pack.c b/src/lib/json/json_pack.c diff --git a/src/json/meson.build b/src/lib/json/meson.build diff --git a/src/json/test_json.c b/src/lib/json/test_json.c diff --git a/src/json/test_json_mhd.c b/src/lib/json/test_json_mhd.c diff --git 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 @@ -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)