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

diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index 82212ee40..43555cf72 100644
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -1,3 +1,4 @@
+# This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
@@ -30,7 +31,7 @@ gnunet_service_regex_LDADD =  -lm \
  $(top_builddir)/src/dht/libgnunetdht.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(GN_LIBINTL) 
+ $(GN_LIBINTL)
 
 noinst_LIBRARIES = \
   libgnunetregex_internal.a \
@@ -63,7 +64,7 @@ libgnunetregex_internal_a_DEPENDENCIES = \
 libgnunetregex_la_SOURCES = \
   regex_api.c regex_ipc.h
 libgnunetregex_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la
 libgnunetregex_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
    -version-info 3:1:0
@@ -91,13 +92,13 @@ gnunet_regex_simulation_profiler_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   libgnunetregex_internal.a \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/mysql/libgnunetmysql.la 
+  $(top_builddir)/src/mysql/libgnunetmysql.la
 endif
 
 libgnunetregextest_a_SOURCES = \
   regex_test_lib.c regex_test_lib.h \
   regex_test_graph.c \
-  regex_test_random.c 
+  regex_test_random.c
 libgnunetregextest_a_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunetregex_internal.a
@@ -115,7 +116,7 @@ perf_regex_LDADD = -lm \
   $(top_builddir)/src/dht/libgnunetdht.la \
   libgnunetregexblock.la \
   libgnunetregextest.a \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la
 
 gnunet_regex_profiler_SOURCES = \
   gnunet-regex-profiler.c
@@ -127,7 +128,7 @@ gnunet_regex_profiler_LDADD = -lm \
   libgnunetregexblock.la \
   libgnunetregextest.a \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la
 
 gnunet_daemon_regexprofiler_SOURCES = \
   gnunet-daemon-regexprofiler.c
@@ -137,9 +138,10 @@ gnunet_daemon_regexprofiler_LDADD = -lm \
   libgnunetregexblock.la \
   libgnunetregextest.a \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la
 
 check_PROGRAMS = \
+  test_regex_integration \
   test_regex_eval_api \
   test_regex_iterate_api \
   test_regex_proofs \
@@ -160,6 +162,14 @@ test_regex_eval_api_LDADD = -lm \
   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 \