Patch by Marenz: Allow parallel build (make -j 2)

8 files changed, 63 insertions, 4 deletions

diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index 3f91e9981..3e7f27dfd 100644
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -32,6 +32,8 @@ gnunet_arm_LDADD = \
   $(top_builddir)/src/arm/libgnunetarm.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
+gnunet_arm_DEPENDENCIES = \
+  libgnunetarm.la                         
 
 gnunet_service_arm_SOURCES = \
  gnunet-service-arm.c  gnunet-service-arm.h \
@@ -39,6 +41,8 @@ gnunet_service_arm_SOURCES = \
 gnunet_service_arm_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
+gnunet_service_arm_DEPENDENCIES = \
+  libgnunetarm.la                         
 
 
 mockup_service_SOURCES = \
diff --git a/src/block/Makefile.am b/src/block/Makefile.am
index 1d24b1bfa..452296613 100644
--- a/src/block/Makefile.am
+++ b/src/block/Makefile.am
@@ -27,6 +27,9 @@ libgnunet_plugin_block_dht_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
 libgnunet_plugin_block_dht_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_block_dht_la_DEPENDENCIES = \
+  libgnunetblock.la 
+
 
 libgnunet_plugin_block_fs_la_SOURCES = \
   plugin_block_fs.c
@@ -35,6 +38,9 @@ libgnunet_plugin_block_fs_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
 libgnunet_plugin_block_fs_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_block_fs_la_DEPENDENCIES = \
+  libgnunetblock.la
+                                            
 
 libgnunet_plugin_block_dns_la_SOURCES = \
   plugin_block_dns.c
@@ -57,12 +63,16 @@ libgnunet_plugin_block_test_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
 libgnunet_plugin_block_test_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_block_test_la_DEPENDENCIES = \
+  libgnunetblock.la                                           
 
 
 libgnunetblock_la_SOURCES = \
   block.c 
 libgnunetblock_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
+libgnunetblock_la_DEPENDENCIES = \
+ $(top_builddir)/src/util/libgnunetutil.la  
 
 check_PROGRAMS = \
  test_block
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index de8920701..d361f536a 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -102,6 +102,8 @@ gnunet_service_dht_LDADD = \
   $(top_builddir)/src/datacache/libgnunetdatacache.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/dht/libgnunetdhtlog.la -lm
+gnunet_service_dht_DEPENDENCIES = \
+  libgnunetdhtlog.la                              
 
 gnunet_dht_get_SOURCES = \
  gnunet-dht-get.c         
@@ -109,6 +111,8 @@ gnunet_dht_get_LDADD = \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/util/libgnunetutil.la 
+gnunet_dht_get_DEPENDENCIES = \
+  libgnunetdht.la                             
 
 gnunet_dht_get_peer_SOURCES = \
  gnunet-dht-get-peer.c         
@@ -117,6 +121,8 @@ gnunet_dht_get_peer_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/util/libgnunetutil.la 
+gnunet_dht_get_peer_DEPENDENCIES = \
+  libgnunetdht.la                             
 
 gnunet_dht_put_SOURCES = \
  gnunet-dht-put.c         
@@ -124,6 +130,8 @@ gnunet_dht_put_LDADD = \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/util/libgnunetutil.la 
+gnunet_dht_put_DEPENDENCIES = \
+  libgnunetdht.la                             
 
 gnunet_dht_driver_SOURCES = \
  gnunet-dht-driver.c         
@@ -134,6 +142,10 @@ gnunet_dht_driver_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/dht/libgnunetdhtlog.la
+gnunet_dht_driver_DEPENDENCIES = \
+  libgnunetdht.la \
+  libgnunetdhtlog.la  
+
 
 check_PROGRAMS = $(STUD_TESTS) \
  test_dht_api \
@@ -155,6 +167,8 @@ test_dht_api_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/dht/libgnunetdht.la
+test_dht_api_DEPENDENCIES = \
+  libgnunetdht.la                           
 
 test_dht_multipeer_SOURCES = \
  test_dht_multipeer.c
@@ -162,6 +176,8 @@ test_dht_multipeer_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/dht/libgnunetdht.la  
+test_dht_multipeer_DEPENDENCIES = \
+  libgnunetdht.la                           
  
 #test_hash_operations_SOURCES = \
 # test_hash_operations.c
@@ -176,6 +192,8 @@ test_dht_twopeer_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/dht/libgnunetdht.la    
+test_dht_twopeer_DEPENDENCIES = \
+  libgnunetdht.la                           
 
 test_dht_twopeer_put_get_SOURCES = \
  test_dht_twopeer_put_get.c
