[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated: fix rest plugin build
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] branch master updated: fix rest plugin build |
Date: |
Wed, 03 Apr 2019 21:16:51 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new cd3db6129 fix rest plugin build
new f13792325 merge
cd3db6129 is described below
commit cd3db61291fd47b5acde1ae3add16c7ccfc2f996
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Wed Apr 3 21:15:27 2019 +0200
fix rest plugin build
---
src/peerinfo-tool/Makefile.am | 22 ++++++++++++++++++++++
.../plugin_rest_peerinfo.c | 0
src/peerinfo/Makefile.am | 20 --------------------
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
similarity index 100%
rename from src/peerinfo/plugin_rest_peerinfo.c
rename to 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 \
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [gnunet] branch master updated: fix rest plugin build,
gnunet <=