From b0a03eeebfdedbb7b0070ef00514f321aafa49db Mon Sep 17 00:00:00 2001 From: Martin Schanzenbach Date: Mon, 14 Sep 2015 11:10:11 +0000 Subject: - revert plugin move. Add new identity-token --- src/identity/Makefile.am | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'src/identity/Makefile.am') diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am index 64bf94109..43dfbd7d7 100644 --- a/src/identity/Makefile.am +++ b/src/identity/Makefile.am @@ -20,8 +20,8 @@ pkgcfg_DATA = \ identity.conf lib_LTLIBRARIES = \ - libgnunetidentity.la -# libgnunet_plugin_gnsrecord_identity.la + libgnunetidentity.la \ + libgnunet_plugin_gnsrecord_identity.la libgnunetidentity_la_SOURCES = \ identity_api.c \ @@ -41,10 +41,10 @@ libexec_PROGRAMS = \ gnunet-service-identity if HAVE_REST -bin_PROGRAMS += \ - gnunet-identity-token +lib_LTLIBRARIES += libgnunet_plugin_rest_identity.la endif + gnunet_service_identity_SOURCES = \ gnunet-service-identity.c gnunet_service_identity_LDADD = \ @@ -61,6 +61,16 @@ libgnunet_plugin_gnsrecord_identity_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) +libgnunet_plugin_rest_identity_la_SOURCES = \ + plugin_rest_identity.c +libgnunet_plugin_rest_identity_la_LIBADD = \ + libgnunetidentity.la \ + $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ + $(LTLIBINTL) -ljansson -lmicrohttpd +libgnunet_plugin_rest_identity_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) + + gnunet_identity_SOURCES = \ gnunet-identity.c gnunet_identity_LDADD = \ @@ -69,13 +79,6 @@ gnunet_identity_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) -gnunet_identity_token_SOURCES = \ - check_token.c -gnunet_identity_token_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ - -ljansson -lmicrohttpd \ - $(GN_LIBINTL) - if HAVE_TESTING check_PROGRAMS = \ test_identity \ -- cgit v1.2.3