diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-03-12 09:59:11 +0100 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-03-12 09:59:11 +0100 |
commit | 6914bcb2330e626e1990a4dcba00f52211afe313 (patch) | |
tree | 524b06d5e6b026f45ee0d0c49021ea9212aea824 | |
parent | d060e299efdf346f4421c3706669b6ac79b54fc0 (diff) | |
download | gnunet-6914bcb2330e626e1990a4dcba00f52211afe313.tar.gz gnunet-6914bcb2330e626e1990a4dcba00f52211afe313.zip |
move copying to rest
-rw-r--r-- | src/Makefile.am | 4 | ||||
-rw-r--r-- | src/rest/Makefile.am | 15 | ||||
-rw-r--r-- | src/rest/plugin_rest_copying.c (renamed from src/util/plugin_rest_copying.c) | 0 | ||||
-rw-r--r-- | 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 = \ | |||
81 | statistics \ | 81 | statistics \ |
82 | arm \ | 82 | arm \ |
83 | $(TESTING) \ | 83 | $(TESTING) \ |
84 | $(JSON_DIR) \ | ||
85 | $(REST_DIR) \ | ||
84 | peerinfo \ | 86 | peerinfo \ |
85 | $(SQLITE_DIR) \ | 87 | $(SQLITE_DIR) \ |
86 | $(MYSQL_DIR) \ | 88 | $(MYSQL_DIR) \ |
@@ -122,8 +124,6 @@ SUBDIRS = \ | |||
122 | pt \ | 124 | pt \ |
123 | secretsharing \ | 125 | secretsharing \ |
124 | $(EXP_DIR) \ | 126 | $(EXP_DIR) \ |
125 | $(JSON_DIR) \ | ||
126 | $(REST_DIR) \ | ||
127 | integration-tests | 127 | integration-tests |
128 | 128 | ||
129 | endif | 129 | 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 | |||
20 | endif | 20 | endif |
21 | 21 | ||
22 | lib_LTLIBRARIES = \ | 22 | lib_LTLIBRARIES = \ |
23 | libgnunetrest.la | 23 | libgnunetrest.la |
24 | 24 | ||
25 | libexec_PROGRAMS = \ | 25 | libexec_PROGRAMS = \ |
26 | gnunet-rest-server | 26 | gnunet-rest-server |
27 | 27 | ||
28 | plugin_LTLIBRARIES = libgnunet_plugin_rest_copying.la | ||
29 | |||
28 | EXTRA_DIST = \ | 30 | EXTRA_DIST = \ |
29 | rest.conf | 31 | rest.conf |
30 | 32 | ||
33 | libgnunet_plugin_rest_copying_la_SOURCES = \ | ||
34 | plugin_rest_copying.c | ||
35 | libgnunet_plugin_rest_copying_la_LIBADD = \ | ||
36 | libgnunetrest.la \ | ||
37 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | ||
38 | $(LTLIBINTL) -lmicrohttpd | ||
39 | libgnunet_plugin_rest_copying_la_LDFLAGS = \ | ||
40 | $(GN_PLUGIN_LDFLAGS) | ||
41 | |||
42 | |||
43 | |||
31 | gnunet_rest_server_SOURCES = \ | 44 | gnunet_rest_server_SOURCES = \ |
32 | gnunet-rest-server.c | 45 | gnunet-rest-server.c |
33 | 46 | ||
diff --git a/src/util/plugin_rest_copying.c b/src/rest/plugin_rest_copying.c index 92c2c6601..92c2c6601 100644 --- a/src/util/plugin_rest_copying.c +++ b/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 | |||
45 | PTHREAD = -lpthread | 45 | PTHREAD = -lpthread |
46 | endif | 46 | endif |
47 | 47 | ||
48 | if HAVE_MHD | ||
49 | if HAVE_JSON | ||
50 | REST_PLUGIN = libgnunet_plugin_rest_copying.la | ||
51 | endif | ||
52 | endif | ||
53 | |||
54 | |||
55 | libgnunet_plugin_rest_copying_la_SOURCES = \ | ||
56 | plugin_rest_copying.c | ||
57 | libgnunet_plugin_rest_copying_la_LIBADD = \ | ||
58 | $(top_builddir)/src/rest/libgnunetrest.la \ | ||
59 | libgnunetutil.la $(XLIBS) \ | ||
60 | $(LTLIBINTL) -lmicrohttpd | ||
61 | libgnunet_plugin_rest_copying_la_LDFLAGS = \ | ||
62 | $(GN_PLUGIN_LDFLAGS) | ||
63 | |||
64 | |||
65 | w32cat_SOURCES = w32cat.c | 48 | w32cat_SOURCES = w32cat.c |
66 | 49 | ||
67 | gnunet_helper_w32_console_SOURCES = \ | 50 | gnunet_helper_w32_console_SOURCES = \ |
@@ -308,8 +291,7 @@ gnunet_uri_LDADD = \ | |||
308 | $(GN_LIBINTL) | 291 | $(GN_LIBINTL) |
309 | 292 | ||
310 | plugin_LTLIBRARIES = \ | 293 | plugin_LTLIBRARIES = \ |
311 | libgnunet_plugin_test.la \ | 294 | libgnunet_plugin_test.la |
312 | $(REST_PLUGIN) | ||
313 | 295 | ||
314 | libgnunet_plugin_test_la_SOURCES = \ | 296 | libgnunet_plugin_test_la_SOURCES = \ |
315 | test_plugin_plug.c | 297 | test_plugin_plug.c |