[GNUnet-SVN] [gnunet] branch master updated (76c6ccfdf -> e2a69125a)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from 76c6ccfdf we probably need this file in dist
     new 919bb8c92 move reclaim and gns back into subdirs
     new 235833535 move identity rest plugin
     new a649dcbd9 move namestore plugin
     new 60aff9e59 move peerinfo rest
     new 1053f49f4 move copying rest
     new 1057efede move rest tests
     new dbccb3756 move disfunc credential
     new 7834f57e9 move credential makefile defs
     new 253fc6b29 change makefile for rest
     new 9e434fbb5 add mhd ifdef
     new d060e299e fix bootstrap
     new 6914bcb23 move copying to rest
     new ac29dbb04 update changelog, make build
     new e2a69125a update gitignore

The 14 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ChangeLog                                          |   3 +
 configure.ac                                       |   1 -
 po/POTFILES.in                                     |  20 +--
 src/Makefile.am                                    |   8 +-
 src/credential/Makefile.am                         |  16 +++
 .../plugin_rest_credential.c                       |   0
 src/gns/Makefile.am                                |  24 +++-
 src/{rest-plugins => gns}/plugin_rest_gns.c        |   0
 src/{rest-plugins => gns}/test_plugin_rest_gns.sh  |   0
 src/identity/Makefile.am                           |  21 +++-
 .../plugin_rest_identity.c                         |   0
 .../test_plugin_rest_identity.sh                   |   0
 src/namestore/Makefile.am                          |  57 ++++++---
 .../plugin_rest_namestore.c                        |   0
 .../test_plugin_rest_namestore.sh                  |   0
 src/peerinfo/Makefile.am                           |  23 ++++
 .../plugin_rest_peerinfo.c                         |   0
 src/reclaim/.gitignore                             |   4 +-
 src/reclaim/Makefile.am                            |  46 ++++++-
 src/{rest-plugins => reclaim}/json_reclaim.c       |   0
 src/{rest-plugins => reclaim}/json_reclaim.h       |   0
 src/{rest-plugins => reclaim}/oidc_helper.c        |   0
 src/{rest-plugins => reclaim}/oidc_helper.h        |   0
 .../plugin_rest_openid_connect.c                   |   0
 .../plugin_rest_reclaim.c                          |   0
 src/rest-plugins/Makefile.am                       | 135 ---------------------
 src/rest/Makefile.am                               |  15 ++-
 src/{rest-plugins => rest}/plugin_rest_copying.c   |   0
 28 files changed, 200 insertions(+), 173 deletions(-)
 rename src/{rest-plugins => credential}/plugin_rest_credential.c (100%)
 rename src/{rest-plugins => gns}/plugin_rest_gns.c (100%)
 rename src/{rest-plugins => gns}/test_plugin_rest_gns.sh (100%)
 rename src/{rest-plugins => identity}/plugin_rest_identity.c (100%)
 rename src/{rest-plugins => identity}/test_plugin_rest_identity.sh (100%)
 rename src/{rest-plugins => namestore}/plugin_rest_namestore.c (100%)
 rename src/{rest-plugins => namestore}/test_plugin_rest_namestore.sh (100%)
 rename src/{rest-plugins => peerinfo}/plugin_rest_peerinfo.c (100%)
 rename src/{rest-plugins => reclaim}/json_reclaim.c (100%)
 rename src/{rest-plugins => reclaim}/json_reclaim.h (100%)
 rename src/{rest-plugins => reclaim}/oidc_helper.c (100%)
 rename src/{rest-plugins => reclaim}/oidc_helper.h (100%)
 rename src/{rest-plugins => reclaim}/plugin_rest_openid_connect.c (100%)
 rename src/{rest-plugins => reclaim}/plugin_rest_reclaim.c (100%)
 delete mode 100644 src/rest-plugins/Makefile.am
 rename src/{rest-plugins => rest}/plugin_rest_copying.c (100%)