diff --git a/src/dv/Makefile.am b/src/dv/Makefile.am
index de72438d7..aa39bca2e 100644
--- a/src/dv/Makefile.am
+++ b/src/dv/Makefile.am
@@ -38,6 +38,8 @@ gnunet_service_dv_LDADD = \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
+gnunet_service_dv_DEPENDENCIES = \
+  libgnunetdv.la                                 
 
 libgnunet_plugin_transport_dv_la_SOURCES = \
   plugin_transport_dv.c
@@ -48,7 +50,8 @@ libgnunet_plugin_transport_dv_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
 libgnunet_plugin_transport_dv_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
-
+libgnunet_plugin_transport_dv_la_DEPENDENCIES = \
+  libgnunetdv.la                                                
 
 check_PROGRAMS = \
  test_transport_api_dv
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index c798e9947..c0a0420b7 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -61,6 +61,8 @@ gnunet_directory_LDADD = \
   $(top_builddir)/src/fs/libgnunetfs.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
+gnunet_directory_DEPENDENCIES = \
+  libgnunetfs.la
 
 gnunet_download_SOURCES =  \
  gnunet-download.c         
@@ -68,6 +70,8 @@ gnunet_download_LDADD =  \
  $(top_builddir)/src/fs/libgnunetfs.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(GN_LIBINTL)
+gnunet_download_DEPENDENCIES = \
+  libgnunetfs.la
 
 gnunet_publish_SOURCES =  \
  gnunet-publish.c         
@@ -75,6 +79,8 @@ gnunet_publish_LDADD =  \
  $(top_builddir)/src/fs/libgnunetfs.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(GN_LIBINTL)
+gnunet_publish_DEPENDENCIES = \
+  libgnunetfs.la
 
 gnunet_pseudonym_SOURCES = \
  gnunet-pseudonym.c
@@ -83,6 +89,8 @@ gnunet_pseudonym_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   -lextractor \
   $(GN_LIBINTL)
+gnunet_pseudonym_DEPENDENCIES = \
+  libgnunetfs.la
 
 gnunet_search_SOURCES = \
  gnunet-search.c         
@@ -90,6 +98,8 @@ gnunet_search_LDADD = \
   $(top_builddir)/src/fs/libgnunetfs.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
+gnunet_search_DEPENDENCIES = \
+  libgnunetfs.la
 
 gnunet_service_fs_SOURCES =  \
  gnunet-service-fs.c \
@@ -103,6 +113,8 @@ gnunet_service_fs_LDADD =  \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(GN_LIBINTL)
+gnunet_service_fs_DEPENDENCIES = \
+  libgnunetfs.la
 
 gnunet_unindex_SOURCES = \
  gnunet-unindex.c         
@@ -110,6 +122,8 @@ gnunet_unindex_LDADD = \
   $(top_builddir)/src/fs/libgnunetfs.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
+gnunet_unindex_DEPENDENCIES = \
+  libgnunetfs.la
 
 
 
diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am
index 6a276dbd5..2de8772ba 100644
--- a/src/statistics/Makefile.am
+++ b/src/statistics/Makefile.am
@@ -32,6 +32,8 @@ gnunet_statistics_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
+gnunet_statistics_DEPENDENCIES = \
+  libgnunetstatistics.la                                 
 
 gnunet_service_statistics_SOURCES = \
  gnunet-service-statistics.c         
@@ -39,7 +41,8 @@ gnunet_service_statistics_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-
+gnunet_service_statistics_DEPENDENCIES = \
+  libgnunetstatistics.la                                 
 
 check_PROGRAMS = \
  test_statistics_api \
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 91c45b060..e616c9d19 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -91,6 +91,8 @@ gnunet_transport_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
+gnunet_transport_DEPENDENCIES = \
+  libgnunettransport.la                         
 
 gnunet_service_transport_SOURCES = \
  gnunet-service-transport.c plugin_transport.h 
@@ -100,6 +102,8 @@ gnunet_service_transport_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
+gnunet_service_transport_DEPENDENCIES = \
+  libgnunettransport.la                         
 
 
 plugin_LTLIBRARIES = \
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 427ed2567..01e7e3219 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -90,14 +90,17 @@ gnunet_service_resolver_SOURCES = \
 gnunet_service_resolver_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-
+gnunet_service_resolver_DEPENDENCIES = \
+  libgnunetutil.la
+        
 
 gnunet_resolver_SOURCES = \
  gnunet-resolver.c         
 gnunet_resolver_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-
+gnunet_resolver_DEPENDENCIES = \
+  libgnunetutil.la
 
 plugin_LTLIBRARIES = \
   libgnunet_plugin_test.la