Merge branch 'master' of ssh://gnunet.org/gnunet

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

diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am
index 5845474f3d1dac4010fa17cc5890ca652a47aa2d..82755b48573fd7e9d97e4b0a430b1b8c64007ddb 100644 (file)
--- a/src/revocation/Makefile.am
+++ b/src/revocation/Makefile.am
@@ -1,5 +1,8 @@
+# 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
 endif
@@ -20,6 +23,20 @@ bin_PROGRAMS = \
  gnunet-revocation
 
 
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_block_revocation.la
+
+libgnunet_plugin_block_revocation_la_SOURCES = \
+  plugin_block_revocation.c
+libgnunet_plugin_block_revocation_la_LIBADD = \
+  libgnunetrevocation.la \
+  $(top_builddir)/src/block/libgnunetblockgroup.la \
+  $(top_builddir)/src/util/libgnunetutil.la  \
+  $(LTLIBINTL)
+libgnunet_plugin_block_revocation_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
 gnunet_revocation_SOURCES = \
  gnunet-revocation.c
 gnunet_revocation_LDADD = \
@@ -34,6 +51,7 @@ libgnunetrevocation_la_SOURCES = \
   revocation_api.c revocation.h
 libgnunetrevocation_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(LIBGCRYPT_LIBS) \
   $(GN_LIBINTL) $(XLIB) -lgcrypt
 libgnunetrevocation_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
@@ -46,36 +64,41 @@ libexec_PROGRAMS = \
 gnunet_service_revocation_SOURCES = \
  gnunet-service-revocation.c
 gnunet_service_revocation_LDADD = \
-  $(top_builddir)/src/revocation/libgnunetrevocation.la \
+  libgnunetrevocation.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/set/libgnunetset.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   -lm \
   $(GN_LIBINTL)
-gnunet_service_revocation_DEPENDENCIES = \
-  libgnunetrevocation.la
 
 test_revocation_SOURCES = \
  test_revocation.c
 test_revocation_LDADD = \
  $(top_builddir)/src/identity/libgnunetidentity.la \
- $(top_builddir)/src/revocation/libgnunetrevocation.la \
+ libgnunetrevocation.la \
+ $(top_builddir)/src//core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la
 
 check_PROGRAMS = \
- test_revocation 
-
+ test_revocation
 
 check_SCRIPTS = \
-       test_local_revocation.sh
+  test_local_revocation.py
 
 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;
  TESTS = \
  $(check_SCRIPTS) \
  $(check_PROGRAMS)
 endif
 
-EXTRA_DIST = test_revocation.conf
+do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
+
+test_local_revocation.py: test_local_revocation.py.in Makefile
+       $(do_subst) < $(srcdir)/test_local_revocation.py.in > test_local_revocation.py
+       chmod +x test_local_revocation.py
 
+EXTRA_DIST = test_revocation.conf \
+       test_local_revocation.py.in