diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2015-09-14 11:10:11 +0000 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2015-09-14 11:10:11 +0000 |
commit | b0a03eeebfdedbb7b0070ef00514f321aafa49db (patch) | |
tree | 06233b8dc0c1bf8ee580367e772c9951a3d7cee6 /src/identity/Makefile.am | |
parent | 134da182130592c78bdb5d348826825665a2ffab (diff) | |
download | gnunet-b0a03eeebfdedbb7b0070ef00514f321aafa49db.tar.gz gnunet-b0a03eeebfdedbb7b0070ef00514f321aafa49db.zip |
- revert plugin move. Add new identity-token
Diffstat (limited to 'src/identity/Makefile.am')
-rw-r--r-- | src/identity/Makefile.am | 25 |
1 files changed, 14 insertions, 11 deletions
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 = \ | |||
20 | identity.conf | 20 | identity.conf |
21 | 21 | ||
22 | lib_LTLIBRARIES = \ | 22 | lib_LTLIBRARIES = \ |
23 | libgnunetidentity.la | 23 | libgnunetidentity.la \ |
24 | # libgnunet_plugin_gnsrecord_identity.la | 24 | libgnunet_plugin_gnsrecord_identity.la |
25 | 25 | ||
26 | libgnunetidentity_la_SOURCES = \ | 26 | libgnunetidentity_la_SOURCES = \ |
27 | identity_api.c \ | 27 | identity_api.c \ |
@@ -41,10 +41,10 @@ libexec_PROGRAMS = \ | |||
41 | gnunet-service-identity | 41 | gnunet-service-identity |
42 | 42 | ||
43 | if HAVE_REST | 43 | if HAVE_REST |
44 | bin_PROGRAMS += \ | 44 | lib_LTLIBRARIES += libgnunet_plugin_rest_identity.la |
45 | gnunet-identity-token | ||
46 | endif | 45 | endif |
47 | 46 | ||
47 | |||
48 | gnunet_service_identity_SOURCES = \ | 48 | gnunet_service_identity_SOURCES = \ |
49 | gnunet-service-identity.c | 49 | gnunet-service-identity.c |
50 | gnunet_service_identity_LDADD = \ | 50 | gnunet_service_identity_LDADD = \ |
@@ -61,6 +61,16 @@ libgnunet_plugin_gnsrecord_identity_la_LDFLAGS = \ | |||
61 | $(GN_PLUGIN_LDFLAGS) | 61 | $(GN_PLUGIN_LDFLAGS) |
62 | 62 | ||
63 | 63 | ||
64 | libgnunet_plugin_rest_identity_la_SOURCES = \ | ||
65 | plugin_rest_identity.c | ||
66 | libgnunet_plugin_rest_identity_la_LIBADD = \ | ||
67 | libgnunetidentity.la \ | ||
68 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | ||
69 | $(LTLIBINTL) -ljansson -lmicrohttpd | ||
70 | libgnunet_plugin_rest_identity_la_LDFLAGS = \ | ||
71 | $(GN_PLUGIN_LDFLAGS) | ||
72 | |||
73 | |||
64 | gnunet_identity_SOURCES = \ | 74 | gnunet_identity_SOURCES = \ |
65 | gnunet-identity.c | 75 | gnunet-identity.c |
66 | gnunet_identity_LDADD = \ | 76 | gnunet_identity_LDADD = \ |
@@ -69,13 +79,6 @@ gnunet_identity_LDADD = \ | |||
69 | $(top_builddir)/src/util/libgnunetutil.la \ | 79 | $(top_builddir)/src/util/libgnunetutil.la \ |
70 | $(GN_LIBINTL) | 80 | $(GN_LIBINTL) |
71 | 81 | ||
72 | gnunet_identity_token_SOURCES = \ | ||
73 | check_token.c | ||
74 | gnunet_identity_token_LDADD = \ | ||
75 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
76 | -ljansson -lmicrohttpd \ | ||
77 | $(GN_LIBINTL) | ||
78 | |||
79 | if HAVE_TESTING | 82 | if HAVE_TESTING |
80 | check_PROGRAMS = \ | 83 | check_PROGRAMS = \ |
81 | test_identity \ | 84 | test_identity \ |