diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2018-09-27 17:20:45 +0200 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2018-09-27 17:20:45 +0200 |
commit | aea518e4e5fc23c0778823f4a09d3de04628bf79 (patch) | |
tree | e3831eeaa52db6581e90c2d81d7e51ed23be7bb5 /src | |
parent | efa571ec44021e2ee0178840a5b9d08d637e97dc (diff) | |
download | gnunet-aea518e4e5fc23c0778823f4a09d3de04628bf79.tar.gz gnunet-aea518e4e5fc23c0778823f4a09d3de04628bf79.zip |
actually fix ftbfs
Diffstat (limited to 'src')
-rw-r--r-- | src/credential/Makefile.am | 20 | ||||
-rw-r--r-- | src/rest-plugins/Makefile.am | 18 | ||||
-rw-r--r-- | src/rest-plugins/plugin_rest_credential.c (renamed from src/credential/plugin_rest_credential.c) | 0 |
3 files changed, 17 insertions, 21 deletions
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 = \ | |||
35 | libgnunet_plugin_gnsrecord_credential.la | 35 | libgnunet_plugin_gnsrecord_credential.la |
36 | 36 | ||
37 | 37 | ||
38 | if HAVE_MHD | ||
39 | if HAVE_JSON | ||
40 | plugin_LTLIBRARIES += libgnunet_plugin_rest_credential.la | ||
41 | endif | ||
42 | endif | ||
43 | |||
44 | |||
45 | gnunet_credential_SOURCES = \ | 38 | gnunet_credential_SOURCES = \ |
46 | gnunet-credential.c | 39 | gnunet-credential.c |
47 | gnunet_credential_LDADD = \ | 40 | gnunet_credential_LDADD = \ |
@@ -84,19 +77,6 @@ libgnunetcredential_la_LDFLAGS = \ | |||
84 | $(GN_LIB_LDFLAGS) | 77 | $(GN_LIB_LDFLAGS) |
85 | 78 | ||
86 | 79 | ||
87 | libgnunet_plugin_rest_credential_la_SOURCES = \ | ||
88 | plugin_rest_credential.c | ||
89 | libgnunet_plugin_rest_credential_la_LIBADD = \ | ||
90 | libgnunetcredential.la \ | ||
91 | $(top_builddir)/src/rest/libgnunetrest.la \ | ||
92 | $(top_builddir)/src/identity/libgnunetidentity.la \ | ||
93 | $(top_builddir)/src/jsonapi/libgnunetjsonapi.la \ | ||
94 | $(top_builddir)/src/jsonapi/libgnunetjsonapiutils.la \ | ||
95 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | ||
96 | $(LTLIBINTL) -ljansson -lmicrohttpd | ||
97 | libgnunet_plugin_rest_credential_la_LDFLAGS = \ | ||
98 | $(GN_PLUGIN_LDFLAGS) | ||
99 | |||
100 | 80 | ||
101 | check_SCRIPTS = \ | 81 | check_SCRIPTS = \ |
102 | test_credential_issue.sh \ | 82 | 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 = \ | |||
22 | libgnunet_plugin_rest_peerinfo.la \ | 22 | libgnunet_plugin_rest_peerinfo.la \ |
23 | libgnunet_plugin_rest_identity.la \ | 23 | libgnunet_plugin_rest_identity.la \ |
24 | libgnunet_plugin_rest_namestore.la \ | 24 | libgnunet_plugin_rest_namestore.la \ |
25 | libgnunet_plugin_rest_gns.la | 25 | libgnunet_plugin_rest_gns.la \ |
26 | libgnunet_plugin_rest_credential.la | ||
26 | if HAVE_ABE | 27 | if HAVE_ABE |
27 | plugin_LTLIBRARIES += libgnunet_plugin_rest_openid_connect.la | 28 | plugin_LTLIBRARIES += libgnunet_plugin_rest_openid_connect.la |
28 | endif | 29 | endif |
29 | 30 | ||
31 | libgnunet_plugin_rest_credential_la_SOURCES = \ | ||
32 | plugin_rest_credential.c | ||
33 | libgnunet_plugin_rest_credential_la_LIBADD = \ | ||
34 | $(top_builddir)/src/credential/libgnunetcredential.la \ | ||
35 | $(top_builddir)/src/rest/libgnunetrest.la \ | ||
36 | $(top_builddir)/src/identity/libgnunetidentity.la \ | ||
37 | $(top_builddir)/src/jsonapi/libgnunetjsonapi.la \ | ||
38 | $(top_builddir)/src/jsonapi/libgnunetjsonapiutils.la \ | ||
39 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | ||
40 | $(LTLIBINTL) -ljansson -lmicrohttpd | ||
41 | libgnunet_plugin_rest_credential_la_LDFLAGS = \ | ||
42 | $(GN_PLUGIN_LDFLAGS) | ||
43 | |||
44 | |||
45 | |||
30 | 46 | ||
31 | libgnunet_plugin_rest_copying_la_SOURCES = \ | 47 | libgnunet_plugin_rest_copying_la_SOURCES = \ |
32 | plugin_rest_copying.c | 48 | plugin_rest_copying.c |
diff --git a/src/credential/plugin_rest_credential.c b/src/rest-plugins/plugin_rest_credential.c index 253378dfc..253378dfc 100644 --- a/src/credential/plugin_rest_credential.c +++ b/src/rest-plugins/plugin_rest_credential.c | |||