diff --git a/ChangeLog b/ChangeLog
index 125063ca5..0f08c1f31 100644
--- 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/configure.ac b/configure.ac
index e55ca6ffa..0abfb40b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1819,7 +1819,6 @@ src/vpn/vpn.conf
 src/zonemaster/Makefile
 src/zonemaster/zonemaster.conf
 src/rest/Makefile
-src/rest-plugins/Makefile
 src/abe/Makefile
 src/reclaim-attribute/Makefile
 src/reclaim/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 09e4c533d..a24368d64 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -92,6 +92,7 @@ src/credential/credential_serialization.c
 src/credential/gnunet-credential.c
 src/credential/gnunet-service-credential.c
 src/credential/plugin_gnsrecord_credential.c
+src/credential/plugin_rest_credential.c
 src/curl/curl.c
 src/curl/curl_reschedule.c
 src/datacache/datacache.c
@@ -187,6 +188,7 @@ src/gns/nss/nss_gns.c
 src/gns/nss/nss_gns_query.c
 src/gns/plugin_block_gns.c
 src/gns/plugin_gnsrecord_gns.c
+src/gns/plugin_rest_gns.c
 src/gns/w32nsp-install.c
 src/gns/w32nsp-resolve.c
 src/gns/w32nsp-uninstall.c
@@ -207,6 +209,7 @@ src/identity/gnunet-identity.c
 src/identity/gnunet-service-identity.c
 src/identity/identity_api.c
 src/identity/identity_api_lookup.c
+src/identity/plugin_rest_identity.c
 src/json/json.c
 src/json/json_generator.c
 src/json/json_gnsrecord.c
@@ -231,6 +234,7 @@ src/namestore/namestore_api_monitor.c
 src/namestore/plugin_namestore_heap.c
 src/namestore/plugin_namestore_postgres.c
 src/namestore/plugin_namestore_sqlite.c
+src/namestore/plugin_rest_namestore.c
 src/nat-auto/gnunet-nat-auto.c
 src/nat-auto/gnunet-nat-auto_legacy.c
 src/nat-auto/gnunet-nat-server.c
@@ -260,6 +264,7 @@ src/peerinfo-tool/gnunet-peerinfo_plugins.c
 src/peerinfo/gnunet-service-peerinfo.c
 src/peerinfo/peerinfo_api.c
 src/peerinfo/peerinfo_api_notify.c
+src/peerinfo/plugin_rest_peerinfo.c
 src/peerstore/gnunet-peerstore.c
 src/peerstore/gnunet-service-peerstore.c
 src/peerstore/peerstore_api.c
@@ -278,8 +283,12 @@ src/reclaim-attribute/plugin_reclaim_attribute_gnuid.c
 src/reclaim-attribute/reclaim_attribute.c
 src/reclaim/gnunet-reclaim.c
 src/reclaim/gnunet-service-reclaim.c
+src/reclaim/json_reclaim.c
+src/reclaim/oidc_helper.c
 src/reclaim/plugin_gnsrecord_reclaim.c
 src/reclaim/plugin_reclaim_sqlite.c
+src/reclaim/plugin_rest_openid_connect.c
+src/reclaim/plugin_rest_reclaim.c
 src/reclaim/reclaim_api.c
 src/regex/gnunet-daemon-regexprofiler.c
 src/regex/gnunet-regex-profiler.c
@@ -295,17 +304,8 @@ src/regex/regex_internal_dht.c
 src/regex/regex_test_graph.c
 src/regex/regex_test_lib.c
 src/regex/regex_test_random.c
