From 1053f49f48dcd6bf53d624f17117ccbf878de396 Mon Sep 17 00:00:00 2001 From: "Schanzenbach, Martin" Date: Tue, 12 Mar 2019 09:45:37 +0100 Subject: [PATCH] move copying rest --- src/rest-plugins/Makefile.am | 12 ------------ src/util/Makefile.am | 17 +++++++++++++++++ .../plugin_rest_copying.c | 0 3 files changed, 17 insertions(+), 12 deletions(-) rename src/{rest-plugins => util}/plugin_rest_copying.c (100%) diff --git a/src/rest-plugins/Makefile.am b/src/rest-plugins/Makefile.am index 65ad7fcec..bdc323c69 100644 --- a/src/rest-plugins/Makefile.am +++ b/src/rest-plugins/Makefile.am @@ -18,9 +18,6 @@ if USE_COVERAGE endif plugin_LTLIBRARIES = \ - libgnunet_plugin_rest_copying.la \ - libgnunet_plugin_rest_peerinfo.la \ - libgnunet_plugin_rest_namestore.la #libgnunet_plugin_rest_credential_la_SOURCES = \ @@ -34,15 +31,6 @@ plugin_LTLIBRARIES = \ #libgnunet_plugin_rest_credential_la_LDFLAGS = \ # $(GN_PLUGIN_LDFLAGS) -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) - diff --git a/src/util/Makefile.am b/src/util/Makefile.am index cd14fb4ca..5b1bcfd55 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -45,6 +45,23 @@ if ENABLE_BENCHMARK PTHREAD = -lpthread endif +if HAVE_MHD +if HAVE_JSON +REST_PLUGIN = libgnunet_plugin_rest_copying.la +endif +endif + + +libgnunet_plugin_rest_copying_la_SOURCES = \ + plugin_rest_copying.c +libgnunet_plugin_rest_copying_la_LIBADD = \ + $(top_builddir)/src/rest/libgnunetrest.la \ + libgnunetutil.la $(XLIBS) \ + $(LTLIBINTL) -lmicrohttpd +libgnunet_plugin_rest_copying_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) + + w32cat_SOURCES = w32cat.c gnunet_helper_w32_console_SOURCES = \ diff --git a/src/rest-plugins/plugin_rest_copying.c b/src/util/plugin_rest_copying.c similarity index 100% rename from src/rest-plugins/plugin_rest_copying.c rename to src/util/plugin_rest_copying.c -- 2.25.1