diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-08-11 10:40:26 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-08-11 10:41:42 +0200 |
commit | 97e72521285a2ff2189334cb43d0a8f385d73e4a (patch) | |
tree | e3fed58505787f1de6af428230ad768509a5611d /src | |
parent | ba30221f3588d75b3073cd737fbbf6d0c80e5906 (diff) | |
download | gnunet-97e72521285a2ff2189334cb43d0a8f385d73e4a.tar.gz gnunet-97e72521285a2ff2189334cb43d0a8f385d73e4a.zip |
fix build order: peerinfo logic depending on transport must be in peerinfo-tool
Diffstat (limited to 'src')
-rw-r--r-- | src/peerinfo-tool/Makefile.am | 23 | ||||
-rw-r--r-- | src/peerinfo-tool/plugin_rest_peerinfo.c (renamed from src/peerinfo/plugin_rest_peerinfo.c) | 0 | ||||
-rw-r--r-- | src/peerinfo/Makefile.am | 23 |
3 files changed, 24 insertions, 22 deletions
diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am index 648957a05..6f9a3360c 100644 --- a/src/peerinfo-tool/Makefile.am +++ b/src/peerinfo-tool/Makefile.am | |||
@@ -10,6 +10,8 @@ if USE_COVERAGE | |||
10 | XLIB = -lgcov | 10 | XLIB = -lgcov |
11 | endif | 11 | endif |
12 | 12 | ||
13 | plugindir = $(libdir)/gnunet | ||
14 | |||
13 | bin_PROGRAMS = \ | 15 | bin_PROGRAMS = \ |
14 | gnunet-peerinfo | 16 | gnunet-peerinfo |
15 | 17 | ||
@@ -24,6 +26,27 @@ gnunet_peerinfo_LDADD = \ | |||
24 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 26 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
25 | $(top_builddir)/src/util/libgnunetutil.la | 27 | $(top_builddir)/src/util/libgnunetutil.la |
26 | 28 | ||
29 | if HAVE_MHD | ||
30 | if HAVE_JSON | ||
31 | plugin_LTLIBRARIES = \ | ||
32 | libgnunet_plugin_rest_peerinfo.la | ||
33 | endif | ||
34 | endif | ||
35 | |||
36 | |||
37 | libgnunet_plugin_rest_peerinfo_la_SOURCES = \ | ||
38 | plugin_rest_peerinfo.c | ||
39 | libgnunet_plugin_rest_peerinfo_la_LIBADD = \ | ||
40 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | ||
41 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
42 | $(top_builddir)/src/rest/libgnunetrest.la \ | ||
43 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | ||
44 | $(LTLIBINTL) -ljansson -lmicrohttpd | ||
45 | libgnunet_plugin_rest_peerinfo_la_LDFLAGS = \ | ||
46 | $(GN_PLUGIN_LDFLAGS) | ||
47 | |||
48 | |||
49 | |||
27 | if HAVE_PYTHON | 50 | if HAVE_PYTHON |
28 | check_SCRIPTS = \ | 51 | check_SCRIPTS = \ |
29 | test_gnunet_peerinfo.py | 52 | test_gnunet_peerinfo.py |
diff --git a/src/peerinfo/plugin_rest_peerinfo.c b/src/peerinfo-tool/plugin_rest_peerinfo.c index 97c473e36..97c473e36 100644 --- a/src/peerinfo/plugin_rest_peerinfo.c +++ b/src/peerinfo-tool/plugin_rest_peerinfo.c | |||
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am index 5e96250b1..926b9ae94 100644 --- a/src/peerinfo/Makefile.am +++ b/src/peerinfo/Makefile.am | |||
@@ -5,8 +5,6 @@ pkgcfgdir= $(pkgdatadir)/config.d/ | |||
5 | 5 | ||
6 | libexecdir= $(pkglibdir)/libexec/ | 6 | libexecdir= $(pkglibdir)/libexec/ |
7 | 7 | ||
8 | plugindir = $(libdir)/gnunet | ||
9 | |||
10 | pkgcfg_DATA = \ | 8 | pkgcfg_DATA = \ |
11 | peerinfo.conf | 9 | peerinfo.conf |
12 | 10 | ||
@@ -28,7 +26,6 @@ libgnunetpeerinfo_la_LIBADD = \ | |||
28 | $(top_builddir)/src/hello/libgnunethello.la \ | 26 | $(top_builddir)/src/hello/libgnunethello.la \ |
29 | $(top_builddir)/src/util/libgnunetutil.la \ | 27 | $(top_builddir)/src/util/libgnunetutil.la \ |
30 | $(top_builddir)/src/json/libgnunetjson.la \ | 28 | $(top_builddir)/src/json/libgnunetjson.la \ |
31 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
32 | $(XLIB) \ | 29 | $(XLIB) \ |
33 | $(LTLIBINTL) | 30 | $(LTLIBINTL) |
34 | libgnunetpeerinfo_la_LDFLAGS = \ | 31 | libgnunetpeerinfo_la_LDFLAGS = \ |
@@ -39,30 +36,12 @@ libgnunetpeerinfo_la_LDFLAGS = \ | |||
39 | libexec_PROGRAMS = \ | 36 | libexec_PROGRAMS = \ |
40 | gnunet-service-peerinfo | 37 | gnunet-service-peerinfo |
41 | 38 | ||
42 | if HAVE_MHD | ||
43 | if HAVE_JSON | ||
44 | plugin_LTLIBRARIES = \ | ||
45 | libgnunet_plugin_rest_peerinfo.la | ||
46 | endif | ||
47 | endif | ||
48 | |||
49 | gnunet_service_peerinfo_SOURCES = \ | 39 | gnunet_service_peerinfo_SOURCES = \ |
50 | gnunet-service-peerinfo.c | 40 | gnunet-service-peerinfo.c |
51 | gnunet_service_peerinfo_LDADD = \ | 41 | gnunet_service_peerinfo_LDADD = \ |
52 | $(top_builddir)/src/hello/libgnunethello.la \ | 42 | $(top_builddir)/src/hello/libgnunethello.la \ |
53 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 43 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
54 | $(top_builddir)/src/util/libgnunetutil.la | 44 | $(top_builddir)/src/util/libgnunetutil.la |
55 | |||
56 | |||
57 | libgnunet_plugin_rest_peerinfo_la_SOURCES = \ | ||
58 | plugin_rest_peerinfo.c | ||
59 | libgnunet_plugin_rest_peerinfo_la_LIBADD = \ | ||
60 | libgnunetpeerinfo.la \ | ||
61 | $(top_builddir)/src/rest/libgnunetrest.la \ | ||
62 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | ||
63 | $(LTLIBINTL) -ljansson -lmicrohttpd | ||
64 | libgnunet_plugin_rest_peerinfo_la_LDFLAGS = \ | ||
65 | $(GN_PLUGIN_LDFLAGS) | ||
66 | 45 | ||
67 | if HAVE_BENCHMARKS | 46 | if HAVE_BENCHMARKS |
68 | PEERINFO_BENCHMARKS = \ | 47 | PEERINFO_BENCHMARKS = \ |