-src/rest-plugins/json_reclaim.c
-src/rest-plugins/oidc_helper.c
-src/rest-plugins/plugin_rest_copying.c
-src/rest-plugins/plugin_rest_credential.c
-src/rest-plugins/plugin_rest_gns.c
-src/rest-plugins/plugin_rest_identity.c
-src/rest-plugins/plugin_rest_namestore.c
-src/rest-plugins/plugin_rest_openid_connect.c
-src/rest-plugins/plugin_rest_peerinfo.c
-src/rest-plugins/plugin_rest_reclaim.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
diff --git a/src/Makefile.am b/src/Makefile.am
index 03738e4ed..c1c708aa6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -60,7 +60,7 @@ endif
 
 if HAVE_MHD
 if HAVE_JSON
- REST_DIR = rest rest-plugins
+ REST_DIR = rest
 endif
 endif
 
@@ -81,6 +81,8 @@ SUBDIRS = \
   statistics \
   arm \
   $(TESTING) \
+  $(JSON_DIR) \
+  $(REST_DIR) \
   peerinfo \
   $(SQLITE_DIR) \
   $(MYSQL_DIR) \
@@ -121,9 +123,7 @@ SUBDIRS = \
   exit \
   pt \
   secretsharing \
-       $(EXP_DIR) \
-  $(JSON_DIR) \
-  $(REST_DIR) \
+  $(EXP_DIR) \
   integration-tests
 
 endif
diff --git a/src/credential/Makefile.am b/src/credential/Makefile.am
index b96e33b5c..aaac0d2c2 100644
--- a/src/credential/Makefile.am
+++ b/src/credential/Makefile.am
@@ -90,3 +90,19 @@ if HAVE_SQLITE
  TESTS = $(check_SCRIPTS)
 endif
 endif
+
+#libgnunet_plugin_rest_credential_la_SOURCES = \
+#  plugin_rest_credential.c
+#libgnunet_plugin_rest_credential_la_LIBADD = \
+#  $(top_builddir)/src/credential/libgnunetcredential.la \
+#      $(top_builddir)/src/rest/libgnunetrest.la \
+#      $(top_builddir)/src/identity/libgnunetidentity.la \
+#  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+#  $(LTLIBINTL) -ljansson -lmicrohttpd
+#libgnunet_plugin_rest_credential_la_LDFLAGS = \
+# $(GN_PLUGIN_LDFLAGS)
+
+
+
+
+
diff --git a/src/rest-plugins/plugin_rest_credential.c 
b/src/credential/plugin_rest_credential.c
similarity index 100%
rename from src/rest-plugins/plugin_rest_credential.c
rename to src/credential/plugin_rest_credential.c
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 434d50f34..6ebbbcaff 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -89,9 +89,16 @@ bin_PROGRAMS += gnunet-bcd
 endif
 endif
 
+if HAVE_MHD
+if HAVE_JSON
+REST_PLUGIN = libgnunet_plugin_rest_gns.la
+endif
+endif
+
 plugin_LTLIBRARIES = \
   libgnunet_plugin_block_gns.la \
-  libgnunet_plugin_gnsrecord_gns.la
+  libgnunet_plugin_gnsrecord_gns.la \
+  $(REST_PLUGIN)
 
 
 bin_SCRIPTS = \
@@ -104,6 +111,21 @@ gnunet-gns-proxy-setup-ca: gnunet-gns-proxy-setup-ca.in 
Makefile
        $(do_subst) < $(srcdir)/gnunet-gns-proxy-setup-ca.in > 
gnunet-gns-proxy-setup-ca
        chmod +x gnunet-gns-proxy-setup-ca
 
+
+libgnunet_plugin_rest_gns_la_SOURCES = \
+  plugin_rest_gns.c
+libgnunet_plugin_rest_gns_la_LIBADD = \
+  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
+  libgnunetgns.la \
+  $(top_builddir)/src/rest/libgnunetrest.la \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
+  $(top_builddir)/src/json/libgnunetjson.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -ljansson -lmicrohttpd
+libgnunet_plugin_rest_gns_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
 libgnunet_plugin_gnsrecord_gns_la_SOURCES = \
   plugin_gnsrecord_gns.c
 libgnunet_plugin_gnsrecord_gns_la_LIBADD = \
