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 2e8d1cc4e3d529834c3ae0a242f9b765bcda300b..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
 
@@ -16,11 +16,26 @@ libgnunetutilwin_la_LIBADD = \
 WINLIB = libgnunetutilwin.la
 endif
 
+if !MINGW
+ SERVER_CLIENT_UNIX = test_server_with_client_unix
+endif
+
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
   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 = \
@@ -74,8 +89,7 @@ libgnunetutil_la_LIBADD = \
   $(GCLIBADD) $(WINLIB) \
   $(LIBGCRYPT_LIBS) \
   $(LTLIBICONV) \
-  -lltdl -lz $(XLIB) \
-  libgnu/libgnu.la
+  -lltdl -lz $(XLIB) 
 
 libgnunetutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
@@ -93,7 +107,7 @@ gnunet_service_resolver_LDADD = \
   $(GN_LIBINTL)
 gnunet_service_resolver_DEPENDENCIES = \
   libgnunetutil.la
-       
+
 
 gnunet_resolver_SOURCES = \
  gnunet-resolver.c         
@@ -111,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 \
@@ -151,13 +170,14 @@ check_PROGRAMS = \
  test_server \
  test_server_disconnect \
  test_server_with_client \
+ $(SERVER_CLIENT_UNIX) \
  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
 
@@ -230,7 +250,8 @@ test_crypto_aes_LDADD = \
 test_crypto_aes_weak_SOURCES = \
  test_crypto_aes_weak.c
 test_crypto_aes_weak_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la  \
+ $(LIBGCRYPT_LIBS)
 
 test_crypto_crc_SOURCES = \
  test_crypto_crc.c
@@ -362,6 +383,12 @@ test_server_with_client_SOURCES = \
 test_server_with_client_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
+test_server_with_client_unix_SOURCES = \
+ test_server_with_client_unix.c
+test_server_with_client_unix_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
+
 test_service_SOURCES = \
  test_service.c
 test_service_LDADD = \