diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-03-12 09:43:56 +0100 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-03-12 09:43:56 +0100 |
commit | 60aff9e596e988954d3f50d57442744b1e20f576 (patch) | |
tree | a7e1351516bc2ac0a725bb5ab19398f3bace0482 | |
parent | a649dcbd9b204c7ec807d711e4c1bf7cb2edf5ae (diff) | |
download | gnunet-60aff9e596e988954d3f50d57442744b1e20f576.tar.gz gnunet-60aff9e596e988954d3f50d57442744b1e20f576.zip |
move peerinfo rest
-rw-r--r-- | src/peerinfo/Makefile.am | 22 | ||||
-rw-r--r-- | src/peerinfo/plugin_rest_peerinfo.c (renamed from src/rest-plugins/plugin_rest_peerinfo.c) | 0 | ||||
-rw-r--r-- | src/rest-plugins/Makefile.am | 13 |
3 files changed, 22 insertions, 13 deletions
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 | |||
17 | XLIB = -lgcov | 17 | XLIB = -lgcov |
18 | endif | 18 | endif |
19 | 19 | ||
20 | if HAVE_MHD | ||
21 | if HAVE_JSON | ||
22 | REST_PLUGIN = libgnunet_plugin_rest_peerinfo.la | ||
23 | endif | ||
24 | endif | ||
25 | |||
20 | lib_LTLIBRARIES = libgnunetpeerinfo.la | 26 | lib_LTLIBRARIES = libgnunetpeerinfo.la |
21 | 27 | ||
28 | plugin_LTLIBRARIES = $(REST_PLUGIN) | ||
29 | |||
30 | libgnunet_plugin_rest_peerinfo_la_SOURCES = \ | ||
31 | plugin_rest_peerinfo.c | ||
32 | libgnunet_plugin_rest_peerinfo_la_LIBADD = \ | ||
33 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
34 | libgnunetpeerinfo.la \ | ||
35 | $(top_builddir)/src/rest/libgnunetrest.la \ | ||
36 | $(top_builddir)/src/json/libgnunetjson.la \ | ||
37 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
38 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | ||
39 | $(LTLIBINTL) -ljansson -lmicrohttpd | ||
40 | libgnunet_plugin_rest_peerinfo_la_LDFLAGS = \ | ||
41 | $(GN_PLUGIN_LDFLAGS) | ||
42 | |||
43 | |||
22 | libgnunetpeerinfo_la_SOURCES = \ | 44 | libgnunetpeerinfo_la_SOURCES = \ |
23 | peerinfo_api.c peerinfo.h \ | 45 | peerinfo_api.c peerinfo.h \ |
24 | peerinfo_api_notify.c | 46 | peerinfo_api_notify.c |
diff --git a/src/rest-plugins/plugin_rest_peerinfo.c b/src/peerinfo/plugin_rest_peerinfo.c index 24af2c193..24af2c193 100644 --- a/src/rest-plugins/plugin_rest_peerinfo.c +++ b/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 = \ | |||
43 | libgnunet_plugin_rest_copying_la_LDFLAGS = \ | 43 | libgnunet_plugin_rest_copying_la_LDFLAGS = \ |
44 | $(GN_PLUGIN_LDFLAGS) | 44 | $(GN_PLUGIN_LDFLAGS) |
45 | 45 | ||
46 | libgnunet_plugin_rest_peerinfo_la_SOURCES = \ | ||
47 | plugin_rest_peerinfo.c | ||
48 | libgnunet_plugin_rest_peerinfo_la_LIBADD = \ | ||
49 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
50 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | ||
51 | $(top_builddir)/src/rest/libgnunetrest.la \ | ||
52 | $(top_builddir)/src/json/libgnunetjson.la \ | ||
53 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
54 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | ||
55 | $(LTLIBINTL) -ljansson -lmicrohttpd | ||
56 | libgnunet_plugin_rest_peerinfo_la_LDFLAGS = \ | ||
57 | $(GN_PLUGIN_LDFLAGS) | ||
58 | |||
59 | 46 | ||
60 | 47 | ||
61 | 48 | ||