From 27ea9c1da8358fd93cdf6911099ceb3e0251c37d Mon Sep 17 00:00:00 2001 From: Bertrand Marc Date: Sat, 4 Jul 2020 19:06:49 +0200 Subject: [PATCH 1/2] Fix_build_dependencies --- src/ats-tests/Makefile.am | 2 ++ src/dns/Makefile.am | 5 +++++ src/fs/Makefile.am | 5 +++++ src/json/Makefile.am | 4 ++++ src/peerinfo-tool/Makefile.am | 9 +++++++++ src/reclaim/Makefile.am | 10 ++++++++++ src/revocation/Makefile.am | 6 ++++++ src/testbed/Makefile.am | 6 ++++++ src/testing/Makefile.am | 3 +++ src/transport/Makefile.am | 12 ++++++++++++ 10 files changed, 62 insertions(+) diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am index 1375d1505..cc30f660a 100644 --- a/src/ats-tests/Makefile.am +++ b/src/ats-tests/Makefile.am @@ -41,8 +41,10 @@ libgnunetatstesting_la_SOURCES = \ ats-testing-experiment.c ats-testing-preferences.c libgnunetatstesting_la_LIBADD = \ $(top_builddir)/src/testbed/libgnunettestbed.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/core/libgnunetcore.la \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am index 17be841f5..45107304b 100644 --- a/src/dns/Makefile.am +++ b/src/dns/Makefile.am @@ -81,6 +81,11 @@ libgnunet_plugin_block_dns_la_SOURCES = \ plugin_block_dns.c libgnunet_plugin_block_dns_la_LIBADD = \ $(top_builddir)/src/block/libgnunetblockgroup.la \ + $(top_builddir)/src/block/libgnunetblock.la \ + $(top_builddir)/src/util/libgnunetutil.la +libgnunet_plugin_block_dns_la_DEPENDENCIES = \ + $(top_builddir)/src/block/libgnunetblockgroup.la \ + $(top_builddir)/src/block/libgnunetblock.la \ $(top_builddir)/src/util/libgnunetutil.la libgnunet_plugin_block_dns_la_LDFLAGS = \ $(GN_LIBINTL) \ diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index b1555be60..25590c6f7 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am @@ -46,8 +46,13 @@ libgnunetfs_la_SOURCES = \ libgnunetfs_la_LIBADD = \ $(top_builddir)/src/datastore/libgnunetdatastore.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) $(XLIB) $(LIBGCRYPT_LIBS) -lunistring +libgnunetfs_la_DEPENDENCIES = \ + $(top_builddir)/src/datastore/libgnunetdatastore.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ + $(top_builddir)/src/util/libgnunetutil.la if HAVE_LIBEXTRACTOR libgnunetfs_la_LIBADD += \ diff --git a/src/json/Makefile.am b/src/json/Makefile.am index 5968a3596..221ad033d 100644 --- a/src/json/Makefile.am +++ b/src/json/Makefile.am @@ -27,6 +27,10 @@ libgnunetjson_la_LIBADD = \ $(MHD_LIBS) \ $(XLIB) \ $(Z_LIBS) +libgnunetjson_la_DEPENDENCIES = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la + check_PROGRAMS = \ test_json \ diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am index 05173d551..9002608a1 100644 --- a/src/peerinfo-tool/Makefile.am +++ b/src/peerinfo-tool/Makefile.am @@ -25,10 +25,19 @@ libgnunet_plugin_rest_peerinfo_la_LIBADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/rest/libgnunetrest.la \ $(top_builddir)/src/json/libgnunetjson.la \ $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ $(LTLIBINTL) -ljansson $(MHD_LIBS) +libgnunet_plugin_rest_peerinfo_la_DEPENDENCIES = \ + $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ + $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/ats/libgnunetats.la \ + $(top_builddir)/src/rest/libgnunetrest.la \ + $(top_builddir)/src/json/libgnunetjson.la \ + $(top_builddir)/src/util/libgnunetutil.la libgnunet_plugin_rest_peerinfo_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) libgnunet_plugin_rest_peerinfo_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am index 51b9b9c5b..4c5ba4137 100644 --- a/src/reclaim/Makefile.am +++ b/src/reclaim/Makefile.am @@ -50,11 +50,21 @@ libgnunet_plugin_rest_reclaim_la_LIBADD = \ $(top_builddir)/src/identity/libgnunetidentity.la \ libgnunetreclaim.la \ $(top_builddir)/src/json/libgnunetjson.la \ + $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ $(top_builddir)/src/rest/libgnunetrest.la \ $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \ $(top_builddir)/src/namestore/libgnunetnamestore.la \ $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ $(LTLIBINTL) -ljansson $(MHD_LIBS) +libgnunet_plugin_rest_reclaim_la_DEPENDENCIES = \ + $(top_builddir)/src/identity/libgnunetidentity.la \ + libgnunetreclaim.la \ + $(top_builddir)/src/json/libgnunetjson.la \ + $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ + $(top_builddir)/src/rest/libgnunetrest.la \ + $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \ + $(top_builddir)/src/namestore/libgnunetnamestore.la \ + $(top_builddir)/src/util/libgnunetutil.la libgnunet_plugin_rest_reclaim_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) libgnunet_plugin_rest_reclaim_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am index b3b2877ca..e78812002 100644 --- a/src/revocation/Makefile.am +++ b/src/revocation/Makefile.am @@ -27,8 +27,14 @@ libgnunet_plugin_block_revocation_la_SOURCES = \ libgnunet_plugin_block_revocation_la_LIBADD = \ libgnunetrevocation.la \ $(top_builddir)/src/block/libgnunetblockgroup.la \ + $(top_builddir)/src/block/libgnunetblock.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(LTLIBINTL) +libgnunet_plugin_block_revocation_la_DEPENDENCIES = \ + libgnunetrevocation.la \ + $(top_builddir)/src/block/libgnunetblockgroup.la \ + $(top_builddir)/src/block/libgnunetblock.la \ + $(top_builddir)/src/util/libgnunetutil.la libgnunet_plugin_block_revocation_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am index 62b49af78..7c1e217bb 100644 --- a/src/testbed/Makefile.am +++ b/src/testbed/Makefile.am @@ -111,6 +111,12 @@ libgnunettestbed_la_LIBADD = $(XLIB) \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(LTLIBINTL) +libgnunettestbed_la_DEPENDENCIES = \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ + $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la libgnunettestbed_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index 9c6357455..2b599f55b 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am @@ -20,6 +20,9 @@ libgnunettesting_la_LIBADD = \ $(top_builddir)/src/arm/libgnunetarm.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(LTLIBINTL) +libgnunettesting_la_DEPENDENCIES = \ + $(top_builddir)/src/arm/libgnunetarm.la \ + $(top_builddir)/src/util/libgnunetutil.la libgnunettesting_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) \ -version-info 2:0:1 diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 077c0409a..bb6d12fed 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -159,7 +159,15 @@ libgnunettransporttesting_la_LIBADD = \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/arm/libgnunetarm.la \ $(GN_LIBINTL) +libgnunettransporttesting_la_DEPENDENCIES = \ + libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/ats/libgnunetats.la \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/arm/libgnunetarm.la libgnunettransporttesting_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) @@ -189,6 +197,10 @@ libgnunettransport_la_LIBADD = \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) +libgnunettransport_la_DEPENDENCIES = \ + $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/ats/libgnunetats.la \ + $(top_builddir)/src/util/libgnunetutil.la libgnunettransport_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) \ -version-info 4:0:2 -- 2.27.0