From 919bb8c92fa1b7cda53401ff2286b980ca0b12d8 Mon Sep 17 00:00:00 2001 From: "Schanzenbach, Martin" Date: Tue, 12 Mar 2019 09:36:17 +0100 Subject: [PATCH] move reclaim and gns back into subdirs --- po/POTFILES.in | 8 +-- src/gns/Makefile.am | 24 ++++++++- src/{rest-plugins => gns}/plugin_rest_gns.c | 0 src/reclaim/Makefile.am | 44 +++++++++++++++- src/{rest-plugins => reclaim}/json_reclaim.c | 0 src/{rest-plugins => reclaim}/json_reclaim.h | 0 src/{rest-plugins => reclaim}/oidc_helper.c | 0 src/{rest-plugins => reclaim}/oidc_helper.h | 0 .../plugin_rest_openid_connect.c | 0 .../plugin_rest_reclaim.c | 0 src/rest-plugins/Makefile.am | 52 +------------------ 11 files changed, 71 insertions(+), 57 deletions(-) rename src/{rest-plugins => gns}/plugin_rest_gns.c (100%) rename src/{rest-plugins => reclaim}/json_reclaim.c (100%) rename src/{rest-plugins => reclaim}/json_reclaim.h (100%) rename src/{rest-plugins => reclaim}/oidc_helper.c (100%) rename src/{rest-plugins => reclaim}/oidc_helper.h (100%) rename src/{rest-plugins => reclaim}/plugin_rest_openid_connect.c (100%) rename src/{rest-plugins => reclaim}/plugin_rest_reclaim.c (100%) diff --git a/po/POTFILES.in b/po/POTFILES.in index 09e4c533d..7307f9c0a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -278,8 +278,12 @@ src/reclaim-attribute/plugin_reclaim_attribute_gnuid.c src/reclaim-attribute/reclaim_attribute.c src/reclaim/gnunet-reclaim.c src/reclaim/gnunet-service-reclaim.c +src/reclaim/json_reclaim.c +src/reclaim/oidc_helper.c src/reclaim/plugin_gnsrecord_reclaim.c src/reclaim/plugin_reclaim_sqlite.c +src/reclaim/plugin_rest_openid_connect.c +src/reclaim/plugin_rest_reclaim.c src/reclaim/reclaim_api.c src/regex/gnunet-daemon-regexprofiler.c src/regex/gnunet-regex-profiler.c @@ -295,16 +299,12 @@ src/regex/regex_internal_dht.c src/regex/regex_test_graph.c src/regex/regex_test_lib.c src/regex/regex_test_random.c -src/rest-plugins/json_reclaim.c -src/rest-plugins/oidc_helper.c src/rest-plugins/plugin_rest_copying.c src/rest-plugins/plugin_rest_credential.c src/rest-plugins/plugin_rest_gns.c src/rest-plugins/plugin_rest_identity.c src/rest-plugins/plugin_rest_namestore.c -src/rest-plugins/plugin_rest_openid_connect.c src/rest-plugins/plugin_rest_peerinfo.c -src/rest-plugins/plugin_rest_reclaim.c src/rest/gnunet-rest-server.c src/rest/rest.c src/revocation/gnunet-revocation.c diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index 434d50f34..6ebbbcaff 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am @@ -89,9 +89,16 @@ bin_PROGRAMS += gnunet-bcd endif endif +if HAVE_MHD +if HAVE_JSON +REST_PLUGIN = libgnunet_plugin_rest_gns.la +endif +endif + plugin_LTLIBRARIES = \ libgnunet_plugin_block_gns.la \ - libgnunet_plugin_gnsrecord_gns.la + libgnunet_plugin_gnsrecord_gns.la \ + $(REST_PLUGIN) bin_SCRIPTS = \ @@ -104,6 +111,21 @@ gnunet-gns-proxy-setup-ca: gnunet-gns-proxy-setup-ca.in Makefile $(do_subst) < $(srcdir)/gnunet-gns-proxy-setup-ca.in > gnunet-gns-proxy-setup-ca chmod +x gnunet-gns-proxy-setup-ca + +libgnunet_plugin_rest_gns_la_SOURCES = \ + plugin_rest_gns.c +libgnunet_plugin_rest_gns_la_LIBADD = \ + $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ + libgnunetgns.la \ + $(top_builddir)/src/rest/libgnunetrest.la \ + $(top_builddir)/src/identity/libgnunetidentity.la \ + $(top_builddir)/src/json/libgnunetjson.la \ + $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ + $(LTLIBINTL) -ljansson -lmicrohttpd +libgnunet_plugin_rest_gns_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) + + libgnunet_plugin_gnsrecord_gns_la_SOURCES = \ plugin_gnsrecord_gns.c libgnunet_plugin_gnsrecord_gns_la_LIBADD = \ diff --git a/src/rest-plugins/plugin_rest_gns.c b/src/gns/plugin_rest_gns.c similarity index 100% rename from src/rest-plugins/plugin_rest_gns.c rename to src/gns/plugin_rest_gns.c diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am index f9942fa23..fd488e1b9 100644 --- a/src/reclaim/Makefile.am +++ b/src/reclaim/Makefile.am @@ -16,6 +16,12 @@ if HAVE_SQLITE SQLITE_PLUGIN = libgnunet_plugin_reclaim_sqlite.la endif +if HAVE_JSON +REST_PLUGIN = \ + libgnunet_plugin_rest_openid_connect.la \ + libgnunet_plugin_rest_reclaim.la +endif + EXTRA_DIST = \ reclaim.conf \ test_reclaim_defaults.conf \ @@ -33,7 +39,8 @@ lib_LTLIBRARIES = \ libgnunetreclaim.la plugin_LTLIBRARIES = \ libgnunet_plugin_gnsrecord_reclaim.la \ - $(SQLITE_PLUGIN) + $(SQLITE_PLUGIN) \ + $(REST_PLUGIN) bin_PROGRAMS = \ gnunet-reclaim @@ -41,6 +48,41 @@ bin_PROGRAMS = \ libexec_PROGRAMS = \ gnunet-service-reclaim +libgnunet_plugin_rest_reclaim_la_SOURCES = \ + plugin_rest_reclaim.c \ + json_reclaim.h \ + json_reclaim.c +libgnunet_plugin_rest_reclaim_la_LIBADD = \ + $(top_builddir)/src/identity/libgnunetidentity.la \ + libgnunetreclaim.la \ + $(top_builddir)/src/json/libgnunetjson.la \ + $(top_builddir)/src/rest/libgnunetrest.la \ + $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \ + $(top_builddir)/src/namestore/libgnunetnamestore.la \ + $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ + $(LTLIBINTL) -ljansson -lmicrohttpd +libgnunet_plugin_rest_reclaim_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) + + +libgnunet_plugin_rest_openid_connect_la_SOURCES = \ + plugin_rest_openid_connect.c \ + oidc_helper.h \ + oidc_helper.c +libgnunet_plugin_rest_openid_connect_la_LIBADD = \ + $(top_builddir)/src/identity/libgnunetidentity.la \ + libgnunetreclaim.la \ + $(top_builddir)/src/rest/libgnunetrest.la \ + $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \ + $(top_builddir)/src/namestore/libgnunetnamestore.la \ +$(top_builddir)/src/gns/libgnunetgns.la \ + $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ + $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ + $(LTLIBINTL) -ljansson -lmicrohttpd +libgnunet_plugin_rest_openid_connect_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) + + libgnunet_plugin_gnsrecord_reclaim_la_SOURCES = \ plugin_gnsrecord_reclaim.c libgnunet_plugin_gnsrecord_reclaim_la_LIBADD = \ diff --git a/src/rest-plugins/json_reclaim.c b/src/reclaim/json_reclaim.c similarity index 100% rename from src/rest-plugins/json_reclaim.c rename to src/reclaim/json_reclaim.c diff --git a/src/rest-plugins/json_reclaim.h b/src/reclaim/json_reclaim.h similarity index 100% rename from src/rest-plugins/json_reclaim.h rename to src/reclaim/json_reclaim.h diff --git a/src/rest-plugins/oidc_helper.c b/src/reclaim/oidc_helper.c similarity index 100% rename from src/rest-plugins/oidc_helper.c rename to src/reclaim/oidc_helper.c diff --git a/src/rest-plugins/oidc_helper.h b/src/reclaim/oidc_helper.h similarity index 100% rename from src/rest-plugins/oidc_helper.h rename to src/reclaim/oidc_helper.h diff --git a/src/rest-plugins/plugin_rest_openid_connect.c b/src/reclaim/plugin_rest_openid_connect.c similarity index 100% rename from src/rest-plugins/plugin_rest_openid_connect.c rename to src/reclaim/plugin_rest_openid_connect.c diff --git a/src/rest-plugins/plugin_rest_reclaim.c b/src/reclaim/plugin_rest_reclaim.c similarity index 100% rename from src/rest-plugins/plugin_rest_reclaim.c rename to src/reclaim/plugin_rest_reclaim.c diff --git a/src/rest-plugins/Makefile.am b/src/rest-plugins/Makefile.am index 006c23101..cec9348a6 100644 --- a/src/rest-plugins/Makefile.am +++ b/src/rest-plugins/Makefile.am @@ -21,28 +21,7 @@ plugin_LTLIBRARIES = \ libgnunet_plugin_rest_copying.la \ libgnunet_plugin_rest_peerinfo.la \ libgnunet_plugin_rest_identity.la \ - libgnunet_plugin_rest_namestore.la \ - libgnunet_plugin_rest_gns.la -if HAVE_ABE -plugin_LTLIBRARIES += libgnunet_plugin_rest_openid_connect.la \ - libgnunet_plugin_rest_reclaim.la -endif - -libgnunet_plugin_rest_reclaim_la_SOURCES = \ - plugin_rest_reclaim.c \ - json_reclaim.h \ - json_reclaim.c -libgnunet_plugin_rest_reclaim_la_LIBADD = \ - $(top_builddir)/src/identity/libgnunetidentity.la \ - $(top_builddir)/src/reclaim/libgnunetreclaim.la \ - $(top_builddir)/src/json/libgnunetjson.la \ - $(top_builddir)/src/rest/libgnunetrest.la \ - $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \ - $(top_builddir)/src/namestore/libgnunetnamestore.la \ - $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ - $(LTLIBINTL) -ljansson -lmicrohttpd -libgnunet_plugin_rest_reclaim_la_LDFLAGS = \ - i$(GN_PLUGIN_LDFLAGS) + libgnunet_plugin_rest_namestore.la #libgnunet_plugin_rest_credential_la_SOURCES = \ @@ -103,33 +82,4 @@ libgnunet_plugin_rest_namestore_la_LIBADD = \ libgnunet_plugin_rest_namestore_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) -libgnunet_plugin_rest_gns_la_SOURCES = \ - plugin_rest_gns.c -libgnunet_plugin_rest_gns_la_LIBADD = \ - $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ - $(top_builddir)/src/gns/libgnunetgns.la \ - $(top_builddir)/src/rest/libgnunetrest.la \ - $(top_builddir)/src/identity/libgnunetidentity.la \ - $(top_builddir)/src/json/libgnunetjson.la \ - $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ - $(LTLIBINTL) -ljansson -lmicrohttpd -libgnunet_plugin_rest_gns_la_LDFLAGS = \ - $(GN_PLUGIN_LDFLAGS) - -libgnunet_plugin_rest_openid_connect_la_SOURCES = \ - plugin_rest_openid_connect.c \ - oidc_helper.h \ - oidc_helper.c -libgnunet_plugin_rest_openid_connect_la_LIBADD = \ - $(top_builddir)/src/identity/libgnunetidentity.la \ - $(top_builddir)/src/reclaim/libgnunetreclaim.la \ - $(top_builddir)/src/rest/libgnunetrest.la \ - $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \ - $(top_builddir)/src/namestore/libgnunetnamestore.la \ -$(top_builddir)/src/gns/libgnunetgns.la \ - $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ - $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ - $(LTLIBINTL) -ljansson -lmicrohttpd -libgnunet_plugin_rest_openid_connect_la_LDFLAGS = \ - $(GN_PLUGIN_LDFLAGS) -- 2.25.1