- move rest plugins into rest directory where they belong

1 files changed, 13 insertions, 32 deletions

diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am
index af4ad5821..f1f0c3851 100644
--- a/src/identity/Makefile.am
+++ b/src/identity/Makefile.am
@@ -19,39 +19,9 @@ libexecdir= $(pkglibdir)/libexec/
 pkgcfg_DATA = \
   identity.conf
 
-if HAVE_REST
-REST_PLUGIN = libgnunet_plugin_rest_identity.la
-plugin_LTLIBRARIES = ${REST_PLUGIN}
-endif
-
 lib_LTLIBRARIES = \
-        libgnunetidentity.la 
-
-if HAVE_REST
-plugin_LTLIBRARIES += \
-  libgnunet_plugin_gnsrecord_identity.la
-
-
-libgnunet_plugin_gnsrecord_identity_la_SOURCES = \
-  plugin_gnsrecord_identity.c
-libgnunet_plugin_gnsrecord_identity_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_gnsrecord_identity_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-endif
-
-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)
-
-
+        libgnunetidentity.la \
+        libgnunet_plugin_gnsrecord_identity.la
 
 libgnunetidentity_la_SOURCES = \
   identity_api.c \
@@ -69,10 +39,12 @@ bin_PROGRAMS = \
 
 libexec_PROGRAMS = \
  gnunet-service-identity 
+
 if HAVE_REST
 bin_PROGRAMS += \
                                                                 gnunet-identity-token
 endif
+
 gnunet_service_identity_SOURCES = \
  gnunet-service-identity.c         
 gnunet_service_identity_LDADD = \
@@ -80,6 +52,15 @@ gnunet_service_identity_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 
+libgnunet_plugin_gnsrecord_identity_la_SOURCES = \
+  plugin_gnsrecord_identity.c
+libgnunet_plugin_gnsrecord_identity_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunet_plugin_gnsrecord_identity_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
 gnunet_identity_SOURCES = \
  gnunet-identity.c         
 gnunet_identity_LDADD = \