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

diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index cbd66fa1d..43555cf72 100644
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -1,4 +1,5 @@
-INCLUDES = -I$(top_srcdir)/src/include
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
@@ -18,26 +19,27 @@ pkgcfg_DATA = \
   regex.conf
 
 libexec_PROGRAMS = \
-  gnunet-service-regex
+  gnunet-service-regex \
+  gnunet-daemon-regexprofiler
+
 
 gnunet_service_regex_SOURCES =  \
  gnunet-service-regex.c
-gnunet_service_regex_LDADD =  \
- $(top_builddir)/src/regex/libgnunetregex.la \
+gnunet_service_regex_LDADD =  -lm \
+ 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.la
-# todo: link files from libgnunetregex statically into gnunet_service_regex,
-# rename API prefix to avoid collision with 'libgnunetregexnew'...
+ $(GN_LIBINTL)
 
+noinst_LIBRARIES = \
+  libgnunetregex_internal.a \
+  libgnunetregextest.a
 
 lib_LTLIBRARIES = \
   libgnunetregexblock.la \
-  libgnunetregex.la \
-  libgnunetregexnew.la
+  libgnunetregex.la
 
 
 libgnunetregexblock_la_SOURCES = \
@@ -50,46 +52,35 @@ libgnunetregexblock_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 1:0:0
 
-libgnunetregex_la_SOURCES = \
-  regex_internal.h regex.c \
-  regex_graph.c regex_random.c \
-  regex_dht.c
-libgnunetregex_la_LIBADD = -lm \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/regex/libgnunetregexblock.la
-libgnunetregex_la_DEPENDENCIES = \
+
+libgnunetregex_internal_a_SOURCES = \
+  regex_internal_lib.h \
+  regex_internal.h regex_internal.c \
+  regex_internal_dht.c
+libgnunetregex_internal_a_DEPENDENCIES = \
   libgnunetregexblock.la
-libgnunetregex_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS) \
-   -version-info 2:0:1
 
 
-libgnunetregexnew_la_SOURCES = \
+libgnunetregex_la_SOURCES = \
   regex_api.c regex_ipc.h
-libgnunetregexnew_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la 
-libgnunetregexnew_la_LDFLAGS = \
+libgnunetregex_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la
+libgnunetregex_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
-   -version-info 3:0:0
+   -version-info 3:1:0
 
 
-plugindir = $(libdir)/gnunet
-
 plugin_LTLIBRARIES = \
  libgnunet_plugin_block_regex.la
 
 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 = \
@@ -99,111 +90,120 @@ 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.la \
+  libgnunetregex_internal.a \
+  $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/mysql/libgnunetmysql.la
-gnunet_regex_simulation_profiler_DEPENDENCIES = \
-  libgnunetregex.la
 endif
 
-noinst_LTLIBRARIES = libgnunetregextest.la
-
-libgnunetregextest_la_SOURCES = \
-  regex_test_lib.c regex_test_lib.h
-libgnunetregextest_la_LIBADD = \
+libgnunetregextest_a_SOURCES = \
+  regex_test_lib.c regex_test_lib.h \
+  regex_test_graph.c \
+  regex_test_random.c
+libgnunetregextest_a_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/regex/libgnunetregex.la
-libgnunetregextest_la_DEPENDENCIES = \
-  libgnunetregex.la
-
+ libgnunetregex_internal.a
 
+if HAVE_TESTING
 noinst_PROGRAMS = $(noinst_mysql_progs) \
   perf-regex \
-  gnunet-regex-profiler \
-  gnunet-daemon-regexprofiler
+  gnunet-regex-profiler
+endif
 
 perf_regex_SOURCES = \
   perf-regex.c
-perf_regex_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/regex/libgnunetregex.la \
-  $(top_builddir)/src/regex/libgnunetregextest.la
-perf_regex_DEPENDENCIES = \
-  libgnunetregex.la \
-  libgnunetregextest.la
+perf_regex_LDADD = -lm \
+  libgnunetregex_internal.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 = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+gnunet_regex_profiler_LDADD = -lm \
   $(top_builddir)/src/arm/libgnunetarm.la \
-  $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/regex/libgnunetregex.la \
-  $(top_builddir)/src/regex/libgnunetregextest.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la
-gnunet_regex_profiler_DEPENDENCIES = \
-  $(top_builddir)/src/arm/libgnunetarm.la \
+  libgnunetregex_internal.a \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  libgnunetregex.la \
-  libgnunetregextest.la
-
+  libgnunetregexblock.la \
+  libgnunetregextest.a \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la
 
 gnunet_daemon_regexprofiler_SOURCES = \
   gnunet-daemon-regexprofiler.c
-gnunet_daemon_regexprofiler_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/regex/libgnunetregex.la \
-  $(top_builddir)/src/regex/libgnunetregextest.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la
-gnunet_daemon_regexprofiler_DEPENDENCIES = \
+gnunet_daemon_regexprofiler_LDADD = -lm \
+  libgnunetregex_internal.a \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  libgnunetregextest.la \
-  libgnunetregex.la
-
-
+  libgnunetregexblock.la \
+  libgnunetregextest.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 \
   test_regex_graph_api \
-  test_regex_iptoregex
+  test_regex_api
 
 if ENABLE_TEST_RUN
+ 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 = \
-  $(top_builddir)/src/regex/libgnunetregex.la \
+test_regex_eval_api_LDADD = -lm \
+  libgnunetregex_internal.a \
+  $(top_builddir)/src/dht/libgnunetdht.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 \
+  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 = \
-  $(top_builddir)/src/regex/libgnunetregex.la \
+test_regex_iterate_api_LDADD = -lm \
+  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 = \
-  $(top_builddir)/src/regex/libgnunetregex.la \
+test_regex_proofs_LDADD = -lm \
+  libgnunetregex_internal.a \
+  $(top_builddir)/src/dht/libgnunetdht.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 = \
-  $(top_builddir)/src/regex/libgnunetregex.la \
+test_regex_graph_api_LDADD = -lm \
+  libgnunetregex_internal.a \
+  $(top_builddir)/src/dht/libgnunetdht.la \
+  libgnunetregextest.a \
+  libgnunetregexblock.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
-test_regex_iptoregex_SOURCES = \
-  test_regex_iptoregex.c
-test_regex_iptoregex_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/regex/libgnunetregex.la
-
 
 EXTRA_DIST = \
-  regex_simulation_profiler_test.conf
+  regex_simulation_profiler_test.conf \
+  test_regex_api_data.conf