diff --git a/src/rest-plugins/plugin_rest_gns.c b/src/gns/plugin_rest_gns.c
similarity index 100%
rename from src/rest-plugins/plugin_rest_gns.c
rename to src/gns/plugin_rest_gns.c
diff --git a/src/rest-plugins/test_plugin_rest_gns.sh 
b/src/gns/test_plugin_rest_gns.sh
similarity index 100%
rename from src/rest-plugins/test_plugin_rest_gns.sh
rename to src/gns/test_plugin_rest_gns.sh
diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am
index 1f21fc65d..5c1af8e19 100644
--- a/src/identity/Makefile.am
+++ b/src/identity/Makefile.am
@@ -12,6 +12,12 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+if HAVE_MHD
+if HAVE_JSON
+REST_PLUGIN = libgnunet_plugin_rest_identity.la
+endif
+endif
+
 pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
@@ -20,7 +26,20 @@ pkgcfg_DATA = \
   identity.conf
 
 lib_LTLIBRARIES = \
-       libgnunetidentity.la
+  libgnunetidentity.la \
+  $(REST_PLUGIN)
+
+
+libgnunet_plugin_rest_identity_la_SOURCES = \
+  plugin_rest_identity.c
+libgnunet_plugin_rest_identity_la_LIBADD = \
+  libgnunetidentity.la \
+  $(top_builddir)/src/rest/libgnunetrest.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -ljansson -lmicrohttpd
+libgnunet_plugin_rest_identity_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
 
 libgnunetidentity_la_SOURCES = \
   identity_api.c \
diff --git a/src/rest-plugins/plugin_rest_identity.c 
b/src/identity/plugin_rest_identity.c
similarity index 100%
rename from src/rest-plugins/plugin_rest_identity.c
rename to src/identity/plugin_rest_identity.c
diff --git a/src/rest-plugins/test_plugin_rest_identity.sh 
b/src/identity/test_plugin_rest_identity.sh
similarity index 100%
rename from src/rest-plugins/test_plugin_rest_identity.sh
rename to src/identity/test_plugin_rest_identity.sh
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index ac4eebd06..25941b4fb 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -104,10 +104,50 @@ TESTS = \
   $(check_SCRIPTS)
 endif
 
+if HAVE_MHD
+if HAVE_JSON
+REST_PLUGIN = libgnunet_plugin_rest_namestore.la
+endif
+endif
+
 lib_LTLIBRARIES = \
   libgnunetnamestore.la
 
 
+libexec_PROGRAMS = \
+ gnunet-service-namestore
+
+bin_PROGRAMS = \
+ gnunet-namestore \
+ gnunet-zoneimport
+
+if HAVE_MHD
+libexec_PROGRAMS += \
+ gnunet-namestore-fcfsd
+endif
+
+
+plugin_LTLIBRARIES = \
+  $(SQLITE_PLUGIN) \
+  $(POSTGRES_PLUGIN) \
+  $(HEAP_PLUGIN) \
+  $(REST_PLUGIN)
+
+
+libgnunet_plugin_rest_namestore_la_SOURCES = \
+  plugin_rest_namestore.c
+libgnunet_plugin_rest_namestore_la_LIBADD = \
+  libgnunetnamestore.la \
+  $(top_builddir)/src/rest/libgnunetrest.la \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
+  $(top_builddir)/src/json/libgnunetjson.la \
+  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -ljansson -lmicrohttpd
+libgnunet_plugin_rest_namestore_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
 libgnunetnamestore_la_SOURCES = \
   namestore_api.c \
   namestore_api_monitor.c \
@@ -121,17 +161,6 @@ libgnunetnamestore_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 0:1:0
 
-libexec_PROGRAMS = \
- gnunet-service-namestore
-
-bin_PROGRAMS = \
- gnunet-namestore \
- gnunet-zoneimport
-
-if HAVE_MHD
-libexec_PROGRAMS += \
- gnunet-namestore-fcfsd
-endif
 
 
 gnunet_zoneimport_SOURCES = \
