add nick name for cached records

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

diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index 6e6fd443a5dfdf0ce50237eb5ffe64f72ff348d0..8f9f9edb9491c6967cc9d4dda6328c20dce6688e 100644 (file)
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
@@ -18,7 +18,9 @@ pkgcfg_DATA = \
   regex.conf
 
 libexec_PROGRAMS = \
-  gnunet-service-regex
+  gnunet-service-regex \
+  gnunet-daemon-regexprofiler
+
 
 gnunet_service_regex_SOURCES =  \
  gnunet-service-regex.c
@@ -31,8 +33,6 @@ gnunet_service_regex_LDADD =  -lm \
  $(GN_LIBINTL) 
 gnunet_service_regex_DEPENDENCIES = \
   libgnunetregex_internal.a
-# todo: link files from libgnunetregex statically into gnunet_service_regex,
-# rename API prefix to avoid collision with 'libgnunetregexnew'...
 
 noinst_LIBRARIES = \
   libgnunetregex_internal.a \
@@ -40,7 +40,7 @@ noinst_LIBRARIES = \
 
 lib_LTLIBRARIES = \
   libgnunetregexblock.la \
-  libgnunetregexnew.la
+  libgnunetregex.la
 
 
 libgnunetregexblock_la_SOURCES = \
@@ -55,18 +55,18 @@ libgnunetregexblock_la_LDFLAGS = \
 
 
 libgnunetregex_internal_a_SOURCES = \
-  regex_internal.h regex.c \
-  regex_graph.c regex_random.c \
-  regex_dht.c
+  regex_internal_lib.h \
+  regex_internal.h regex_internal.c \
+  regex_internal_dht.c
 libgnunetregex_internal_a_DEPENDENCIES = \
   libgnunetregexblock.la
 
 
-libgnunetregexnew_la_SOURCES = \
+libgnunetregex_la_SOURCES = \
   regex_api.c regex_ipc.h
-libgnunetregexnew_la_LIBADD = \
+libgnunetregex_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
-libgnunetregexnew_la_LDFLAGS = \
+libgnunetregex_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
    -version-info 3:0:0
 
@@ -94,32 +94,36 @@ gnunet_regex_simulation_profiler_SOURCES = \
 gnunet_regex_simulation_profiler_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/regex/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_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_internal.a
 libgnunetregextest_a_DEPENDENCIES = \
   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 = -lm \
-  $(top_builddir)/src/util/libgnunetutil.la \
   $(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/regex/libgnunetregextest.a \
+  $(top_builddir)/src/util/libgnunetutil.la 
 perf_regex_DEPENDENCIES = \
   libgnunetregex_internal.a \
   libgnunetregextest.a
@@ -127,14 +131,14 @@ perf_regex_DEPENDENCIES = \
 gnunet_regex_profiler_SOURCES = \
   gnunet-regex-profiler.c
 gnunet_regex_profiler_LDADD = -lm \
-  $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/arm/libgnunetarm.la \
-  $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(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/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 \
@@ -145,12 +149,12 @@ gnunet_regex_profiler_DEPENDENCIES = \
 gnunet_daemon_regexprofiler_SOURCES = \
   gnunet-daemon-regexprofiler.c
 gnunet_daemon_regexprofiler_LDADD = -lm \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/dht/libgnunetdht.la \
   $(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/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
 gnunet_daemon_regexprofiler_DEPENDENCIES = \
   $(top_builddir)/src/dht/libgnunetdht.la \
   libgnunetregextest.a \
@@ -162,7 +166,8 @@ check_PROGRAMS = \
   test_regex_eval_api \
   test_regex_iterate_api \
   test_regex_proofs \
-  test_regex_graph_api
+  test_regex_graph_api \
+  test_regex_api
 
 if ENABLE_TEST_RUN
  TESTS = $(check_PROGRAMS)
@@ -172,20 +177,32 @@ test_regex_eval_api_SOURCES = \
   test_regex_eval_api.c
 test_regex_eval_api_LDADD = -lm \
   $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  $(top_builddir)/src/dht/libgnunetdht.la \
+  $(top_builddir)/src/regex/libgnunetregextest.a \
   $(top_builddir)/src/regex/libgnunetregexblock.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 \
+  $(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 \
+  $(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 \
+  $(top_builddir)/src/dht/libgnunetdht.la \
+  $(top_builddir)/src/regex/libgnunetregextest.a \
   $(top_builddir)/src/regex/libgnunetregexblock.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
@@ -193,9 +210,12 @@ test_regex_graph_api_SOURCES = \
   test_regex_graph_api.c
 test_regex_graph_api_LDADD = -lm \
   $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  $(top_builddir)/src/dht/libgnunetdht.la \
+  $(top_builddir)/src/regex/libgnunetregextest.a \
   $(top_builddir)/src/regex/libgnunetregexblock.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 
 EXTRA_DIST = \
-  regex_simulation_profiler_test.conf
+  regex_simulation_profiler_test.conf \
+  test_regex_api_data.conf