[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 12/14: move copying to rest
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 12/14: move copying to rest |
Date: |
Tue, 12 Mar 2019 10:09:09 +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 6914bcb2330e626e1990a4dcba00f52211afe313
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Tue Mar 12 09:59:11 2019 +0100
move copying to rest
---
src/Makefile.am | 4 ++--
src/rest/Makefile.am | 15 ++++++++++++++-
src/{util => rest}/plugin_rest_copying.c | 0
src/util/Makefile.am | 20 +-------------------
4 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index ebf008eb0..09dd81d19 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -81,6 +81,8 @@ SUBDIRS = \
statistics \
arm \
$(TESTING) \
+ $(JSON_DIR) \
+ $(REST_DIR) \
peerinfo \
$(SQLITE_DIR) \
$(MYSQL_DIR) \
@@ -122,8 +124,6 @@ SUBDIRS = \
pt \
secretsharing \
$(EXP_DIR) \
- $(JSON_DIR) \
- $(REST_DIR) \
integration-tests
endif
diff --git a/src/rest/Makefile.am b/src/rest/Makefile.am
index 6c23ad2a6..acb95140b 100644
--- a/src/rest/Makefile.am
+++ b/src/rest/Makefile.am
@@ -20,14 +20,27 @@ if USE_COVERAGE
endif
lib_LTLIBRARIES = \
- libgnunetrest.la
+ libgnunetrest.la
libexec_PROGRAMS = \
gnunet-rest-server
+plugin_LTLIBRARIES = libgnunet_plugin_rest_copying.la
+
EXTRA_DIST = \
rest.conf
+libgnunet_plugin_rest_copying_la_SOURCES = \
+ plugin_rest_copying.c
+libgnunet_plugin_rest_copying_la_LIBADD = \
+ libgnunetrest.la \
+ $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+ $(LTLIBINTL) -lmicrohttpd
+libgnunet_plugin_rest_copying_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
+
gnunet_rest_server_SOURCES = \
gnunet-rest-server.c
diff --git a/src/util/plugin_rest_copying.c b/src/rest/plugin_rest_copying.c
similarity index 100%
rename from src/util/plugin_rest_copying.c
rename to src/rest/plugin_rest_copying.c
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index a35314354..cd14fb4ca 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -45,23 +45,6 @@ if ENABLE_BENCHMARK
PTHREAD = -lpthread
endif
-if HAVE_MHD
-if HAVE_JSON
-REST_PLUGIN = libgnunet_plugin_rest_copying.la
-endif
-endif
-
-
-libgnunet_plugin_rest_copying_la_SOURCES = \
- plugin_rest_copying.c
-libgnunet_plugin_rest_copying_la_LIBADD = \
- $(top_builddir)/src/rest/libgnunetrest.la \
- libgnunetutil.la $(XLIBS) \
- $(LTLIBINTL) -lmicrohttpd
-libgnunet_plugin_rest_copying_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
w32cat_SOURCES = w32cat.c
gnunet_helper_w32_console_SOURCES = \
@@ -308,8 +291,7 @@ gnunet_uri_LDADD = \
$(GN_LIBINTL)
plugin_LTLIBRARIES = \
- libgnunet_plugin_test.la \
- $(REST_PLUGIN)
+ libgnunet_plugin_test.la
libgnunet_plugin_test_la_SOURCES = \
test_plugin_plug.c
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] branch master updated (76c6ccfdf -> e2a69125a), gnunet, 2019/03/12
- [GNUnet-SVN] [gnunet] 10/14: add mhd ifdef, gnunet, 2019/03/12
- [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 <=
- [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, 2019/03/12
- [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