NULL pointer fix

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

diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
index 09344218188bf8df99812f36d32760ff0faf2aaf..6e504643778233b8edafd57227dfdc21f34c0c8d 100644 (file)
--- a/src/reclaim/Makefile.am
+++ b/src/reclaim/Makefile.am
@@ -12,14 +12,20 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
-if HAVE_SQLITE
-SQLITE_PLUGIN = libgnunet_plugin_reclaim_sqlite.la
+
+if HAVE_MHD
+if HAVE_JSON
+REST_PLUGIN = \
+  libgnunet_plugin_rest_openid_connect.la \
+  libgnunet_plugin_rest_reclaim.la
+endif
 endif
 
 EXTRA_DIST = \
+  reclaim.conf \
   test_reclaim_defaults.conf \
-       test_reclaim.conf \
-       $(check_SCRIPTS)
+  test_reclaim.conf \
+  $(check_SCRIPTS)
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
@@ -32,7 +38,7 @@ lib_LTLIBRARIES = \
   libgnunetreclaim.la
 plugin_LTLIBRARIES = \
   libgnunet_plugin_gnsrecord_reclaim.la \
-       $(SQLITE_PLUGIN)
+  $(REST_PLUGIN)
 
 bin_PROGRAMS = \
  gnunet-reclaim
@@ -40,6 +46,41 @@ bin_PROGRAMS = \
 libexec_PROGRAMS = \
  gnunet-service-reclaim
 
+libgnunet_plugin_rest_reclaim_la_SOURCES = \
+  plugin_rest_reclaim.c \
+  json_reclaim.h \
+  json_reclaim.c
+libgnunet_plugin_rest_reclaim_la_LIBADD = \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
+  libgnunetreclaim.la \
+  $(top_builddir)/src/json/libgnunetjson.la \
+  $(top_builddir)/src/rest/libgnunetrest.la \
+  $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -ljansson -lmicrohttpd
+libgnunet_plugin_rest_reclaim_la_LDFLAGS = \
+  $(GN_PLUGIN_LDFLAGS)
+
+
+libgnunet_plugin_rest_openid_connect_la_SOURCES = \
+  plugin_rest_openid_connect.c \
+  oidc_helper.h \
+  oidc_helper.c
+libgnunet_plugin_rest_openid_connect_la_LIBADD = \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
+  libgnunetreclaim.la \
+  $(top_builddir)/src/rest/libgnunetrest.la \
+  $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -ljansson -lmicrohttpd
+libgnunet_plugin_rest_openid_connect_la_LDFLAGS = \
+  $(GN_PLUGIN_LDFLAGS)
+
+
 libgnunet_plugin_gnsrecord_reclaim_la_SOURCES = \
   plugin_gnsrecord_reclaim.c
 libgnunet_plugin_gnsrecord_reclaim_la_LIBADD = \
@@ -48,29 +89,16 @@ libgnunet_plugin_gnsrecord_reclaim_la_LIBADD = \
 libgnunet_plugin_gnsrecord_reclaim_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
-libgnunet_plugin_reclaim_sqlite_la_SOURCES = \
-  plugin_reclaim_sqlite.c
-libgnunet_plugin_reclaim_sqlite_la_LIBADD = \
-  libgnunetreclaim.la  \
-  $(top_builddir)/src/sq/libgnunetsq.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
-  $(LTLIBINTL)
-libgnunet_plugin_reclaim_sqlite_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
 
 gnunet_service_reclaim_SOURCES = \
- gnunet-service-reclaim.c
+ gnunet-service-reclaim.c \
+ gnunet-service-reclaim_tickets.c \
+ gnunet-service-reclaim_tickets.h
 gnunet_service_reclaim_LDADD = \
  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/abe/libgnunetabe.la \
- $(top_builddir)/src/credential/libgnunetcredential.la \
  $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
  libgnunetreclaim.la \
  $(top_builddir)/src/gns/libgnunetgns.la \
@@ -81,26 +109,27 @@ libgnunetreclaim_la_SOURCES = \
  reclaim.h
 libgnunetreclaim_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-       $(GN_LIBINTL) $(XLIB)
+  $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
+  $(GN_LIBINTL) $(XLIB)
 libgnunetreclaim_la_LDFLAGS = \
-       $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
-       -version-info 0:0:0
+  $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
+  -version-info 0:0:0
 
 gnunet_reclaim_SOURCES = \
  gnunet-reclaim.c
 gnunet_reclaim_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-       $(top_builddir)/src/namestore/libgnunetnamestore.la \
-       libgnunetreclaim.la \
-       $(top_builddir)/src/identity/libgnunetidentity.la \
-       $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  libgnunetreclaim.la \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
+  $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
   $(GN_LIBINTL)
 
 check_SCRIPTS = \
-       test_reclaim_attribute.sh \
-       test_reclaim_issue.sh \
-       test_reclaim_consume.sh \
-  test_reclaim_revoke.sh
+  test_reclaim_attribute.sh \
+  test_reclaim_issue.sh \
+  test_reclaim_consume.sh
+#  test_reclaim_revoke.sh
 
 if ENABLE_TEST_RUN
  AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;