[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 03/14: move namestore plugin
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 03/14: move namestore plugin |
Date: |
Tue, 12 Mar 2019 10:09:00 +0100 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit a649dcbd9b204c7ec807d711e4c1bf7cb2edf5ae
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Tue Mar 12 09:41:59 2019 +0100
move namestore plugin
---
src/namestore/Makefile.am | 57 +++++++++++++++-------
.../plugin_rest_namestore.c | 0
src/rest-plugins/Makefile.am | 13 -----
3 files changed, 40 insertions(+), 30 deletions(-)
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index ac4eebd06..25941b4fb 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -104,10 +104,50 @@ TESTS = \
$(check_SCRIPTS)
endif
+if HAVE_MHD
+if HAVE_JSON
+REST_PLUGIN = libgnunet_plugin_rest_namestore.la
+endif
+endif
+
lib_LTLIBRARIES = \
libgnunetnamestore.la
+libexec_PROGRAMS = \
+ gnunet-service-namestore
+
+bin_PROGRAMS = \
+ gnunet-namestore \
+ gnunet-zoneimport
+
+if HAVE_MHD
+libexec_PROGRAMS += \
+ gnunet-namestore-fcfsd
+endif
+
+
+plugin_LTLIBRARIES = \
+ $(SQLITE_PLUGIN) \
+ $(POSTGRES_PLUGIN) \
+ $(HEAP_PLUGIN) \
+ $(REST_PLUGIN)
+
+
+libgnunet_plugin_rest_namestore_la_SOURCES = \
+ plugin_rest_namestore.c
+libgnunet_plugin_rest_namestore_la_LIBADD = \
+ libgnunetnamestore.la \
+ $(top_builddir)/src/rest/libgnunetrest.la \
+ $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/json/libgnunetjson.la \
+ $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+ $(LTLIBINTL) -ljansson -lmicrohttpd
+libgnunet_plugin_rest_namestore_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
libgnunetnamestore_la_SOURCES = \
namestore_api.c \
namestore_api_monitor.c \
@@ -121,17 +161,6 @@ libgnunetnamestore_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
-version-info 0:1:0
-libexec_PROGRAMS = \
- gnunet-service-namestore
-
-bin_PROGRAMS = \
- gnunet-namestore \
- gnunet-zoneimport
-
-if HAVE_MHD
-libexec_PROGRAMS += \
- gnunet-namestore-fcfsd
-endif
gnunet_zoneimport_SOURCES = \
@@ -176,12 +205,6 @@ gnunet_service_namestore_LDADD = \
$(GN_LIBINTL)
-plugin_LTLIBRARIES = \
- $(SQLITE_PLUGIN) \
- $(POSTGRES_PLUGIN) \
- $(HEAP_PLUGIN)
-
-
libgnunet_plugin_namestore_heap_la_SOURCES = \
plugin_namestore_heap.c
diff --git a/src/rest-plugins/plugin_rest_namestore.c
b/src/namestore/plugin_rest_namestore.c
similarity index 100%
rename from src/rest-plugins/plugin_rest_namestore.c
rename to src/namestore/plugin_rest_namestore.c
diff --git a/src/rest-plugins/Makefile.am b/src/rest-plugins/Makefile.am
index e99d88676..ff14bcc0b 100644
--- a/src/rest-plugins/Makefile.am
+++ b/src/rest-plugins/Makefile.am
@@ -58,17 +58,4 @@ libgnunet_plugin_rest_peerinfo_la_LDFLAGS = \
-libgnunet_plugin_rest_namestore_la_SOURCES = \
- plugin_rest_namestore.c
-libgnunet_plugin_rest_namestore_la_LIBADD = \
- $(top_builddir)/src/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/rest/libgnunetrest.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
- $(top_builddir)/src/json/libgnunetjson.la \
- $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
- $(LTLIBINTL) -ljansson -lmicrohttpd
-libgnunet_plugin_rest_namestore_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] 14/14: update gitignore, (continued)
- [GNUnet-SVN] [gnunet] 14/14: update gitignore, gnunet, 2019/03/12
- [GNUnet-SVN] [gnunet] 13/14: update changelog, make build, gnunet, 2019/03/12
- [GNUnet-SVN] [gnunet] 12/14: move copying to rest, gnunet, 2019/03/12
- [GNUnet-SVN] [gnunet] 09/14: change makefile for rest, gnunet, 2019/03/12
- [GNUnet-SVN] [gnunet] 08/14: move credential makefile defs, gnunet, 2019/03/12
- [GNUnet-SVN] [gnunet] 07/14: move disfunc credential, gnunet, 2019/03/12
- [GNUnet-SVN] [gnunet] 06/14: move rest tests, gnunet, 2019/03/12
- [GNUnet-SVN] [gnunet] 11/14: fix bootstrap, gnunet, 2019/03/12
- [GNUnet-SVN] [gnunet] 04/14: move peerinfo rest, gnunet, 2019/03/12
- [GNUnet-SVN] [gnunet] 02/14: move identity rest plugin, gnunet, 2019/03/12
- [GNUnet-SVN] [gnunet] 03/14: move namestore plugin,
gnunet <=
- [GNUnet-SVN] [gnunet] 05/14: move copying rest, gnunet, 2019/03/12
- [GNUnet-SVN] [gnunet] 01/14: move reclaim and gns back into subdirs, gnunet, 2019/03/12