LRN: Fix automake deps to allow -j* builds again

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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 3a03516db3db45d3e1685e86f709ee2d2e423965..02f823442523c45fae91a96e4c8de531d2c9df9c 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
 plugindir = $(libdir)/gnunet
 
@@ -25,6 +25,17 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+noinst_PROGRAMS = \
+ gnunet-config-diff
+
+gnunet_config_diff_SOURCES = \
+ gnunet-config-diff.c
+gnunet_config_diff_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la  
+gnunet_config_diff_DEPENDENCIES = \
+ libgnunetutil.la
+
+
 lib_LTLIBRARIES = libgnunetutil.la
 
 libgnunetutil_la_SOURCES = \
@@ -114,6 +125,11 @@ libgnunet_plugin_test_la_SOURCES = \
 libgnunet_plugin_test_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
+if HAVE_BENCHMARKS
+ BENCHMARKS = \
+  perf_crypto_hash 
+endif
+
 check_PROGRAMS = \
  test_bio \
  test_client \
@@ -158,10 +174,10 @@ check_PROGRAMS = \
  test_service \
  test_strings \
  test_time \
- perf_crypto_hash \
+ $(BENCHMARKS) \
  test_os_start_process 
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
 endif
 
@@ -235,7 +251,7 @@ test_crypto_aes_weak_SOURCES = \
  test_crypto_aes_weak.c
 test_crypto_aes_weak_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  \
- -lgcrypt
+ $(LIBGCRYPT_LIBS)
 
 test_crypto_crc_SOURCES = \
  test_crypto_crc.c