Attachment 226745 Details for Bug 313165 – fixing parallel build

[patch] fixing parallel build

0.8.1-parallel-build.patch (text/plain), 8.13 KB, created by Kacper Kowalik (Xarthisius) (RETIRED) on 2010-04-06 15:31:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kacper Kowalik (Xarthisius) (RETIRED)

Created: 2010-04-06 15:31:57 UTC

Size: 8.13 KB

patch

obsolete

>Fixing parallel build issues
>
>--- src/server/Makefile.am
>+++ src/server/Makefile.am
>@@ -30,26 +30,25 @@
> gnunetd_SOURCES = \
>  gnunetd.c 
> gnunetd_LDADD = \
>- $(top_builddir)/src/server/libgnunetcore.la \
>+ libgnunetcore.la \
>  $(GN_LIBINTL)
> 
> 
> gnunet_update_SOURCES = \
>  gnunet-update.c 
> gnunet_update_LDADD = \
>- $(top_builddir)/src/server/libgnunetcore.la \
>+ libgnunetcore.la \
>  $(GN_LIBINTL)
> 
> gnunet_peer_info_SOURCES = \
>  gnunet-peer-info.c 
> gnunet_peer_info_LDADD  = \
>  $(top_builddir)/src/util/libgnunetutil.la \
>- $(top_builddir)/src/server/libgnunetcore.la \
>+ libgnunetcore.la \
>  $(GN_LIBINTL)
> 
> gnunet_transport_check_SOURCES = \
>  gnunet-transport-check.c 
> gnunet_transport_check_LDADD  = \
>- $(top_builddir)/src/server/libgnunetcore.la \
>+ libgnunetcore.la \
>  $(GN_LIBINTL)
>-
>--- src/applications/stats/Makefile.am
>+++ src/applications/stats/Makefile.am
>@@ -21,7 +21,7 @@
> gnunet_stats_SOURCES = \
>  gnunet-stats.c 	
> gnunet_stats_LDADD = \
>-  $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
>+  libgnunetstatsapi.la \
>   $(top_builddir)/src/util/libgnunetutil.la \
>   $(GN_LIBINTL)
> 
>--- src/applications/rpc/Makefile.am
>+++ src/applications/rpc/Makefile.am
>@@ -16,7 +16,7 @@
> libgnunetmodule_rpc_la_LDFLAGS = \
>   $(GN_PLUGIN_LDFLAGS)
> libgnunetmodule_rpc_la_LIBADD = \
>-  $(top_builddir)/src/applications/rpc/libgnunetrpcutil.la \
>+  libgnunetrpcutil.la \
>   $(top_builddir)/src/util/libgnunetutil.la \
>   $(GN_LIBINTL)
> 
>--- src/applications/tracekit/Makefile.am
>+++ src/applications/tracekit/Makefile.am
>@@ -18,7 +18,7 @@
>   gnunet-tracekit.c \
>   tracekit.h
> gnunet_tracekit_LDADD = \
>-  $(top_builddir)/src/applications/tracekit/libgnunettracekitapi.la \
>+  libgnunettracekitapi.la \
>   $(top_builddir)/src/util/libgnunetutil.la \
>   $(GN_LIBINTL)
> 
>@@ -53,5 +53,5 @@
> tracekittest_LDADD = \
>   $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
>   $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
>-  $(top_builddir)/src/applications/tracekit/libgnunettracekitapi.la \
>+  libgnunettracekitapi.la \
>   $(top_builddir)/src/util/libgnunetutil.la 
>--- src/applications/testing/Makefile.am
>+++ src/applications/testing/Makefile.am
>@@ -40,20 +40,20 @@
>  testingtest.c 
> testingtest_LDADD = \
>  $(top_builddir)/src/util/libgnunetutil.la \
>- $(top_builddir)/src/applications/testing/libgnunettestingapi.la
>+ libgnunettestingapi.la
> 
> remotetest_SOURCES = \
>  remotetest.c
> remotetest_LDADD = \
>  $(top_builddir)/src/util/libgnunetutil.la \
>- $(top_builddir)/src/applications/testing/libgnunetremoteapi.la
>+ libgnunetremoteapi.la
> 
> 
> testingtest_loop_SOURCES = \
>  testingtest_loop.c 
> testingtest_loop_LDADD = \
>  $(top_builddir)/src/util/libgnunetutil.la \
>- $(top_builddir)/src/applications/testing/libgnunettestingapi.la
>+ libgnunettestingapi.la
> 
> 
> pkgdata_DATA = \
>--- src/applications/fs/fsui/Makefile.am.orig	2010-04-06 15:02:21.375530243 +0000
>+++ src/applications/fs/fsui/Makefile.am	2010-04-06 15:03:26.424279707 +0000
>@@ -37,7 +37,7 @@
> fsui_loader_SOURCES = \
>  fsui-loader.c 
> fsui_loader_LDADD = \
>- $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
>+ libgnunetfsui.la \
>  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
>  $(top_builddir)/src/util/libgnunetutil.la 
> 
>@@ -59,14 +59,14 @@
>   basic_fsui_test.c 
> basic_fsui_test_LDADD = \
>   $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
>-  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
>+  libgnunetfsui.la \
>   $(top_builddir)/src/util/libgnunetutil.la 
> 
> fsui_start_stop_test_SOURCES = \
>   fsui_start_stop_test.c 
> fsui_start_stop_test_LDADD = \
>   $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
>-  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
>+  libgnunetfsui.la \
>   $(top_builddir)/src/util/libgnunetutil.la 
> 
> search_pause_resume_persistence_test_SOURCES = \
>@@ -80,42 +80,42 @@
>   search_ranking_test.c 
> search_ranking_test_LDADD = \
>   $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
>-  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
>+  libgnunetfsui.la \
>   $(top_builddir)/src/util/libgnunetutil.la 
> 
> download_persistence_test_SOURCES = \
>   download_persistence_test.c 
> download_persistence_test_LDADD = \
>   $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
>-  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
>+  libgnunetfsui.la \
>   $(top_builddir)/src/util/libgnunetutil.la 
> 
> recursive_download_test_SOURCES = \
>   recursive_download_test.c 
> recursive_download_test_LDADD = \
>   $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
>-  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
>+  libgnunetfsui.la \
>   $(top_builddir)/src/util/libgnunetutil.la 
> 
> upload_unindex_persistence_test_SOURCES = \
>   upload_unindex_persistence_test.c 
> upload_unindex_persistence_test_LDADD = \
>   $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
>-  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
>+  libgnunetfsui.la \
>   $(top_builddir)/src/util/libgnunetutil.la 
> 
> search_linked_download_persistence_test_SOURCES = \
>   search_linked_download_persistence_test.c 
> search_linked_download_persistence_test_LDADD = \
>   $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
>-  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
>+  libgnunetfsui.la \
>   $(top_builddir)/src/util/libgnunetutil.la 
> 
> search_persistence_test_SOURCES = \
>   search_persistence_test.c 
> search_persistence_test_LDADD = \
>   $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
>-  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
>+  libgnunetfsui.la \
>   $(top_builddir)/src/util/libgnunetutil.la 
> 
> 
>@@ -123,6 +123,6 @@
>   recursive_download_persistence_test.c 
> recursive_download_persistence_test_LDADD = \
>   $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
>-  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
>+  libgnunetfsui.la \
>   $(top_builddir)/src/util/libgnunetutil.la 
> 
>--- src/applications/dv_dht/tools/Makefile.am.orig	2010-04-06 15:04:16.738530159 +0000
>+++ src/applications/dv_dht/tools/Makefile.am	2010-04-06 15:04:40.525280090 +0000
>@@ -24,7 +24,7 @@
> gnunet_dvdht_query_SOURCES = \
>   dht-query.c
> gnunet_dvdht_query_LDADD =  \
>-  $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
>+  libgnunetdvdhtapi.la \
>   $(top_builddir)/src/util/libgnunetutil.la \
>   $(GN_LIBINTL)
> 
>@@ -34,7 +34,7 @@
>   $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
>   $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
>   $(top_builddir)/src/applications/testing/libgnunetremoteapi.la \
>-  $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
>+  libgnunetdvdhtapi.la \
>   $(top_builddir)/src/util/libgnunetutil.la
> 
> check_PROGRAMS = \
>@@ -49,7 +49,7 @@
> dv_dht_loopback_test_LDADD = \
>   $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
>   $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
>-  $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
>+  libgnunetdvdhtapi.la \
>   $(top_builddir)/src/util/libgnunetutil.la 
> 
> dv_dht_twopeer_test_SOURCES = \
>@@ -57,7 +57,7 @@
> dv_dht_twopeer_test_LDADD = \
>   $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
>   $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
>-  $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
>+  libgnunetdvdhtapi.la \
>   $(top_builddir)/src/util/libgnunetutil.la 
> 
> dv_dht_multipeer_test_SOURCES = \
>@@ -65,7 +65,7 @@
> dv_dht_multipeer_test_LDADD = \
>   $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
>   $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
>-  $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
>+  libgnunetdvdhtapi.la \
>   $(top_builddir)/src/util/libgnunetutil.la 
>   
> dv_dht_multi_topology_test_SOURCES = \
>@@ -74,7 +74,7 @@
>   $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
>   $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
>   $(top_builddir)/src/applications/testing/libgnunetremoteapi.la \
>-  $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
>+  libgnunetdvdhtapi.la \
>   $(top_builddir)/src/util/libgnunetutil.la 
> 
> EXTRA_DIST = \

Actions: View | Diff

Attachments on bug 313165: 226601 | 226741 | 226743 | 226745