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/peerinfo-tool/Makefile.am | |
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/peerinfo-tool/Makefile.am')
-rw-r--r-- | src/peerinfo-tool/Makefile.am | 23 |
1 files changed, 23 insertions, 0 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 |