From 60aff9e596e988954d3f50d57442744b1e20f576 Mon Sep 17 00:00:00 2001 From: "Schanzenbach, Martin" Date: Tue, 12 Mar 2019 09:43:56 +0100 Subject: [PATCH] move peerinfo rest --- src/peerinfo/Makefile.am | 22 +++++++++++++++++++ .../plugin_rest_peerinfo.c | 0 src/rest-plugins/Makefile.am | 13 ----------- 3 files changed, 22 insertions(+), 13 deletions(-) rename src/{rest-plugins => peerinfo}/plugin_rest_peerinfo.c (100%) diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am index ef79d6720..deb3fcf6c 100644 --- a/src/peerinfo/Makefile.am +++ b/src/peerinfo/Makefile.am @@ -17,8 +17,30 @@ if USE_COVERAGE XLIB = -lgcov endif +if HAVE_MHD +if HAVE_JSON +REST_PLUGIN = libgnunet_plugin_rest_peerinfo.la +endif +endif + lib_LTLIBRARIES = libgnunetpeerinfo.la +plugin_LTLIBRARIES = $(REST_PLUGIN) + +libgnunet_plugin_rest_peerinfo_la_SOURCES = \ + plugin_rest_peerinfo.c +libgnunet_plugin_rest_peerinfo_la_LIBADD = \ + $(top_builddir)/src/hello/libgnunethello.la \ + 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) + + libgnunetpeerinfo_la_SOURCES = \ peerinfo_api.c peerinfo.h \ peerinfo_api_notify.c diff --git a/src/rest-plugins/plugin_rest_peerinfo.c b/src/peerinfo/plugin_rest_peerinfo.c similarity index 100% rename from src/rest-plugins/plugin_rest_peerinfo.c rename to src/peerinfo/plugin_rest_peerinfo.c diff --git a/src/rest-plugins/Makefile.am b/src/rest-plugins/Makefile.am index ff14bcc0b..65ad7fcec 100644 --- a/src/rest-plugins/Makefile.am +++ b/src/rest-plugins/Makefile.am @@ -43,19 +43,6 @@ libgnunet_plugin_rest_copying_la_LIBADD = \ 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/hello/libgnunethello.la \ - $(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) - -- 2.25.1