X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fregex%2FMakefile.am;h=43555cf722b5a7209c556cd62bcbd99482f77d6c;hb=d72d8e05401ace44b57432463f136bcfe55cee03;hp=dd02afa1975bf77f137e44ca6f0f5142732ab8b9;hpb=8a741e7ef0f3eefbcb8eb990b47df699132b3873;p=oweals%2Fgnunet.git

diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index dd02afa19..43555cf72 100644
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -1,3 +1,4 @@
+# This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
@@ -25,14 +26,12 @@ libexec_PROGRAMS = \
 gnunet_service_regex_SOURCES =  \
  gnunet-service-regex.c
 gnunet_service_regex_LDADD =  -lm \
- $(top_builddir)/src/regex/libgnunetregex_internal.a \
- $(top_builddir)/src/regex/libgnunetregexblock.la \
+ libgnunetregex_internal.a \
+ libgnunetregexblock.la \
  $(top_builddir)/src/dht/libgnunetdht.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(GN_LIBINTL) 
-gnunet_service_regex_DEPENDENCIES = \
-  libgnunetregex_internal.a
+ $(GN_LIBINTL)
 
 noinst_LIBRARIES = \
   libgnunetregex_internal.a \
@@ -65,10 +64,10 @@ libgnunetregex_internal_a_DEPENDENCIES = \
 libgnunetregex_la_SOURCES = \
   regex_api.c regex_ipc.h
 libgnunetregex_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la
 libgnunetregex_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
-   -version-info 3:0:0
+   -version-info 3:1:0
 
 
 plugin_LTLIBRARIES = \
@@ -77,13 +76,11 @@ plugin_LTLIBRARIES = \
 libgnunet_plugin_block_regex_la_SOURCES = \
  plugin_block_regex.c
 libgnunet_plugin_block_regex_la_LIBADD = \
- $(top_builddir)/src/regex/libgnunetregexblock.la \
+ libgnunetregexblock.la \
  $(top_builddir)/src/block/libgnunetblock.la \
  $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_block_regex_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_block_regex_la_DEPENDENCIES = \
- libgnunetregexblock.la
 
 if HAVE_MYSQL
 noinst_mysql_progs = \
@@ -93,22 +90,18 @@ gnunet_regex_simulation_profiler_SOURCES = \
   gnunet-regex-simulation-profiler.c
 gnunet_regex_simulation_profiler_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  libgnunetregex_internal.a \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/mysql/libgnunetmysql.la
-gnunet_regex_simulation_profiler_DEPENDENCIES = \
-  libgnunetregex_internal.a
 endif
 
 libgnunetregextest_a_SOURCES = \
   regex_test_lib.c regex_test_lib.h \
   regex_test_graph.c \
-  regex_test_random.c 
+  regex_test_random.c
 libgnunetregextest_a_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/regex/libgnunetregex_internal.a
-libgnunetregextest_a_DEPENDENCIES = \
-  libgnunetregex_internal.a
+ libgnunetregex_internal.a
 
 if HAVE_TESTING
 noinst_PROGRAMS = $(noinst_mysql_progs) \
@@ -119,50 +112,36 @@ endif
 perf_regex_SOURCES = \
   perf-regex.c
 perf_regex_LDADD = -lm \
-  $(top_builddir)/src/regex/libgnunetregex_internal.a \
-  $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/regex/libgnunetregexblock.la \
-  $(top_builddir)/src/regex/libgnunetregextest.a \
-  $(top_builddir)/src/util/libgnunetutil.la 
-perf_regex_DEPENDENCIES = \
   libgnunetregex_internal.a \
-  libgnunetregextest.a
+  $(top_builddir)/src/dht/libgnunetdht.la \
+  libgnunetregexblock.la \
+  libgnunetregextest.a \
+  $(top_builddir)/src/util/libgnunetutil.la
 
 gnunet_regex_profiler_SOURCES = \
   gnunet-regex-profiler.c
 gnunet_regex_profiler_LDADD = -lm \
   $(top_builddir)/src/arm/libgnunetarm.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  libgnunetregex_internal.a \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/regex/libgnunetregexblock.la \
-  $(top_builddir)/src/regex/libgnunetregextest.a \
+  libgnunetregexblock.la \
+  libgnunetregextest.a \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
-gnunet_regex_profiler_DEPENDENCIES = \
-  $(top_builddir)/src/arm/libgnunetarm.la \
-  $(top_builddir)/src/dht/libgnunetdht.la \
-  libgnunetregex_internal.a \
-  libgnunetregextest.a
-
+  $(top_builddir)/src/util/libgnunetutil.la
 
 gnunet_daemon_regexprofiler_SOURCES = \
   gnunet-daemon-regexprofiler.c
 gnunet_daemon_regexprofiler_LDADD = -lm \
-  $(top_builddir)/src/regex/libgnunetregex_internal.a \
-  $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/regex/libgnunetregexblock.la \
-  $(top_builddir)/src/regex/libgnunetregextest.a \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
-gnunet_daemon_regexprofiler_DEPENDENCIES = \
+  libgnunetregex_internal.a \
   $(top_builddir)/src/dht/libgnunetdht.la \
+  libgnunetregexblock.la \
   libgnunetregextest.a \
-  libgnunetregex_internal.a
-
-
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la
 
 check_PROGRAMS = \
+  test_regex_integration \
   test_regex_eval_api \
   test_regex_iterate_api \
   test_regex_proofs \
@@ -170,50 +149,58 @@ check_PROGRAMS = \
   test_regex_api
 
 if ENABLE_TEST_RUN
- TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
  TESTS = $(check_PROGRAMS)
 endif
 
 test_regex_eval_api_SOURCES = \
   test_regex_eval_api.c
 test_regex_eval_api_LDADD = -lm \
-  $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  libgnunetregex_internal.a \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/regex/libgnunetregextest.a \
-  $(top_builddir)/src/regex/libgnunetregexblock.la \
+  libgnunetregextest.a \
+  libgnunetregexblock.la \
+  $(top_builddir)/src/util/libgnunetutil.la
+
+test_regex_integration_SOURCES = \
+  test_regex_integration.c
+test_regex_integration_LDADD = -lm \
+  libgnunetregex.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/tun/libgnunettun.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_regex_api_SOURCES = \
   test_regex_api.c
 test_regex_api_LDADD = -lm \
-  $(top_builddir)/src/regex/libgnunetregex.la \
+  libgnunetregex.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_regex_iterate_api_SOURCES = \
   test_regex_iterate_api.c
 test_regex_iterate_api_LDADD = -lm \
-  $(top_builddir)/src/regex/libgnunetregex_internal.a \
-  $(top_builddir)/src/regex/libgnunetregexblock.la \
+  libgnunetregex_internal.a \
+  libgnunetregexblock.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_regex_proofs_SOURCES = \
   test_regex_proofs.c
 test_regex_proofs_LDADD = -lm \
-  $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  libgnunetregex_internal.a \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/regex/libgnunetregextest.a \
-  $(top_builddir)/src/regex/libgnunetregexblock.la \
+  libgnunetregextest.a \
+  libgnunetregexblock.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_regex_graph_api_SOURCES = \
   test_regex_graph_api.c
 test_regex_graph_api_LDADD = -lm \
-  $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  libgnunetregex_internal.a \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/regex/libgnunetregextest.a \
-  $(top_builddir)/src/regex/libgnunetregexblock.la \
+  libgnunetregextest.a \
+  libgnunetregexblock.la \
   $(top_builddir)/src/util/libgnunetutil.la