update changelog, make build

diff --git a/ChangeLog b/ChangeLog
index 125063ca5743d15603a476eb8050515f1d755206..0f08c1f314b8a9f15a4a0065115d24fd580c4240 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Tue Mar 12 10:06:17 CET 2019
+  REST: Move back from rest-plugin into respective subsystem directories.
+
 Mon Mar 11 02:47:55 CET 2019
   Make configure complain if no working libidn is detected. -CG
 

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 87a597c500d39238d7d0063922c757236da7ecbe..a24368d64606e747eda7e7ea2889b9120ffd2694 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -305,6 +305,7 @@ src/regex/regex_test_graph.c
 src/regex/regex_test_lib.c
 src/regex/regex_test_random.c
 src/rest/gnunet-rest-server.c
+src/rest/plugin_rest_copying.c
 src/rest/rest.c
 src/revocation/gnunet-revocation.c
 src/revocation/gnunet-service-revocation.c
@@ -497,7 +498,6 @@ src/util/os_network.c
 src/util/os_priority.c
 src/util/peer.c
 src/util/plugin.c
-src/util/plugin_rest_copying.c
 src/util/proc_compat.c
 src/util/program.c
 src/util/regex.c

diff --git a/src/Makefile.am b/src/Makefile.am
index 09dd81d194f5e35beb7fb809d5f419e61c679a91..c1c708aa6ecb02e4375cf37d45b84af0a7ef6420 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -123,7 +123,7 @@ SUBDIRS = \
   exit \
   pt \
   secretsharing \
-       $(EXP_DIR) \
+  $(EXP_DIR) \
   integration-tests
 
 endif

diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index 69424ffb9ce50e77f8f1c641eb6c87e40ad1bc3e..3c710eb934c273970a2853eca9135ada108c6c9f 100644 (file)
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -36,7 +36,6 @@ libgnunet_plugin_rest_peerinfo_la_LIBADD = \
   libgnunetpeerinfo.la \
   $(top_builddir)/src/rest/libgnunetrest.la \
   $(top_builddir)/src/json/libgnunetjson.la \
-  $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
   $(LTLIBINTL) -ljansson -lmicrohttpd
 libgnunet_plugin_rest_peerinfo_la_LDFLAGS = \