Merge remote-tracking branch 'origin/master' into identity_abe

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

diff --git a/src/credential/Makefile.am b/src/credential/Makefile.am
index 6469895e37117e85a057f5fb784b587e1791d433..ca11c5e4facd294ecec3bc695f26927cbdf20eda 100644 (file)
--- a/src/credential/Makefile.am
+++ b/src/credential/Makefile.am
@@ -4,16 +4,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include
 EXTRA_DIST = \
   test_credential_defaults.conf \
   test_credential_lookup.conf
-#  test_gns_nick_shorten.conf \
-####  test_gns_proxy.conf \
-#  test_gns_simple_lookup.conf \
-#  gns-helper-service-w32.conf \
-#  w32nsp.def \
-#  gnunet-gns-proxy-setup-ca \
-#  zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey \
-#  zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey \
-#  zonefiles/test_zonekey \
-#  $(check_SCRIPTS)
 
 
 if USE_COVERAGE
@@ -45,11 +35,11 @@ plugin_LTLIBRARIES = \
   libgnunet_plugin_gnsrecord_credential.la
 
 
-#if HAVE_MHD
-#if HAVE_JSON
-#plugin_LTLIBRARIES += libgnunet_plugin_rest_gns.la
-#endif
-#endif
+if HAVE_MHD
+if HAVE_JSON
+plugin_LTLIBRARIES += libgnunet_plugin_rest_credential.la
+endif
+endif
 
 
 gnunet_credential_SOURCES = \
@@ -57,6 +47,7 @@ gnunet_credential_SOURCES = \
 gnunet_credential_LDADD = \
   libgnunetcredential.la \
   $(top_builddir)/src/util/libgnunetutil.la \
+       $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(GN_LIBINTL)
 
@@ -64,6 +55,7 @@ gnunet_credential_LDADD = \
 libgnunet_plugin_gnsrecord_credential_la_SOURCES = \
   plugin_gnsrecord_credential.c
 libgnunet_plugin_gnsrecord_credential_la_LIBADD = \
+       libgnunetcredential.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(LTLIBINTL)
 libgnunet_plugin_gnsrecord_credential_la_LDFLAGS = \
@@ -72,38 +64,45 @@ libgnunet_plugin_gnsrecord_credential_la_LDFLAGS = \
 
 
 gnunet_service_credential_SOURCES = \
- gnunet-service-credential.c 
+ gnunet-service-credential.c
 gnunet_service_credential_LDADD = \
+       libgnunetcredential.la \
   $(top_builddir)/src/util/libgnunetutil.la \
        $(top_builddir)/src/gns/libgnunetgns.la \
+       $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(GN_LIBINTL)
 
 
 libgnunetcredential_la_SOURCES = \
- credential_api.c credential.h
+ credential_api.c \
+ credential_serialization.c \
+ credential_misc.c
 libgnunetcredential_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la $(XLIB) 
 libgnunetcredential_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
 
-#libgnunet_plugin_rest_gns_la_SOURCES = \
-#  plugin_rest_gns.c
-#libgnunet_plugin_rest_gns_la_LIBADD = \
-#  libgnunetgns.la \
-#      $(top_builddir)/src/rest/libgnunetrest.la \
-#  $(top_builddir)/src/identity/libgnunetidentity.la \
-#      $(top_builddir)/src/jsonapi/libgnunetjsonapi.la \
-#  $(top_builddir)/src/jsonapi/libgnunetjsonapiutils.la \
-#  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
-#  $(LTLIBINTL) -ljansson -lmicrohttpd
-#libgnunet_plugin_rest_gns_la_LDFLAGS = \
-# $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_rest_credential_la_SOURCES = \
+  plugin_rest_credential.c
+libgnunet_plugin_rest_credential_la_LIBADD = \
+  libgnunetcredential.la \
+       $(top_builddir)/src/rest/libgnunetrest.la \
+       $(top_builddir)/src/identity/libgnunetidentity.la \
+       $(top_builddir)/src/jsonapi/libgnunetjsonapi.la \
+  $(top_builddir)/src/jsonapi/libgnunetjsonapiutils.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -ljansson -lmicrohttpd
+libgnunet_plugin_rest_credential_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
 
 
-#check_SCRIPTS = \
-  #test_gns_lookup.sh 
+check_SCRIPTS = \
+  test_credential_issue.sh \
+       test_credential_verify_simple.sh \
+       test_credential_verify.sh \
+       test_credential_verify_and.sh
 
 if ENABLE_TEST_RUN
 if HAVE_SQLITE