summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSchanzenbach, Martin <mschanzenbach@posteo.de>2019-04-03 21:15:27 +0200
committerSchanzenbach, Martin <mschanzenbach@posteo.de>2019-04-03 21:15:27 +0200
commitcd3db61291fd47b5acde1ae3add16c7ccfc2f996 (patch)
tree00135a5868fa8c4bf4e4c12b2f86562b78764d60 /src
parenta045962087fe78566bb1aa84693071df857a5d9c (diff)
fix rest plugin build
Diffstat (limited to 'src')
-rw-r--r--src/peerinfo-tool/Makefile.am22
-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.am20
3 files changed, 22 insertions, 20 deletions
diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am
index 429224650..a5fd60246 100644
--- a/src/peerinfo-tool/Makefile.am
+++ b/src/peerinfo-tool/Makefile.am
@@ -10,11 +10,33 @@ if USE_COVERAGE
XLIB = -lgcov
endif
+if HAVE_MHD
+if HAVE_JSON
+REST_PLUGIN = libgnunet_plugin_rest_peerinfo.la
+endif
+endif
+
plugindir = $(libdir)/gnunet
+plugin_LTLIBRARIES = $(REST_PLUGIN)
+
bin_PROGRAMS = \
gnunet-peerinfo
+libgnunet_plugin_rest_peerinfo_la_SOURCES = \
+ plugin_rest_peerinfo.c
+libgnunet_plugin_rest_peerinfo_la_LIBADD = \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/rest/libgnunetrest.la \
+ $(top_builddir)/src/json/libgnunetjson.la \
+ $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+ $(LTLIBINTL) -ljansson -lmicrohttpd
+libgnunet_plugin_rest_peerinfo_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
gnunet_peerinfo_SOURCES = \
gnunet-peerinfo.c \
gnunet-peerinfo_plugins.c gnunet-peerinfo_plugins.h
diff --git a/src/peerinfo/plugin_rest_peerinfo.c b/src/peerinfo-tool/plugin_rest_peerinfo.c
index 24af2c193..24af2c193 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 3c710eb93..d07ed3a5b 100644
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -19,28 +19,8 @@ if USE_COVERAGE
XLIB = -lgcov
endif
-if HAVE_MHD
-if HAVE_JSON
-REST_PLUGIN = libgnunet_plugin_rest_peerinfo.la
-endif
-endif
-
lib_LTLIBRARIES = libgnunetpeerinfo.la
-plugin_LTLIBRARIES = $(REST_PLUGIN)
-
-libgnunet_plugin_rest_peerinfo_la_SOURCES = \
- plugin_rest_peerinfo.c
-libgnunet_plugin_rest_peerinfo_la_LIBADD = \
- $(top_builddir)/src/hello/libgnunethello.la \
- libgnunetpeerinfo.la \
- $(top_builddir)/src/rest/libgnunetrest.la \
- $(top_builddir)/src/json/libgnunetjson.la \
- $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
- $(LTLIBINTL) -ljansson -lmicrohttpd
-libgnunet_plugin_rest_peerinfo_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
libgnunetpeerinfo_la_SOURCES = \
peerinfo_api.c peerinfo.h \