-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
if MINGW
WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
AM_CFLAGS = --coverage
endif
-lib_LTLIBRARIES = libgnunetregexblock.la \
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+pkgcfg_DATA = \
+ regex.conf
+
+libexec_PROGRAMS = \
+ gnunet-service-regex \
+ gnunet-daemon-regexprofiler
+
+
+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 \
+ $(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
+
+noinst_LIBRARIES = \
+ libgnunetregex_internal.a \
+ libgnunetregextest.a
+
+lib_LTLIBRARIES = \
+ libgnunetregexblock.la \
libgnunetregex.la
$(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_SOURCES = \
+ regex_api.c regex_ipc.h
+libgnunetregex_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
libgnunetregex_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
- -version-info 1:1:0
+ -version-info 3:0:0
-plugindir = $(libdir)/gnunet
-
plugin_LTLIBRARIES = \
libgnunet_plugin_block_regex.la
if HAVE_MYSQL
noinst_mysql_progs = \
-gnunet-regex-simulation-profiler
+ gnunet-regex-simulation-profiler
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/dht/libgnunetdht.la \
$(top_builddir)/src/mysql/libgnunetmysql.la
gnunet_regex_simulation_profiler_DEPENDENCIES = \
- libgnunetregex.la
+ libgnunetregex_internal.a
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
-
+ $(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 = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/regex/libgnunetregex.la \
- $(top_builddir)/src/regex/libgnunetregextest.la
+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.la \
- libgnunetregextest.la
+ libgnunetregex_internal.a \
+ libgnunetregextest.a
gnunet_regex_profiler_SOURCES = \
gnunet-regex-profiler.c
-gnunet_regex_profiler_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/dht/libgnunetdht.la \
+gnunet_regex_profiler_LDADD = -lm \
+ $(top_builddir)/src/arm/libgnunetarm.la \
$(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/regex/libgnunetregex.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.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/util/libgnunetutil.la
gnunet_regex_profiler_DEPENDENCIES = \
+ $(top_builddir)/src/arm/libgnunetarm.la \
$(top_builddir)/src/dht/libgnunetdht.la \
- libgnunetregex.la
+ libgnunetregex_internal.a \
+ libgnunetregextest.a
+
gnunet_daemon_regexprofiler_SOURCES = \
gnunet-daemon-regexprofiler.c
-gnunet_daemon_regexprofiler_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
+gnunet_daemon_regexprofiler_LDADD = -lm \
+ $(top_builddir)/src/regex/libgnunetregex_internal.a \
$(top_builddir)/src/dht/libgnunetdht.la \
- $(top_builddir)/src/regex/libgnunetregex.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.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 = \
$(top_builddir)/src/dht/libgnunetdht.la \
- libgnunetregex.la
+ libgnunetregextest.a \
+ libgnunetregex_internal.a
test_regex_iterate_api \
test_regex_proofs \
test_regex_graph_api \
- test_regex_iptoregex
+ test_regex_api
if ENABLE_TEST_RUN
TESTS = $(check_PROGRAMS)
test_regex_eval_api_SOURCES = \
test_regex_eval_api.c
-test_regex_eval_api_LDADD = \
+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 = \
- $(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/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 \
+ $(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_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/dht/libgnunetdht.la \
+ $(top_builddir)/src/regex/libgnunetregextest.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
+ regex_simulation_profiler_test.conf \
+ test_regex_api_data.conf