[gnunet] branch master updated (06f27f955 -> 8240cf210)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from 06f27f955 - po update
     new 9ed8f3c08 REGEX: Do not link internal libraries into .las
     new 8240cf210 DOC: Update to most recent handbook

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 contrib/sphinx        |  2 +-
 src/regex/Makefile.am | 68 ++++++++++++++++++---------------------------------
 2 files changed, 25 insertions(+), 45 deletions(-)

diff --git a/contrib/sphinx b/contrib/sphinx
index 3234b526e..378f616d2 160000
--- a/contrib/sphinx
+++ b/contrib/sphinx
@@ -1 +1 @@
-Subproject commit 3234b526e4ee2892c095bc4d1287c5e5c71519aa
+Subproject commit 378f616d277a6064653175c11dc318263069fb80
diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index 3c8a65336..328efcd0a 100644
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -18,26 +18,29 @@ libexec_PROGRAMS = \
   gnunet-service-regex \
   gnunet-daemon-regexprofiler
 
+REGEX_INTERNAL = \
+  regex_internal_lib.h \
+  regex_internal.h regex_internal.c \
+  regex_internal_dht.c
+REGEX_INTERNAL_TEST = \
+  $(REGEX_INTERNAL) \
+  regex_test_lib.c regex_test_lib.h \
+  regex_test_graph.c \
+  regex_test_random.c
 
 gnunet_service_regex_SOURCES =  \
- gnunet-service-regex.c
+ $(REGEX_INTERNAL) gnunet-service-regex.c
 gnunet_service_regex_LDADD =  -lm \
- libgnunetregex_internal.la \
  libgnunetregexblock.la \
  $(top_builddir)/src/dht/libgnunetdht.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(GN_LIBINTL)
 
-noinst_LTLIBRARIES = \
-  libgnunetregex_internal.la \
-  libgnunetregextest.la
-
 lib_LTLIBRARIES = \
   libgnunetregexblock.la \
   libgnunetregex.la
 
-
 libgnunetregexblock_la_SOURCES = \
   regex_block_lib.c regex_block_lib.h
 libgnunetregexblock_la_LIBADD = \
@@ -49,11 +52,6 @@ libgnunetregexblock_la_LDFLAGS = \
   -version-info 1:0:0
 
 
-libgnunetregex_internal_la_SOURCES = \
-  regex_internal_lib.h \
-  regex_internal.h regex_internal.c \
-  regex_internal_dht.c
-
 libgnunetregex_la_SOURCES = \
   regex_api_announce.c \
   regex_api_search.c \
@@ -85,60 +83,49 @@ noinst_mysql_progs = \
   gnunet-regex-simulation-profiler
 
 gnunet_regex_simulation_profiler_SOURCES = \
-  gnunet-regex-simulation-profiler.c
+  $(REGEX_INTERNAL) gnunet-regex-simulation-profiler.c
 gnunet_regex_simulation_profiler_LDADD = \
+  libgnunetregexblock.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetregex_internal.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/my/libgnunetmy.la \
-  $(top_builddir)/src/mysql/libgnunetmysql.la
+  $(top_builddir)/src/mysql/libgnunetmysql.la \
+  $(top_builddir)/src/block/libgnunetblock.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 endif
 
-libgnunetregextest_la_SOURCES = \
-  regex_test_lib.c regex_test_lib.h \
-  regex_test_graph.c \
-  regex_test_random.c
-libgnunetregextest_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunetregex_internal.la
-
 noinst_PROGRAMS = $(noinst_mysql_progs) \
   perf-regex \
   gnunet-regex-profiler
 
 perf_regex_SOURCES = \
-  perf-regex.c
+  $(REGEX_INTERNAL_TEST) perf-regex.c
 perf_regex_LDADD = -lm \
-  libgnunetregex_internal.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
   libgnunetregexblock.la \
-  libgnunetregextest.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 perf_regex_LDFLAGS = \
   $(GN_LIBINTL)
 
 gnunet_regex_profiler_SOURCES = \
-  gnunet-regex-profiler.c
+  $(REGEX_INTERNAL_TEST) gnunet-regex-profiler.c
 gnunet_regex_profiler_LDADD = -lm \
   $(top_builddir)/src/arm/libgnunetarm.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
-  libgnunetregex_internal.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
   libgnunetregexblock.la \
-  libgnunetregextest.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la
 gnunet_regex_profiler_LDFLAGS = \
   $(GN_LIBINTL)
 
 gnunet_daemon_regexprofiler_SOURCES = \
-  gnunet-daemon-regexprofiler.c
+  $(REGEX_INTERNAL_TEST) gnunet-daemon-regexprofiler.c
 gnunet_daemon_regexprofiler_LDADD = -lm \
-  libgnunetregex_internal.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
   libgnunetregexblock.la \
-  libgnunetregextest.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la
 gnunet_daemon_regexprofiler_LDFLAGS = \
@@ -158,11 +145,9 @@ if ENABLE_TEST_RUN
 endif
 
 test_regex_eval_api_SOURCES = \
-  test_regex_eval_api.c
+  $(REGEX_INTERNAL_TEST) test_regex_eval_api.c
 test_regex_eval_api_LDADD = -lm \
-  libgnunetregex_internal.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  libgnunetregextest.la \
   libgnunetregexblock.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
@@ -181,28 +166,23 @@ test_regex_api_LDADD = -lm \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_regex_iterate_api_SOURCES = \
-  test_regex_iterate_api.c
+  $(REGEX_INTERNAL) test_regex_iterate_api.c
 test_regex_iterate_api_LDADD = -lm \
-  libgnunetregex_internal.la \
   libgnunetregexblock.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_regex_proofs_SOURCES = \
-  test_regex_proofs.c
+  $(REGEX_INTERNAL_TEST) test_regex_proofs.c
 test_regex_proofs_LDADD = -lm \
-  libgnunetregex_internal.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  libgnunetregextest.la \
   libgnunetregexblock.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_regex_graph_api_SOURCES = \
-  test_regex_graph_api.c
+  $(REGEX_INTERNAL_TEST) test_regex_graph_api.c
 test_regex_graph_api_LDADD = -lm \
-  libgnunetregex_internal.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  libgnunetregextest.la \
   libgnunetregexblock.la \
   $(top_builddir)/src/util/libgnunetutil.la
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.