global reindent, now with uncrustify hook enabled

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

diff --git a/src/credential/Makefile.am b/src/credential/Makefile.am
index 13da9dc0f59c2b3e835fdbfc561bb155921e4905..bc6c49deb6756a4cd9a8a5939e88f014f41b2e08 100644 (file)
--- a/src/credential/Makefile.am
+++ b/src/credential/Makefile.am
@@ -24,9 +24,9 @@ pkgcfg_DATA = \
 lib_LTLIBRARIES = \
   libgnunetcredential.la
 
-# /usr/lib/gnunet/libexec - Business logic . Separate process 
+# /usr/lib/gnunet/libexec - Business logic . Separate process
 libexec_PROGRAMS = \
-  gnunet-service-credential 
+  gnunet-service-credential
 
 bin_PROGRAMS = \
   gnunet-credential
@@ -35,13 +35,6 @@ plugin_LTLIBRARIES = \
   libgnunet_plugin_gnsrecord_credential.la
 
 
-if HAVE_MHD
-if HAVE_JSON
-plugin_LTLIBRARIES += libgnunet_plugin_rest_credential.la
-endif
-endif
-
-
 gnunet_credential_SOURCES = \
  gnunet-credential.c
 gnunet_credential_LDADD = \
@@ -55,6 +48,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 = \
@@ -63,39 +57,34 @@ 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.h \
+ credential_serialization.c \
+ credential_serialization.h \
+ credential_misc.c \
+ credential_misc.h
 libgnunetcredential_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la $(XLIB) 
+ $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
 libgnunetcredential_la_LDFLAGS = \
   $(GN_LIB_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/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_credential_issue.sh \
        test_credential_verify_simple.sh \
-       test_credential_verify.sh
+       test_credential_verify.sh \
+       test_credential_verify_and.sh
 
 if ENABLE_TEST_RUN
 if HAVE_SQLITE
@@ -103,3 +92,20 @@ if HAVE_SQLITE
  TESTS = $(check_SCRIPTS)
 endif
 endif
+
+#libgnunet_plugin_rest_credential_la_SOURCES = \
+#  plugin_rest_credential.c
+#libgnunet_plugin_rest_credential_la_LIBADD = \
+#  $(top_builddir)/src/credential/libgnunetcredential.la \
+#      $(top_builddir)/src/rest/libgnunetrest.la \
+#      $(top_builddir)/src/identity/libgnunetidentity.la \
+#  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+#  $(LTLIBINTL) -ljansson $(MHD_LIBS)
+#libgnunet_plugin_rest_credential_la_LDFLAGS = \
+# $(GN_PLUGIN_LDFLAGS)
+#libgnunet_plugin_rest_credential_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
+
+
+
+
+