aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSchanzenbach, Martin <mschanzenbach@posteo.de>2019-03-12 09:45:37 +0100
committerSchanzenbach, Martin <mschanzenbach@posteo.de>2019-03-12 09:45:37 +0100
commit1053f49f48dcd6bf53d624f17117ccbf878de396 (patch)
tree88d51e369df5df0ff4f70c161484e750baabbacd /src
parent60aff9e596e988954d3f50d57442744b1e20f576 (diff)
downloadgnunet-1053f49f48dcd6bf53d624f17117ccbf878de396.tar.gz
gnunet-1053f49f48dcd6bf53d624f17117ccbf878de396.zip
move copying rest
Diffstat (limited to 'src')
-rw-r--r--src/rest-plugins/Makefile.am12
-rw-r--r--src/util/Makefile.am17
-rw-r--r--src/util/plugin_rest_copying.c (renamed from src/rest-plugins/plugin_rest_copying.c)0
3 files changed, 17 insertions, 12 deletions
diff --git a/src/rest-plugins/Makefile.am b/src/rest-plugins/Makefile.am
index 65ad7fcec..bdc323c69 100644
--- a/src/rest-plugins/Makefile.am
+++ b/src/rest-plugins/Makefile.am
@@ -18,9 +18,6 @@ if USE_COVERAGE
18endif 18endif
19 19
20plugin_LTLIBRARIES = \ 20plugin_LTLIBRARIES = \
21 libgnunet_plugin_rest_copying.la \
22 libgnunet_plugin_rest_peerinfo.la \
23 libgnunet_plugin_rest_namestore.la
24 21
25 22
26#libgnunet_plugin_rest_credential_la_SOURCES = \ 23#libgnunet_plugin_rest_credential_la_SOURCES = \
@@ -34,15 +31,6 @@ plugin_LTLIBRARIES = \
34#libgnunet_plugin_rest_credential_la_LDFLAGS = \ 31#libgnunet_plugin_rest_credential_la_LDFLAGS = \
35# $(GN_PLUGIN_LDFLAGS) 32# $(GN_PLUGIN_LDFLAGS)
36 33
37libgnunet_plugin_rest_copying_la_SOURCES = \
38 plugin_rest_copying.c
39libgnunet_plugin_rest_copying_la_LIBADD = \
40 $(top_builddir)/src/rest/libgnunetrest.la \
41 $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
42 $(LTLIBINTL) -lmicrohttpd
43libgnunet_plugin_rest_copying_la_LDFLAGS = \
44 $(GN_PLUGIN_LDFLAGS)
45
46 34
47 35
48 36
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index cd14fb4ca..5b1bcfd55 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -45,6 +45,23 @@ if ENABLE_BENCHMARK
45 PTHREAD = -lpthread 45 PTHREAD = -lpthread
46endif 46endif
47 47
48if HAVE_MHD
49if HAVE_JSON
50REST_PLUGIN = libgnunet_plugin_rest_copying.la
51endif
52endif
53
54
55libgnunet_plugin_rest_copying_la_SOURCES = \
56 plugin_rest_copying.c
57libgnunet_plugin_rest_copying_la_LIBADD = \
58 $(top_builddir)/src/rest/libgnunetrest.la \
59 libgnunetutil.la $(XLIBS) \
60 $(LTLIBINTL) -lmicrohttpd
61libgnunet_plugin_rest_copying_la_LDFLAGS = \
62 $(GN_PLUGIN_LDFLAGS)
63
64
48w32cat_SOURCES = w32cat.c 65w32cat_SOURCES = w32cat.c
49 66
50gnunet_helper_w32_console_SOURCES = \ 67gnunet_helper_w32_console_SOURCES = \
diff --git a/src/rest-plugins/plugin_rest_copying.c b/src/util/plugin_rest_copying.c
index 92c2c6601..92c2c6601 100644
--- a/src/rest-plugins/plugin_rest_copying.c
+++ b/src/util/plugin_rest_copying.c