continuing refactoring of regex library structure, disambiguating symbol names between old regex library which is now internal and the public API; moving IP-to-regex conversion functions to tun library, as only vpn is using those to begin with

1 files changed, 48 insertions, 56 deletions

diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index cbd66fa1d..6e6fd443a 100644
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -22,21 +22,24 @@ libexec_PROGRAMS = \
 
 gnunet_service_regex_SOURCES =  \
  gnunet-service-regex.c
-gnunet_service_regex_LDADD =  \
- $(top_builddir)/src/regex/libgnunetregex.la \
+gnunet_service_regex_LDADD =  -lm \
+ $(top_builddir)/src/regex/libgnunetregex_internal.a \
+ $(top_builddir)/src/regex/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
+  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 \
+  libgnunetregextest.a
 
 lib_LTLIBRARIES = \
   libgnunetregexblock.la \
-  libgnunetregex.la \
   libgnunetregexnew.la
 
 
@@ -50,20 +53,13 @@ libgnunetregexblock_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 1:0:0
 
-libgnunetregex_la_SOURCES = \
+
+libgnunetregex_internal_a_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_DEPENDENCIES = \
   libgnunetregexblock.la
-libgnunetregex_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS) \
-   -version-info 2:0:1
 
 
 libgnunetregexnew_la_SOURCES = \
@@ -75,8 +71,6 @@ libgnunetregexnew_la_LDFLAGS = \
    -version-info 3:0:0
 
 
-plugindir = $(libdir)/gnunet
-
 plugin_LTLIBRARIES = \
  libgnunet_plugin_block_regex.la
 
@@ -99,21 +93,19 @@ 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 \
+  $(top_builddir)/src/regex/libgnunetregex_internal.a \
   $(top_builddir)/src/mysql/libgnunetmysql.la
 gnunet_regex_simulation_profiler_DEPENDENCIES = \
-  libgnunetregex.la
+  libgnunetregex_internal.a
 endif
 
-noinst_LTLIBRARIES = libgnunetregextest.la
-
-libgnunetregextest_la_SOURCES = \
+libgnunetregextest_a_SOURCES = \
   regex_test_lib.c regex_test_lib.h
-libgnunetregextest_la_LIBADD = \
+libgnunetregextest_a_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/regex/libgnunetregex.la
-libgnunetregextest_la_DEPENDENCIES = \
-  libgnunetregex.la
+ $(top_builddir)/src/regex/libgnunetregex_internal.a
+libgnunetregextest_a_DEPENDENCIES = \
+  libgnunetregex_internal.a
 
 
 noinst_PROGRAMS = $(noinst_mysql_progs) \
@@ -123,43 +115,46 @@ noinst_PROGRAMS = $(noinst_mysql_progs) \
 
 perf_regex_SOURCES = \
   perf-regex.c
-perf_regex_LDADD = \
+perf_regex_LDADD = -lm \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/regex/libgnunetregex.la \
-  $(top_builddir)/src/regex/libgnunetregextest.la
+  $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  $(top_builddir)/src/regex/libgnunetregexblock.la \
+  $(top_builddir)/src/regex/libgnunetregextest.a
 perf_regex_DEPENDENCIES = \
-  libgnunetregex.la \
-  libgnunetregextest.la
+  libgnunetregex_internal.a \
+  libgnunetregextest.a
 
 gnunet_regex_profiler_SOURCES = \
   gnunet-regex-profiler.c
-gnunet_regex_profiler_LDADD = \
+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.la \
-  $(top_builddir)/src/regex/libgnunetregextest.la \
+  $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  $(top_builddir)/src/regex/libgnunetregexblock.la \
+  $(top_builddir)/src/regex/libgnunetregextest.a \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 gnunet_regex_profiler_DEPENDENCIES = \
   $(top_builddir)/src/arm/libgnunetarm.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  libgnunetregex.la \
-  libgnunetregextest.la
+  libgnunetregex_internal.a \
+  libgnunetregextest.a
 
 
 gnunet_daemon_regexprofiler_SOURCES = \
   gnunet-daemon-regexprofiler.c
-gnunet_daemon_regexprofiler_LDADD = \
+gnunet_daemon_regexprofiler_LDADD = -lm \
   $(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/regex/libgnunetregex_internal.a \
+  $(top_builddir)/src/regex/libgnunetregexblock.la \
+  $(top_builddir)/src/regex/libgnunetregextest.a \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 gnunet_daemon_regexprofiler_DEPENDENCIES = \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  libgnunetregextest.la \
-  libgnunetregex.la
+  libgnunetregextest.a \
+  libgnunetregex_internal.a
 
 
 
@@ -167,8 +162,7 @@ check_PROGRAMS = \
   test_regex_eval_api \
   test_regex_iterate_api \
   test_regex_proofs \
-  test_regex_graph_api \
-  test_regex_iptoregex
+  test_regex_graph_api
 
 if ENABLE_TEST_RUN
  TESTS = $(check_PROGRAMS)
@@ -176,34 +170,32 @@ 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 \
+  $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  $(top_builddir)/src/regex/libgnunetregexblock.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 \
+  $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  $(top_builddir)/src/regex/libgnunetregexblock.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 \
+  $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  $(top_builddir)/src/regex/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 \
+  $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  $(top_builddir)/src/regex/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