- simplify start

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

diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index fe882a1e94f247f4c1b1f6bc8e435525c3b4aa15..e526b9977f8e9e04f002274758b228e179bf91df 100644 (file)
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -8,19 +8,54 @@ if USE_COVERAGE
   AM_CFLAGS = --coverage
 endif
 
-lib_LTLIBRARIES = libgnunetregex.la
+lib_LTLIBRARIES = libgnunetregexblock.la \
+  libgnunetregex.la
+
+
+libgnunetregexblock_la_SOURCES = \
+  regex_block_lib.c regex_block_lib.h
+libgnunetregexblock_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(XLIB) \
+  $(LTLIBINTL)
+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_graph.c regex_random.c \
+  regex_dht.c
 libgnunetregex_la_LIBADD = -lm \
-  $(top_builddir)/src/util/libgnunetutil.la
+  $(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 = \
+  libgnunetregexblock.la
 libgnunetregex_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
-   -version-info 0:0:0
+   -version-info 2:0:1
+
+
+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 \
+ $(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_PROGRAMS = \
+noinst_mysql_progs = \
 gnunet-regex-simulation-profiler
 
 gnunet_regex_simulation_profiler_SOURCES = \
@@ -33,6 +68,59 @@ 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 = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/regex/libgnunetregex.la
+libgnunetregextest_la_DEPENDENCIES = \
+  libgnunetregex.la
+
+
+noinst_PROGRAMS = $(noinst_mysql_progs) \
+  perf-regex \
+  gnunet-regex-profiler \
+  gnunet-daemon-regexprofiler
+
+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
+
+gnunet_regex_profiler_SOURCES = \
+  gnunet-regex-profiler.c
+gnunet_regex_profiler_LDADD = \
+  $(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/statistics/libgnunetstatistics.la
+gnunet_regex_profiler_DEPENDENCIES = \
+  $(top_builddir)/src/arm/libgnunetarm.la \
+  $(top_builddir)/src/dht/libgnunetdht.la \
+   libgnunetregex.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/statistics/libgnunetstatistics.la
+gnunet_daemon_regexprofiler_DEPENDENCIES = \
+  $(top_builddir)/src/dht/libgnunetdht.la \
+  libgnunetregex.la
+
+
+
 check_PROGRAMS = \
   test_regex_eval_api \
   test_regex_iterate_api \
@@ -76,4 +164,4 @@ test_regex_iptoregex_LDADD = \
 
 
 EXTRA_DIST = \
-  regex_profiler_test.conf
+  regex_simulation_profiler_test.conf