typo in src/identity/gnunet-identity.c

[oweals/gnunet.git] / src / identity / Makefile.am

diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am
index 7feebcb112934121fcfe46413c05eccde88942c6..9b28ac093ae77dfdcc2983d53047326ffd4ce087 100644 (file)
--- a/src/identity/Makefile.am
+++ b/src/identity/Makefile.am
@@ -1,4 +1,7 @@
-INCLUDES = -I$(top_srcdir)/src/include
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/gnunet
 
 if MINGW
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
@@ -16,19 +19,19 @@ libexecdir= $(pkglibdir)/libexec/
 pkgcfg_DATA = \
   identity.conf
 
-
-lib_LTLIBRARIES = libgnunetidentity.la
+lib_LTLIBRARIES = \
+       libgnunetidentity.la
 
 libgnunetidentity_la_SOURCES = \
-  identity_api.c identity.h
+  identity_api.c \
+  identity_api_lookup.c \
+  identity.h
 libgnunetidentity_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL) $(XLIB)
 libgnunetidentity_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
   -version-info 0:0:0
-libgnunetidentity_la_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la 
 
 bin_PROGRAMS = \
  gnunet-identity
@@ -36,15 +39,42 @@ bin_PROGRAMS = \
 libexec_PROGRAMS = \
  gnunet-service-identity 
 
+if HAVE_MHD
+if HAVE_JSON
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_rest_identity.la \
+  libgnunet_plugin_gnsrecord_identity.la
+endif
+endif
+
+
 gnunet_service_identity_SOURCES = \
  gnunet-service-identity.c         
 gnunet_service_identity_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_service_identity_DEPENDENCIES = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.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)
+
+
+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/jsonapi/libgnunetjsonapi.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         
@@ -53,11 +83,6 @@ gnunet_identity_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_service_identity_DEPENDENCIES = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  libgnunetidentity.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
-
 
 if HAVE_TESTING
 check_PROGRAMS = \
@@ -66,19 +91,17 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = $(check_PROGRAMS) 
 endif
 
+
 test_identity_SOURCES = \
  test_identity.c
 test_identity_LDADD = \
   libgnunetidentity.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la 
-test_identity_DEPENDENCIES = \
-  libgnunetidentity.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
 
 test_identity_defaults_SOURCES = \
  test_identity_defaults.c
@@ -86,10 +109,6 @@ test_identity_defaults_LDADD = \
   libgnunetidentity.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la 
-test_identity_defaults_DEPENDENCIES = \
-  libgnunetidentity.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
 
 EXTRA_DIST = \
   test_identity.conf