@@ -176,12 +205,6 @@ gnunet_service_namestore_LDADD = \
   $(GN_LIBINTL)
 
 
-plugin_LTLIBRARIES = \
-  $(SQLITE_PLUGIN) \
-  $(POSTGRES_PLUGIN) \
-  $(HEAP_PLUGIN)
-
-
 
 libgnunet_plugin_namestore_heap_la_SOURCES = \
   plugin_namestore_heap.c
diff --git a/src/rest-plugins/plugin_rest_namestore.c 
b/src/namestore/plugin_rest_namestore.c
similarity index 100%
rename from src/rest-plugins/plugin_rest_namestore.c
rename to src/namestore/plugin_rest_namestore.c
diff --git a/src/rest-plugins/test_plugin_rest_namestore.sh 
b/src/namestore/test_plugin_rest_namestore.sh
similarity index 100%
rename from src/rest-plugins/test_plugin_rest_namestore.sh
rename to src/namestore/test_plugin_rest_namestore.sh
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index ef79d6720..3c710eb93 100644
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -5,6 +5,8 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
 
+plugindir = $(libdir)/gnunet
+
 pkgcfg_DATA = \
   peerinfo.conf
 
@@ -17,8 +19,29 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+if HAVE_MHD
+if HAVE_JSON
+REST_PLUGIN = libgnunet_plugin_rest_peerinfo.la
+endif
+endif
+
 lib_LTLIBRARIES = libgnunetpeerinfo.la
 
+plugin_LTLIBRARIES = $(REST_PLUGIN)
+
+libgnunet_plugin_rest_peerinfo_la_SOURCES = \
+  plugin_rest_peerinfo.c
+libgnunet_plugin_rest_peerinfo_la_LIBADD = \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  libgnunetpeerinfo.la \
+  $(top_builddir)/src/rest/libgnunetrest.la \
+  $(top_builddir)/src/json/libgnunetjson.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -ljansson -lmicrohttpd
+libgnunet_plugin_rest_peerinfo_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
 libgnunetpeerinfo_la_SOURCES = \
   peerinfo_api.c peerinfo.h \
   peerinfo_api_notify.c
diff --git a/src/rest-plugins/plugin_rest_peerinfo.c 
b/src/peerinfo/plugin_rest_peerinfo.c
similarity index 100%
rename from src/rest-plugins/plugin_rest_peerinfo.c
rename to src/peerinfo/plugin_rest_peerinfo.c
diff --git a/src/reclaim/.gitignore b/src/reclaim/.gitignore
index ef77fccdc..46472101b 100644
--- a/src/reclaim/.gitignore
+++ b/src/reclaim/.gitignore
@@ -1,2 +1,2 @@
-gnunet-service-identity-provider
-gnunet-identity-token
+gnunet-reclaim
+gnunet-service-reclaim
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
index f9942fa23..13918508e 100644
--- a/src/reclaim/Makefile.am
+++ b/src/reclaim/Makefile.am
@@ -16,6 +16,14 @@ if HAVE_SQLITE
 SQLITE_PLUGIN = libgnunet_plugin_reclaim_sqlite.la
 endif
 
+if HAVE_MHD
+if HAVE_JSON
+REST_PLUGIN = \
+  libgnunet_plugin_rest_openid_connect.la \
+  libgnunet_plugin_rest_reclaim.la
+endif
+endif
+
 EXTRA_DIST = \
   reclaim.conf \
   test_reclaim_defaults.conf \
@@ -33,7 +41,8 @@ lib_LTLIBRARIES = \
   libgnunetreclaim.la
 plugin_LTLIBRARIES = \
   libgnunet_plugin_gnsrecord_reclaim.la \
-       $(SQLITE_PLUGIN)
+  $(SQLITE_PLUGIN) \
+  $(REST_PLUGIN)
 
 bin_PROGRAMS = \
  gnunet-reclaim
