From aea518e4e5fc23c0778823f4a09d3de04628bf79 Mon Sep 17 00:00:00 2001 From: "Schanzenbach, Martin" Date: Thu, 27 Sep 2018 17:20:45 +0200 Subject: [PATCH] actually fix ftbfs --- src/credential/Makefile.am | 20 ------------------- src/rest-plugins/Makefile.am | 18 ++++++++++++++++- .../plugin_rest_credential.c | 0 3 files changed, 17 insertions(+), 21 deletions(-) rename src/{credential => rest-plugins}/plugin_rest_credential.c (100%) diff --git a/src/credential/Makefile.am b/src/credential/Makefile.am index ca11c5e4f..90479eed1 100644 --- a/src/credential/Makefile.am +++ b/src/credential/Makefile.am @@ -35,13 +35,6 @@ plugin_LTLIBRARIES = \ libgnunet_plugin_gnsrecord_credential.la -if HAVE_MHD -if HAVE_JSON -plugin_LTLIBRARIES += libgnunet_plugin_rest_credential.la -endif -endif - - gnunet_credential_SOURCES = \ gnunet-credential.c gnunet_credential_LDADD = \ @@ -84,19 +77,6 @@ libgnunetcredential_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) -libgnunet_plugin_rest_credential_la_SOURCES = \ - plugin_rest_credential.c -libgnunet_plugin_rest_credential_la_LIBADD = \ - libgnunetcredential.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_credential_la_LDFLAGS = \ - $(GN_PLUGIN_LDFLAGS) - check_SCRIPTS = \ test_credential_issue.sh \ diff --git a/src/rest-plugins/Makefile.am b/src/rest-plugins/Makefile.am index 486692b72..484dceaba 100644 --- a/src/rest-plugins/Makefile.am +++ b/src/rest-plugins/Makefile.am @@ -22,11 +22,27 @@ plugin_LTLIBRARIES = \ libgnunet_plugin_rest_peerinfo.la \ libgnunet_plugin_rest_identity.la \ libgnunet_plugin_rest_namestore.la \ - libgnunet_plugin_rest_gns.la + libgnunet_plugin_rest_gns.la \ + libgnunet_plugin_rest_credential.la if HAVE_ABE plugin_LTLIBRARIES += libgnunet_plugin_rest_openid_connect.la endif +libgnunet_plugin_rest_credential_la_SOURCES = \ + plugin_rest_credential.c +libgnunet_plugin_rest_credential_la_LIBADD = \ + $(top_builddir)/src/credential/libgnunetcredential.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_credential_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) + + + libgnunet_plugin_rest_copying_la_SOURCES = \ plugin_rest_copying.c diff --git a/src/credential/plugin_rest_credential.c b/src/rest-plugins/plugin_rest_credential.c similarity index 100% rename from src/credential/plugin_rest_credential.c rename to src/rest-plugins/plugin_rest_credential.c -- 2.25.1