From 6371b64774428e83ff83ada88bda354356718aca Mon Sep 17 00:00:00 2001 From: "Schanzenbach, Martin" Date: Mon, 13 Aug 2018 08:51:19 +0200 Subject: [PATCH] fix build; move rest plugins to separate folder --- configure.ac | 1 + po/POTFILES.in | 132 +++++++++--------- src/Makefile.am | 8 +- src/gns/Makefile.am | 19 --- src/identity/Makefile.am | 19 --- src/jsonapi/Makefile.am | 18 ++- .../plugin_rest_reclaim.c | 0 src/namestore/Makefile.am | 23 +-- src/peerinfo/Makefile.am | 20 --- src/reclaim/Makefile.am | 33 ----- src/rest-plugins/Makefile.am | 102 ++++++++++++++ src/{reclaim => rest-plugins}/oidc_helper.c | 0 src/{reclaim => rest-plugins}/oidc_helper.h | 0 .../plugin_rest_copying.c | 0 src/{gns => rest-plugins}/plugin_rest_gns.c | 0 .../plugin_rest_identity.c | 0 .../plugin_rest_namestore.c | 0 .../plugin_rest_openid_connect.c | 0 .../plugin_rest_peerinfo.c | 0 src/rest/Makefile.am | 13 -- 20 files changed, 190 insertions(+), 198 deletions(-) rename src/{reclaim => jsonapi}/plugin_rest_reclaim.c (100%) create mode 100644 src/rest-plugins/Makefile.am rename src/{reclaim => rest-plugins}/oidc_helper.c (100%) rename src/{reclaim => rest-plugins}/oidc_helper.h (100%) rename src/{rest => rest-plugins}/plugin_rest_copying.c (100%) rename src/{gns => rest-plugins}/plugin_rest_gns.c (100%) rename src/{identity => rest-plugins}/plugin_rest_identity.c (100%) rename src/{namestore => rest-plugins}/plugin_rest_namestore.c (100%) rename src/{reclaim => rest-plugins}/plugin_rest_openid_connect.c (100%) rename src/{peerinfo => rest-plugins}/plugin_rest_peerinfo.c (100%) diff --git a/configure.ac b/configure.ac index 535ce0ffe..6a75b1ebf 100644 --- a/configure.ac +++ b/configure.ac @@ -1758,6 +1758,7 @@ src/vpn/vpn.conf src/zonemaster/Makefile src/zonemaster/zonemaster.conf src/rest/Makefile +src/rest-plugins/Makefile src/abe/Makefile src/reclaim-attribute/Makefile src/reclaim/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index 070ecc4ce..a1cdac7f2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -4,13 +4,21 @@ src/arm/arm_monitor_api.c src/arm/gnunet-arm.c src/arm/gnunet-service-arm.c src/arm/mockup-service.c +src/ats-tests/ats-testing-experiment.c +src/ats-tests/ats-testing-log.c +src/ats-tests/ats-testing-preferences.c +src/ats-tests/ats-testing-traffic.c +src/ats-tests/ats-testing.c +src/ats-tests/gnunet-ats-sim.c +src/ats-tests/gnunet-solver-eval.c +src/ats-tool/gnunet-ats.c src/ats/ats_api_connectivity.c src/ats/ats_api_performance.c src/ats/ats_api_scanner.c src/ats/ats_api_scheduling.c src/ats/gnunet-ats-solver-eval.c -src/ats/gnunet-service-ats_addresses.c src/ats/gnunet-service-ats.c +src/ats/gnunet-service-ats_addresses.c src/ats/gnunet-service-ats_connectivity.c src/ats/gnunet-service-ats_normalization.c src/ats/gnunet-service-ats_performance.c @@ -21,14 +29,6 @@ src/ats/gnunet-service-ats_scheduling.c src/ats/plugin_ats_mlp.c src/ats/plugin_ats_proportional.c src/ats/plugin_ats_ril.c -src/ats-tests/ats-testing.c -src/ats-tests/ats-testing-experiment.c -src/ats-tests/ats-testing-log.c -src/ats-tests/ats-testing-preferences.c -src/ats-tests/ats-testing-traffic.c -src/ats-tests/gnunet-ats-sim.c -src/ats-tests/gnunet-solver-eval.c -src/ats-tool/gnunet-ats.c src/auction/gnunet-auction-create.c src/auction/gnunet-auction-info.c src/auction/gnunet-auction-join.c @@ -40,8 +40,8 @@ src/block/plugin_block_test.c src/cadet/cadet_api.c src/cadet/cadet_test_lib.c src/cadet/desirability_table.c -src/cadet/gnunet-cadet.c src/cadet/gnunet-cadet-profiler.c +src/cadet/gnunet-cadet.c src/cadet/gnunet-service-cadet.c src/cadet/gnunet-service-cadet_channel.c src/cadet/gnunet-service-cadet_connection.c @@ -57,15 +57,15 @@ src/consensus/gnunet-service-consensus.c src/consensus/plugin_block_consensus.c src/conversation/conversation_api.c src/conversation/conversation_api_call.c -src/conversation/gnunet-conversation.c src/conversation/gnunet-conversation-test.c -src/conversation/gnunet_gst.c -src/conversation/gnunet_gst_test.c -src/conversation/gnunet-helper-audio-playback.c +src/conversation/gnunet-conversation.c src/conversation/gnunet-helper-audio-playback-gst.c -src/conversation/gnunet-helper-audio-record.c +src/conversation/gnunet-helper-audio-playback.c src/conversation/gnunet-helper-audio-record-gst.c +src/conversation/gnunet-helper-audio-record.c src/conversation/gnunet-service-conversation.c +src/conversation/gnunet_gst.c +src/conversation/gnunet_gst_test.c src/conversation/microphone.c src/conversation/plugin_gnsrecord_conversation.c src/conversation/speaker.c @@ -102,7 +102,6 @@ src/dht/dht_api.c src/dht/dht_test_lib.c src/dht/gnunet-dht-get.c src/dht/gnunet-dht-monitor.c -src/dht/gnunet_dht_profiler.c src/dht/gnunet-dht-put.c src/dht/gnunet-service-dht.c src/dht/gnunet-service-dht_clients.c @@ -111,6 +110,7 @@ src/dht/gnunet-service-dht_hello.c src/dht/gnunet-service-dht_neighbours.c src/dht/gnunet-service-dht_nse.c src/dht/gnunet-service-dht_routing.c +src/dht/gnunet_dht_profiler.c src/dht/plugin_block_dht.c src/dns/dns_api.c src/dns/gnunet-dns-monitor.c @@ -124,8 +124,8 @@ src/dv/gnunet-dv.c src/dv/gnunet-service-dv.c src/dv/plugin_transport_dv.c src/exit/gnunet-daemon-exit.c -src/exit/gnunet-helper-exit.c src/exit/gnunet-helper-exit-windows.c +src/exit/gnunet-helper-exit.c src/fragmentation/defragmentation.c src/fragmentation/fragmentation.c src/fs/fs_api.c @@ -150,8 +150,8 @@ src/fs/gnunet-auto-share.c src/fs/gnunet-daemon-fsprofiler.c src/fs/gnunet-directory.c src/fs/gnunet-download.c -src/fs/gnunet-fs.c src/fs/gnunet-fs-profiler.c +src/fs/gnunet-fs.c src/fs/gnunet-helper-fs-publish.c src/fs/gnunet-publish.c src/fs/gnunet-search.c @@ -171,10 +171,10 @@ src/gns/gns_tld_api.c src/gns/gnunet-bcd.c src/gns/gnunet-dns2gns.c src/gns/gnunet-gns-benchmark.c -src/gns/gnunet-gns.c src/gns/gnunet-gns-helper-service-w32.c src/gns/gnunet-gns-import.c src/gns/gnunet-gns-proxy.c +src/gns/gnunet-gns.c src/gns/gnunet-service-gns.c src/gns/gnunet-service-gns_interceptor.c src/gns/gnunet-service-gns_resolver.c @@ -182,16 +182,15 @@ src/gns/nss/nss_gns.c src/gns/nss/nss_gns_query.c src/gns/plugin_block_gns.c src/gns/plugin_gnsrecord_gns.c -src/gns/plugin_rest_gns.c +src/gns/w32nsp-install.c +src/gns/w32nsp-resolve.c +src/gns/w32nsp-uninstall.c +src/gns/w32nsp.c src/gnsrecord/gnsrecord.c src/gnsrecord/gnsrecord_crypto.c src/gnsrecord/gnsrecord_misc.c src/gnsrecord/gnsrecord_serialization.c src/gnsrecord/plugin_gnsrecord_dns.c -src/gns/w32nsp.c -src/gns/w32nsp-install.c -src/gns/w32nsp-resolve.c -src/gns/w32nsp-uninstall.c src/hello/address.c src/hello/gnunet-hello.c src/hello/hello.c @@ -202,17 +201,18 @@ src/identity/gnunet-identity.c src/identity/gnunet-service-identity.c src/identity/identity_api.c src/identity/identity_api_lookup.c -src/identity/plugin_rest_identity.c -src/jsonapi/jsonapi.c -src/jsonapi/jsonapi_document.c -src/jsonapi/jsonapi_error.c -src/jsonapi/jsonapi_relationship.c -src/jsonapi/jsonapi_resource.c src/json/json.c src/json/json_generator.c src/json/json_gnsrecord.c src/json/json_helper.c src/json/json_mhd.c +src/jsonapi/jsonapi.c +src/jsonapi/jsonapi_document.c +src/jsonapi/jsonapi_error.c +src/jsonapi/jsonapi_relationship.c +src/jsonapi/jsonapi_resource.c +src/jsonapi/plugin_rest_openid_connect.c +src/jsonapi/plugin_rest_reclaim.c src/multicast/gnunet-multicast.c src/multicast/gnunet-service-multicast.c src/multicast/multicast_api.c @@ -226,8 +226,8 @@ src/namecache/namecache_api.c src/namecache/plugin_namecache_flat.c src/namecache/plugin_namecache_postgres.c src/namecache/plugin_namecache_sqlite.c -src/namestore/gnunet-namestore.c src/namestore/gnunet-namestore-fcfsd.c +src/namestore/gnunet-namestore.c src/namestore/gnunet-service-namestore.c src/namestore/gnunet-zoneimport.c src/namestore/namestore_api.c @@ -235,7 +235,6 @@ src/namestore/namestore_api_monitor.c src/namestore/plugin_namestore_flat.c src/namestore/plugin_namestore_postgres.c src/namestore/plugin_namestore_sqlite.c -src/namestore/plugin_rest_namestore.c src/nat-auto/gnunet-nat-auto.c src/nat-auto/gnunet-nat-auto_legacy.c src/nat-auto/gnunet-nat-server.c @@ -243,10 +242,10 @@ src/nat-auto/gnunet-service-nat-auto.c src/nat-auto/gnunet-service-nat-auto_legacy.c src/nat-auto/nat_auto_api.c src/nat-auto/nat_auto_api_test.c -src/nat/gnunet-helper-nat-client.c src/nat/gnunet-helper-nat-client-windows.c -src/nat/gnunet-helper-nat-server.c +src/nat/gnunet-helper-nat-client.c src/nat/gnunet-helper-nat-server-windows.c +src/nat/gnunet-helper-nat-server.c src/nat/gnunet-nat.c src/nat/gnunet-service-nat.c src/nat/gnunet-service-nat_externalip.c @@ -255,16 +254,15 @@ src/nat/gnunet-service-nat_mini.c src/nat/gnunet-service-nat_stun.c src/nat/nat_api.c src/nat/nat_api_stun.c -src/nse/gnunet-nse.c src/nse/gnunet-nse-profiler.c +src/nse/gnunet-nse.c src/nse/gnunet-service-nse.c src/nse/nse_api.c +src/peerinfo-tool/gnunet-peerinfo.c +src/peerinfo-tool/gnunet-peerinfo_plugins.c src/peerinfo/gnunet-service-peerinfo.c src/peerinfo/peerinfo_api.c src/peerinfo/peerinfo_api_notify.c -src/peerinfo/plugin_rest_peerinfo.c -src/peerinfo-tool/gnunet-peerinfo.c -src/peerinfo-tool/gnunet-peerinfo_plugins.c src/peerstore/gnunet-peerstore.c src/peerstore/gnunet-service-peerstore.c src/peerstore/peerstore_api.c @@ -297,8 +295,6 @@ src/reclaim/jwt.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 @@ -314,27 +310,31 @@ 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/plugin_rest_copying.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_peerinfo.c src/rest/gnunet-rest-server.c -src/rest/plugin_rest_copying.c src/rest/rest.c src/revocation/gnunet-revocation.c src/revocation/gnunet-service-revocation.c src/revocation/plugin_block_revocation.c src/revocation/revocation_api.c -src/rps/gnunet-rps.c src/rps/gnunet-rps-profiler.c +src/rps/gnunet-rps.c src/rps/gnunet-service-rps.c src/rps/gnunet-service-rps_custommap.c src/rps/gnunet-service-rps_sampler.c src/rps/gnunet-service-rps_sampler_elem.c src/rps/gnunet-service-rps_view.c -src/rps/rps_api.c src/rps/rps-test_util.c +src/rps/rps_api.c src/scalarproduct/gnunet-scalarproduct.c -src/scalarproduct/gnunet-service-scalarproduct_alice.c -src/scalarproduct/gnunet-service-scalarproduct_bob.c src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c +src/scalarproduct/gnunet-service-scalarproduct_alice.c +src/scalarproduct/gnunet-service-scalarproduct_bob.c src/scalarproduct/scalarproduct_api.c src/secretsharing/gnunet-secretsharing-profiler.c src/secretsharing/gnunet-service-secretsharing.c @@ -363,15 +363,16 @@ src/statistics/gnunet-statistics.c src/statistics/statistics_api.c src/template/gnunet-service-template.c src/template/gnunet-template.c +src/testbed-logger/gnunet-service-testbed-logger.c +src/testbed-logger/testbed_logger_api.c src/testbed/generate-underlay-topology.c src/testbed/gnunet-daemon-latency-logger.c src/testbed/gnunet-daemon-testbed-blacklist.c src/testbed/gnunet-daemon-testbed-underlay.c src/testbed/gnunet-helper-testbed.c -src/testbed/gnunet_mpi_test.c src/testbed/gnunet-service-test-barriers.c -src/testbed/gnunet-service-testbed_barriers.c src/testbed/gnunet-service-testbed.c +src/testbed/gnunet-service-testbed_barriers.c src/testbed/gnunet-service-testbed_cache.c src/testbed/gnunet-service-testbed_connectionpool.c src/testbed/gnunet-service-testbed_cpustatus.c @@ -379,20 +380,19 @@ src/testbed/gnunet-service-testbed_links.c src/testbed/gnunet-service-testbed_meminfo.c src/testbed/gnunet-service-testbed_oc.c src/testbed/gnunet-service-testbed_peers.c -src/testbed/gnunet_testbed_mpi_spawn.c src/testbed/gnunet-testbed-profiler.c -src/testbed-logger/gnunet-service-testbed-logger.c -src/testbed-logger/testbed_logger_api.c -src/testbed/testbed_api_barriers.c +src/testbed/gnunet_mpi_test.c +src/testbed/gnunet_testbed_mpi_spawn.c src/testbed/testbed_api.c +src/testbed/testbed_api_barriers.c src/testbed/testbed_api_hosts.c src/testbed/testbed_api_operations.c src/testbed/testbed_api_peers.c src/testbed/testbed_api_sd.c src/testbed/testbed_api_services.c src/testbed/testbed_api_statistics.c -src/testbed/testbed_api_testbed.c src/testbed/testbed_api_test.c +src/testbed/testbed_api_testbed.c src/testbed/testbed_api_topology.c src/testbed/testbed_api_underlay.c src/testing/gnunet-testing.c @@ -401,28 +401,28 @@ src/testing/testing.c src/topology/friends.c src/topology/gnunet-daemon-topology.c src/transport/gnunet-helper-transport-bluetooth.c -src/transport/gnunet-helper-transport-wlan.c src/transport/gnunet-helper-transport-wlan-dummy.c -src/transport/gnunet-service-transport_ats.c +src/transport/gnunet-helper-transport-wlan.c src/transport/gnunet-service-transport.c +src/transport/gnunet-service-transport_ats.c src/transport/gnunet-service-transport_hello.c src/transport/gnunet-service-transport_manipulation.c src/transport/gnunet-service-transport_neighbours.c src/transport/gnunet-service-transport_plugins.c src/transport/gnunet-service-transport_validation.c -src/transport/gnunet-transport.c src/transport/gnunet-transport-certificate-creation.c src/transport/gnunet-transport-profiler.c src/transport/gnunet-transport-wlan-receiver.c src/transport/gnunet-transport-wlan-sender.c +src/transport/gnunet-transport.c src/transport/plugin_transport_http_client.c src/transport/plugin_transport_http_common.c src/transport/plugin_transport_http_server.c src/transport/plugin_transport_smtp.c src/transport/plugin_transport_tcp.c src/transport/plugin_transport_template.c -src/transport/plugin_transport_udp_broadcasting.c src/transport/plugin_transport_udp.c +src/transport/plugin_transport_udp_broadcasting.c src/transport/plugin_transport_unix.c src/transport/plugin_transport_wlan.c src/transport/plugin_transport_xt.c @@ -431,6 +431,11 @@ src/transport/tcp_connection_legacy.c src/transport/tcp_server_legacy.c src/transport/tcp_server_mst_legacy.c src/transport/tcp_service_legacy.c +src/transport/transport-testing-filenames.c +src/transport/transport-testing-loggers.c +src/transport/transport-testing-main.c +src/transport/transport-testing-send.c +src/transport/transport-testing.c src/transport/transport_api_address_to_string.c src/transport/transport_api_blacklist.c src/transport/transport_api_core.c @@ -439,11 +444,6 @@ src/transport/transport_api_manipulation.c src/transport/transport_api_monitor_peers.c src/transport/transport_api_monitor_plugins.c src/transport/transport_api_offer_hello.c -src/transport/transport-testing.c -src/transport/transport-testing-filenames.c -src/transport/transport-testing-loggers.c -src/transport/transport-testing-main.c -src/transport/transport-testing-send.c src/util/bandwidth.c src/util/bio.c src/util/client.c @@ -455,8 +455,8 @@ src/util/configuration_loader.c src/util/container_bloomfilter.c src/util/container_heap.c src/util/container_meta_data.c -src/util/container_multihashmap32.c src/util/container_multihashmap.c +src/util/container_multihashmap32.c src/util/container_multipeermap.c src/util/container_multishortmap.c src/util/crypto_abe.c @@ -478,15 +478,15 @@ src/util/dnsparser.c src/util/dnsstub.c src/util/getopt.c src/util/getopt_helpers.c -src/util/gnunet-config.c src/util/gnunet-config-diff.c +src/util/gnunet-config.c src/util/gnunet-ecc.c src/util/gnunet-helper-w32-console.c src/util/gnunet-resolver.c src/util/gnunet-scrypt.c src/util/gnunet-service-resolver.c -src/util/gnunet-timeout.c src/util/gnunet-timeout-w32.c +src/util/gnunet-timeout.c src/util/gnunet-uri.c src/util/helper.c src/util/load.c @@ -514,13 +514,13 @@ src/util/tun.c src/util/w32cat.c src/util/win.c src/util/winproc.c -src/vpn/gnunet-helper-vpn.c src/vpn/gnunet-helper-vpn-windows.c +src/vpn/gnunet-helper-vpn.c src/vpn/gnunet-service-vpn.c src/vpn/gnunet-vpn.c src/vpn/vpn_api.c -src/zonemaster/gnunet-service-zonemaster.c src/zonemaster/gnunet-service-zonemaster-monitor.c +src/zonemaster/gnunet-service-zonemaster.c src/fs/fs_api.h src/include/gnunet_common.h src/include/gnunet_mq_lib.h diff --git a/src/Makefile.am b/src/Makefile.am index 53d157da3..43b1004eb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -65,9 +65,8 @@ if HAVE_POSTGRESQL endif if HAVE_MHD - REST_DIR = rest if HAVE_JSON - JSONAPI_DIR = jsonapi + REST_DIR = rest jsonapi rest-plugins endif endif @@ -82,9 +81,6 @@ SUBDIRS = \ include $(INTLEMU_SUBDIRS) \ util \ gnsrecord \ - $(JSON_DIR) \ - $(REST_DIR) \ - $(JSONAPI_DIR) \ hello \ block \ statistics \ @@ -130,6 +126,8 @@ SUBDIRS = \ exit \ pt \ secretsharing \ + $(JSON_DIR) \ + $(REST_DIR) \ integration-tests \ $(EXP_DIR) diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index 2c7bb8ebb..2659f7e6a 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am @@ -92,12 +92,6 @@ plugin_LTLIBRARIES = \ libgnunet_plugin_gnsrecord_gns.la -if HAVE_MHD -if HAVE_JSON -plugin_LTLIBRARIES += libgnunet_plugin_rest_gns.la -endif -endif - libgnunet_plugin_gnsrecord_gns_la_SOURCES = \ plugin_gnsrecord_gns.c libgnunet_plugin_gnsrecord_gns_la_LIBADD = \ @@ -238,19 +232,6 @@ libgnunet_plugin_block_gns_la_LIBADD = \ libgnunet_plugin_block_gns_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) -libgnunet_plugin_rest_gns_la_SOURCES = \ - plugin_rest_gns.c -libgnunet_plugin_rest_gns_la_LIBADD = \ - libgnunetgns.la \ - $(top_builddir)/src/rest/libgnunetrest.la \ - $(top_builddir)/src/identity/libgnunetidentity.la \ - $(top_builddir)/src/jsonapi/libgnunetjsonapi.la \ - $(top_builddir)/src/jsonapi/libgnunetjsonapiutils.la \ - $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ - $(LTLIBINTL) -ljansson -lmicrohttpd -libgnunet_plugin_rest_gns_la_LDFLAGS = \ - $(GN_PLUGIN_LDFLAGS) - check_SCRIPTS = \ test_gns_lookup.sh \ diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am index e7104f0c3..1f21fc65d 100644 --- a/src/identity/Makefile.am +++ b/src/identity/Makefile.am @@ -39,14 +39,6 @@ bin_PROGRAMS = \ libexec_PROGRAMS = \ gnunet-service-identity -if HAVE_MHD -if HAVE_JSON -plugin_LTLIBRARIES = \ - libgnunet_plugin_rest_identity.la -endif -endif - - gnunet_service_identity_SOURCES = \ gnunet-service-identity.c gnunet_service_identity_LDADD = \ @@ -55,17 +47,6 @@ gnunet_service_identity_LDADD = \ $(GN_LIBINTL) -libgnunet_plugin_rest_identity_la_SOURCES = \ - plugin_rest_identity.c -libgnunet_plugin_rest_identity_la_LIBADD = \ - libgnunetidentity.la \ - $(top_builddir)/src/rest/libgnunetrest.la \ - $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ - $(LTLIBINTL) -ljansson -lmicrohttpd -libgnunet_plugin_rest_identity_la_LDFLAGS = \ - $(GN_PLUGIN_LDFLAGS) - - gnunet_identity_SOURCES = \ gnunet-identity.c gnunet_identity_LDADD = \ diff --git a/src/jsonapi/Makefile.am b/src/jsonapi/Makefile.am index 054d3c550..0c6d60b10 100644 --- a/src/jsonapi/Makefile.am +++ b/src/jsonapi/Makefile.am @@ -8,7 +8,23 @@ endif lib_LTLIBRARIES = \ libgnunetjsonapi.la \ - libgnunetjsonapiutils.la + libgnunetjsonapiutils.la \ + libgnunet_plugin_rest_reclaim.la + +libgnunet_plugin_rest_reclaim_la_SOURCES = \ + plugin_rest_reclaim.c +libgnunet_plugin_rest_reclaim_la_LIBADD = \ + $(top_builddir)/src/identity/libgnunetidentity.la \ + $(top_builddir)/src/reclaim/libgnunetreclaim.la \ + $(top_builddir)/src/rest/libgnunetrest.la \ + libgnunetjsonapi.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) + libgnunetjsonapiutils_la_LDFLAGS = \ -version-info 0:0:0 \ diff --git a/src/reclaim/plugin_rest_reclaim.c b/src/jsonapi/plugin_rest_reclaim.c similarity index 100% rename from src/reclaim/plugin_rest_reclaim.c rename to src/jsonapi/plugin_rest_reclaim.c diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am index 7f44c2a71..a349921d7 100644 --- a/src/namestore/Makefile.am +++ b/src/namestore/Makefile.am @@ -97,12 +97,6 @@ check_PROGRAMS = \ $(FLAT_TESTS) endif -if HAVE_MHD -if HAVE_JSON -REST_PLUGIN=libgnunet_plugin_rest_namestore.la -endif -endif - if ENABLE_TEST_RUN AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; TESTS = \ @@ -186,8 +180,7 @@ gnunet_service_namestore_LDADD = \ plugin_LTLIBRARIES = \ $(SQLITE_PLUGIN) \ $(POSTGRES_PLUGIN) \ - $(FLAT_PLUGIN) \ - $(REST_PLUGIN) + $(FLAT_PLUGIN) @@ -224,20 +217,6 @@ libgnunet_plugin_namestore_postgres_la_LIBADD = \ libgnunet_plugin_namestore_postgres_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS) -libgnunet_plugin_rest_namestore_la_SOURCES = \ - plugin_rest_namestore.c -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/gnsrecord/libgnunetgnsrecord.la \ - $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ - $(LTLIBINTL) -ljansson -lmicrohttpd -libgnunet_plugin_rest_namestore_la_LDFLAGS = \ - $(GN_PLUGIN_LDFLAGS) - - test_namestore_api_store_flat_SOURCES = \ test_namestore_api_store.c test_namestore_api_store_flat_LDADD = \ diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am index 5e96250b1..3f68becb5 100644 --- a/src/peerinfo/Makefile.am +++ b/src/peerinfo/Makefile.am @@ -27,8 +27,6 @@ libgnunetpeerinfo_la_SOURCES = \ libgnunetpeerinfo_la_LIBADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/json/libgnunetjson.la \ - $(top_builddir)/src/transport/libgnunettransport.la \ $(XLIB) \ $(LTLIBINTL) libgnunetpeerinfo_la_LDFLAGS = \ @@ -39,13 +37,6 @@ libgnunetpeerinfo_la_LDFLAGS = \ libexec_PROGRAMS = \ gnunet-service-peerinfo -if HAVE_MHD -if HAVE_JSON -plugin_LTLIBRARIES = \ - libgnunet_plugin_rest_peerinfo.la -endif -endif - gnunet_service_peerinfo_SOURCES = \ gnunet-service-peerinfo.c gnunet_service_peerinfo_LDADD = \ @@ -53,17 +44,6 @@ gnunet_service_peerinfo_LDADD = \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la - -libgnunet_plugin_rest_peerinfo_la_SOURCES = \ - plugin_rest_peerinfo.c -libgnunet_plugin_rest_peerinfo_la_LIBADD = \ - libgnunetpeerinfo.la \ - $(top_builddir)/src/rest/libgnunetrest.la \ - $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ - $(LTLIBINTL) -ljansson -lmicrohttpd -libgnunet_plugin_rest_peerinfo_la_LDFLAGS = \ - $(GN_PLUGIN_LDFLAGS) - if HAVE_BENCHMARKS PEERINFO_BENCHMARKS = \ perf_peerinfo_api diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am index 2ee43d21a..093442181 100644 --- a/src/reclaim/Makefile.am +++ b/src/reclaim/Makefile.am @@ -31,8 +31,6 @@ pkgcfg_DATA = \ lib_LTLIBRARIES = \ libgnunetreclaim.la plugin_LTLIBRARIES = \ - libgnunet_plugin_rest_reclaim.la \ - libgnunet_plugin_rest_openid_connect.la \ libgnunet_plugin_gnsrecord_reclaim.la \ $(SQLITE_PLUGIN) @@ -88,37 +86,6 @@ libgnunetreclaim_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) $(WINFLAGS) \ -version-info 0:0:0 -libgnunet_plugin_rest_reclaim_la_SOURCES = \ - plugin_rest_reclaim.c -libgnunet_plugin_rest_reclaim_la_LIBADD = \ - $(top_builddir)/src/identity/libgnunetidentity.la \ - libgnunetreclaim.la \ - $(top_builddir)/src/rest/libgnunetrest.la \ - $(top_builddir)/src/jsonapi/libgnunetjsonapi.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.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/jsonapi/libgnunetjsonapi.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) - gnunet_reclaim_SOURCES = \ gnunet-reclaim.c gnunet_reclaim_LDADD = \ diff --git a/src/rest-plugins/Makefile.am b/src/rest-plugins/Makefile.am new file mode 100644 index 000000000..ae74dc78a --- /dev/null +++ b/src/rest-plugins/Makefile.am @@ -0,0 +1,102 @@ +# This Makefile.am is in the public domain +AM_CPPFLAGS = -I$(top_srcdir)/src/include + +plugindir = $(libdir)/gnunet + +pkgcfgdir= $(pkgdatadir)/config.d/ + +libexecdir= $(pkglibdir)/libexec/ + + +if MINGW + WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols +endif + +if USE_COVERAGE + AM_CFLAGS = --coverage -O0 + XLIBS = -lgcov +endif + +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 \ + libgnunet_plugin_rest_openid_connect.la + + +libgnunet_plugin_rest_copying_la_SOURCES = \ + plugin_rest_copying.c +libgnunet_plugin_rest_copying_la_LIBADD = \ + $(top_builddir)/src/rest/libgnunetrest.la \ + $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ + $(LTLIBINTL) -lmicrohttpd +libgnunet_plugin_rest_copying_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) + +libgnunet_plugin_rest_peerinfo_la_SOURCES = \ + plugin_rest_peerinfo.c +libgnunet_plugin_rest_peerinfo_la_LIBADD = \ + $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ + $(top_builddir)/src/rest/libgnunetrest.la \ + $(top_builddir)/src/json/libgnunetjson.la \ + $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ + $(LTLIBINTL) -ljansson -lmicrohttpd +libgnunet_plugin_rest_peerinfo_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) + +libgnunet_plugin_rest_identity_la_SOURCES = \ + plugin_rest_identity.c +libgnunet_plugin_rest_identity_la_LIBADD = \ + $(top_builddir)/src/identity/libgnunetidentity.la \ + $(top_builddir)/src/rest/libgnunetrest.la \ + $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ + $(LTLIBINTL) -ljansson -lmicrohttpd +libgnunet_plugin_rest_identity_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) + + + +libgnunet_plugin_rest_namestore_la_SOURCES = \ + plugin_rest_namestore.c +libgnunet_plugin_rest_namestore_la_LIBADD = \ + $(top_builddir)/src/namestore/libgnunetnamestore.la \ + $(top_builddir)/src/rest/libgnunetrest.la \ + $(top_builddir)/src/identity/libgnunetidentity.la \ + $(top_builddir)/src/json/libgnunetjson.la \ + $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ + $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ + $(LTLIBINTL) -ljansson -lmicrohttpd +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/gns/libgnunetgns.la \ + $(top_builddir)/src/rest/libgnunetrest.la \ + $(top_builddir)/src/identity/libgnunetidentity.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.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/jsonapi/libgnunetjsonapi.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) + diff --git a/src/reclaim/oidc_helper.c b/src/rest-plugins/oidc_helper.c similarity index 100% rename from src/reclaim/oidc_helper.c rename to src/rest-plugins/oidc_helper.c diff --git a/src/reclaim/oidc_helper.h b/src/rest-plugins/oidc_helper.h similarity index 100% rename from src/reclaim/oidc_helper.h rename to src/rest-plugins/oidc_helper.h diff --git a/src/rest/plugin_rest_copying.c b/src/rest-plugins/plugin_rest_copying.c similarity index 100% rename from src/rest/plugin_rest_copying.c rename to src/rest-plugins/plugin_rest_copying.c diff --git a/src/gns/plugin_rest_gns.c b/src/rest-plugins/plugin_rest_gns.c similarity index 100% rename from src/gns/plugin_rest_gns.c rename to src/rest-plugins/plugin_rest_gns.c diff --git a/src/identity/plugin_rest_identity.c b/src/rest-plugins/plugin_rest_identity.c similarity index 100% rename from src/identity/plugin_rest_identity.c rename to src/rest-plugins/plugin_rest_identity.c diff --git a/src/namestore/plugin_rest_namestore.c b/src/rest-plugins/plugin_rest_namestore.c similarity index 100% rename from src/namestore/plugin_rest_namestore.c rename to src/rest-plugins/plugin_rest_namestore.c diff --git a/src/reclaim/plugin_rest_openid_connect.c b/src/rest-plugins/plugin_rest_openid_connect.c similarity index 100% rename from src/reclaim/plugin_rest_openid_connect.c rename to src/rest-plugins/plugin_rest_openid_connect.c diff --git a/src/peerinfo/plugin_rest_peerinfo.c b/src/rest-plugins/plugin_rest_peerinfo.c similarity index 100% rename from src/peerinfo/plugin_rest_peerinfo.c rename to src/rest-plugins/plugin_rest_peerinfo.c diff --git a/src/rest/Makefile.am b/src/rest/Makefile.am index f87335152..6c23ad2a6 100644 --- a/src/rest/Makefile.am +++ b/src/rest/Makefile.am @@ -10,7 +10,6 @@ libexecdir= $(pkglibdir)/libexec/ pkgcfg_DATA = \ rest.conf - if MINGW WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols endif @@ -29,18 +28,6 @@ libexec_PROGRAMS = \ EXTRA_DIST = \ rest.conf -plugin_LTLIBRARIES = libgnunet_plugin_rest_copying.la - -libgnunet_plugin_rest_copying_la_SOURCES = \ - plugin_rest_copying.c -libgnunet_plugin_rest_copying_la_LIBADD = \ - libgnunetrest.la \ - $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ - $(LTLIBINTL) -lmicrohttpd -libgnunet_plugin_rest_copying_la_LDFLAGS = \ - $(GN_PLUGIN_LDFLAGS) - - gnunet_rest_server_SOURCES = \ gnunet-rest-server.c -- 2.25.1