move copying to rest

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
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
   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