@@ -41,6 +50,41 @@ bin_PROGRAMS = \
 libexec_PROGRAMS = \
  gnunet-service-reclaim
 
+libgnunet_plugin_rest_reclaim_la_SOURCES = \
+  plugin_rest_reclaim.c \
+  json_reclaim.h \
+  json_reclaim.c
+libgnunet_plugin_rest_reclaim_la_LIBADD = \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
+  libgnunetreclaim.la \
+  $(top_builddir)/src/json/libgnunetjson.la \
+  $(top_builddir)/src/rest/libgnunetrest.la \
+  $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -ljansson -lmicrohttpd
+libgnunet_plugin_rest_reclaim_la_LDFLAGS = \
+  $(GN_PLUGIN_LDFLAGS)
+
+
+libgnunet_plugin_rest_openid_connect_la_SOURCES = \
+  plugin_rest_openid_connect.c \
+  oidc_helper.h \
+  oidc_helper.c
+libgnunet_plugin_rest_openid_connect_la_LIBADD = \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
+  libgnunetreclaim.la \
+  $(top_builddir)/src/rest/libgnunetrest.la \
+  $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+$(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -ljansson -lmicrohttpd
+libgnunet_plugin_rest_openid_connect_la_LDFLAGS = \
+  $(GN_PLUGIN_LDFLAGS)
+
+
 libgnunet_plugin_gnsrecord_reclaim_la_SOURCES = \
   plugin_gnsrecord_reclaim.c
 libgnunet_plugin_gnsrecord_reclaim_la_LIBADD = \
diff --git a/src/rest-plugins/json_reclaim.c b/src/reclaim/json_reclaim.c
similarity index 100%
rename from src/rest-plugins/json_reclaim.c
rename to src/reclaim/json_reclaim.c
diff --git a/src/rest-plugins/json_reclaim.h b/src/reclaim/json_reclaim.h
similarity index 100%
rename from src/rest-plugins/json_reclaim.h
rename to src/reclaim/json_reclaim.h
diff --git a/src/rest-plugins/oidc_helper.c b/src/reclaim/oidc_helper.c
similarity index 100%
rename from src/rest-plugins/oidc_helper.c
rename to src/reclaim/oidc_helper.c
diff --git a/src/rest-plugins/oidc_helper.h b/src/reclaim/oidc_helper.h
similarity index 100%
rename from src/rest-plugins/oidc_helper.h
rename to src/reclaim/oidc_helper.h
diff --git a/src/rest-plugins/plugin_rest_openid_connect.c 
b/src/reclaim/plugin_rest_openid_connect.c
similarity index 100%
rename from src/rest-plugins/plugin_rest_openid_connect.c
rename to src/reclaim/plugin_rest_openid_connect.c
diff --git a/src/rest-plugins/plugin_rest_reclaim.c 
b/src/reclaim/plugin_rest_reclaim.c
similarity index 100%
rename from src/rest-plugins/plugin_rest_reclaim.c
rename to src/reclaim/plugin_rest_reclaim.c
diff --git a/src/rest-plugins/Makefile.am b/src/rest-plugins/Makefile.am
deleted file mode 100644
index 006c23101..000000000
--- a/src/rest-plugins/Makefile.am
+++ /dev/null
@@ -1,135 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-
-if MINGW
-  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
-endif
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIBS = -lgcov
-endif
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_rest_copying.la \
-       libgnunet_plugin_rest_peerinfo.la \
-       libgnunet_plugin_rest_identity.la \
-       libgnunet_plugin_rest_namestore.la \
-  libgnunet_plugin_rest_gns.la 
-if HAVE_ABE
-plugin_LTLIBRARIES += libgnunet_plugin_rest_openid_connect.la \
-                                                                               
        libgnunet_plugin_rest_reclaim.la
-endif
-
-libgnunet_plugin_rest_reclaim_la_SOURCES = \
-  plugin_rest_reclaim.c \
-       json_reclaim.h \
-       json_reclaim.c
-libgnunet_plugin_rest_reclaim_la_LIBADD = \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/reclaim/libgnunetreclaim.la \
-       $(top_builddir)/src/json/libgnunetjson.la \
-  $(top_builddir)/src/rest/libgnunetrest.la \
-  $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson -lmicrohttpd
-libgnunet_plugin_rest_reclaim_la_LDFLAGS = \
- i$(GN_PLUGIN_LDFLAGS)
-
-
-#libgnunet_plugin_rest_credential_la_SOURCES = \
-#  plugin_rest_credential.c
-#libgnunet_plugin_rest_credential_la_LIBADD = \
-#  $(top_builddir)/src/credential/libgnunetcredential.la \
-#      $(top_builddir)/src/rest/libgnunetrest.la \
-#      $(top_builddir)/src/identity/libgnunetidentity.la \
-#  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
-#  $(LTLIBINTL) -ljansson -lmicrohttpd
-#libgnunet_plugin_rest_credential_la_LDFLAGS = \
-# $(GN_PLUGIN_LDFLAGS)
-
-libgnunet_plugin_rest_copying_la_SOURCES = \
-  plugin_rest_copying.c
-libgnunet_plugin_rest_copying_la_LIBADD = \
-       $(top_builddir)/src/rest/libgnunetrest.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -lmicrohttpd
-libgnunet_plugin_rest_copying_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-libgnunet_plugin_rest_peerinfo_la_SOURCES = \
-  plugin_rest_peerinfo.c
-libgnunet_plugin_rest_peerinfo_la_LIBADD = \
-  $(top_builddir)/src/hello/libgnunethello.la \
-       $(top_builddir)/src/peerinfo/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 = \
- $(GN_PLUGIN_LDFLAGS)
-
-libgnunet_plugin_rest_identity_la_SOURCES = \
-  plugin_rest_identity.c
-libgnunet_plugin_rest_identity_la_LIBADD = \
-       $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/rest/libgnunetrest.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson -lmicrohttpd
-libgnunet_plugin_rest_identity_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-
-libgnunet_plugin_rest_namestore_la_SOURCES = \
-  plugin_rest_namestore.c
-libgnunet_plugin_rest_namestore_la_LIBADD = \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/rest/libgnunetrest.la \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/json/libgnunetjson.la \
-  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson -lmicrohttpd
-libgnunet_plugin_rest_namestore_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-libgnunet_plugin_rest_gns_la_SOURCES = \
-  plugin_rest_gns.c
-libgnunet_plugin_rest_gns_la_LIBADD = \
-  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-       $(top_builddir)/src/rest/libgnunetrest.la \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/json/libgnunetjson.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson -lmicrohttpd
-libgnunet_plugin_rest_gns_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-libgnunet_plugin_rest_openid_connect_la_SOURCES = \
-  plugin_rest_openid_connect.c \
-       oidc_helper.h \
-       oidc_helper.c
-libgnunet_plugin_rest_openid_connect_la_LIBADD = \
-       $(top_builddir)/src/identity/libgnunetidentity.la \
-       $(top_builddir)/src/reclaim/libgnunetreclaim.la \
-       $(top_builddir)/src/rest/libgnunetrest.la \
-       $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
-       $(top_builddir)/src/namestore/libgnunetnamestore.la \
-$(top_builddir)/src/gns/libgnunetgns.la \
-       $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson -lmicrohttpd
-libgnunet_plugin_rest_openid_connect_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
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/rest-plugins/plugin_rest_copying.c 
b/src/rest/plugin_rest_copying.c
similarity index 100%
rename from src/rest-plugins/plugin_rest_copying.c
rename to src/rest/plugin_rest_copying.c

-- 
To stop receiving notification emails like this one, please contact
address@hidden