From dfcab34c5af80c0068299bacb16ffc461bf3c1ad Mon Sep 17 00:00:00 2001 From: xrs Date: Fri, 8 Nov 2019 10:33:15 +0100 Subject: [PATCH] add $(GN_LIBINTL) to Makefile.am (fixes 0005902) --- src/arm/Makefile.am | 2 ++ src/ats-tests/Makefile.am | 4 ++++ src/block/Makefile.am | 2 ++ src/cadet/Makefile.am | 5 ++++- src/core/Makefile.am | 2 ++ src/curl/Makefile.am | 1 + src/dht/Makefile.am | 10 ++++++++++ src/dns/Makefile.am | 2 ++ src/gns/Makefile.am | 2 ++ src/hello/Makefile.am | 3 ++- src/json/Makefile.am | 1 + src/nat-auto/Makefile.am | 5 ++++- src/nat/Makefile.am | 2 ++ src/nt/Makefile.am | 1 + src/peerinfo-tool/Makefile.am | 3 ++- src/peerinfo/Makefile.am | 2 ++ src/peerstore/Makefile.am | 1 + src/regex/Makefile.am | 8 ++++++++ src/sq/Makefile.am | 1 + src/testbed-logger/Makefile.am | 2 ++ src/testbed/Makefile.am | 2 ++ src/transport/Makefile.am | 11 ++++++++--- src/vpn/Makefile.am | 1 + 23 files changed, 66 insertions(+), 7 deletions(-) diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am index 422084bfe..43e868805 100644 --- a/src/arm/Makefile.am +++ b/src/arm/Makefile.am @@ -51,6 +51,8 @@ mockup_service_SOURCES = \ mockup-service.c mockup_service_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la +mockup_service_LDFLAGS = \ + $(GN_LIBINTL) check_PROGRAMS = \ diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am index c965fcc9f..1375d1505 100644 --- a/src/ats-tests/Makefile.am +++ b/src/ats-tests/Makefile.am @@ -64,6 +64,8 @@ gnunet_ats_sim_LDADD = \ gnunet_ats_sim_DEPENDENCIES = \ libgnunetatstesting.la \ $(top_builddir)/src/util/libgnunetutil.la +gnunet_ats_sim_LDFLAGS = \ + $(GN_LIBINTL) gnunet_solver_eval_SOURCES = \ @@ -75,6 +77,8 @@ gnunet_solver_eval_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la gnunet_solver_eval_DEPENDENCIES = \ $(top_builddir)/src/util/libgnunetutil.la +gnunet_solver_eval_LDFLAGS = \ + $(GN_LIBINTL) perf_ats_proportional_core_none_SOURCES = \ perf_ats.c diff --git a/src/block/Makefile.am b/src/block/Makefile.am index d769f7d47..dd596f6b4 100644 --- a/src/block/Makefile.am +++ b/src/block/Makefile.am @@ -46,6 +46,7 @@ libgnunetblock_la_DEPENDENCIES = \ $(top_builddir)/src/util/libgnunetutil.la libgnunetblock_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) \ + $(GN_LIBINTL) \ -version-info 0:0:0 @@ -59,4 +60,5 @@ libgnunetblockgroup_la_DEPENDENCIES = \ $(top_builddir)/src/util/libgnunetutil.la libgnunetblockgroup_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) \ + $(GN_LIBINTL) \ -version-info 0:0:0 diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am index b6e72688d..d8d81bf20 100644 --- a/src/cadet/Makefile.am +++ b/src/cadet/Makefile.am @@ -48,6 +48,8 @@ gnunet_cadet_SOURCES = \ gnunet_cadet_LDADD = \ libgnunetcadet.la \ $(top_builddir)/src/util/libgnunetutil.la +gnunet_cadet_LDFLAGS = \ + $(GN_LIBINTL) gnunet_service_cadet_SOURCES = \ gnunet-service-cadet.c gnunet-service-cadet.h \ @@ -70,7 +72,8 @@ gnunet_service_cadet_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/block/libgnunetblock.la if LINUX - gnunet_service_cadet_LDFLAGS = -lrt + gnunet_service_cadet_LDFLAGS = -lrt \ + $(GN_LIBINTL) endif diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 80bdca812..d2d3a2d7f 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -51,6 +51,8 @@ gnunet_core_SOURCES = \ gnunet_core_LDADD = \ libgnunetcore.la \ $(top_builddir)/src/util/libgnunetutil.la +gnunet_core_LDFLAGS = \ + $(GN_LIBINTL) if HAVE_TESTING TESTING_TESTS = \ diff --git a/src/curl/Makefile.am b/src/curl/Makefile.am index af8b64078..ed5819dee 100644 --- a/src/curl/Makefile.am +++ b/src/curl/Makefile.am @@ -20,6 +20,7 @@ lib_LTLIBRARIES = \ libgnunetcurl.la libgnunetcurl_la_LDFLAGS = \ + $(GN_LIBINTL) \ -version-info 0:0:0 \ -no-undefined libgnunetcurl_la_SOURCES = \ diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am index 0b2bc0946..bf73e8f19 100644 --- a/src/dht/Makefile.am +++ b/src/dht/Makefile.am @@ -76,6 +76,8 @@ gnunet_service_dht_LDADD = \ $(top_builddir)/src/datacache/libgnunetdatacache.la \ $(top_builddir)/src/util/libgnunetutil.la \ -lm +gnunet_service_dht_LDFLAGS = \ + $(GN_LIBINTL) gnunet_dht_get_SOURCES = \ gnunet-dht-get.c @@ -83,6 +85,8 @@ gnunet_dht_get_LDADD = \ libgnunetdht.la \ $(top_builddir)/src/core/libgnunetcore.la \ $(top_builddir)/src/util/libgnunetutil.la +gnunet_dht_get_LDFLAGS = \ + $(GN_LIBINTL) gnunet_dht_put_SOURCES = \ gnunet-dht-put.c @@ -90,6 +94,8 @@ gnunet_dht_put_LDADD = \ libgnunetdht.la \ $(top_builddir)/src/core/libgnunetcore.la \ $(top_builddir)/src/util/libgnunetutil.la +gnunet_dht_put_LDFLAGS = \ + $(GN_LIBINTL) gnunet_dht_monitor_SOURCES = \ gnunet-dht-monitor.c @@ -97,6 +103,8 @@ gnunet_dht_monitor_LDADD = \ libgnunetdht.la \ $(top_builddir)/src/core/libgnunetcore.la \ $(top_builddir)/src/util/libgnunetutil.la +gnunet_dht_monitor_LDFLAGS = \ + $(GN_LIBINTL) gnunet_dht_profiler_SOURCES = \ gnunet_dht_profiler.c @@ -105,6 +113,8 @@ gnunet_dht_profiler_LDADD = \ $(top_builddir)/src/core/libgnunetcore.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testbed/libgnunettestbed.la +gnunet_dht_profiler_LDFLAGS = \ + $(GN_LIBINTL) if HAVE_TESTING noinst_LIBRARIES = libgnunetdhttest.a diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am index d2598bd8a..17be841f5 100644 --- a/src/dns/Makefile.am +++ b/src/dns/Makefile.am @@ -73,6 +73,7 @@ libgnunetdns_la_SOURCES = \ libgnunetdns_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la $(XLIB) libgnunetdns_la_LDFLAGS = \ + $(GN_LIBINTL) \ $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 @@ -82,6 +83,7 @@ libgnunet_plugin_block_dns_la_LIBADD = \ $(top_builddir)/src/block/libgnunetblockgroup.la \ $(top_builddir)/src/util/libgnunetutil.la libgnunet_plugin_block_dns_la_LDFLAGS = \ + $(GN_LIBINTL) \ $(top_builddir)/src/block/$(GN_PLUGIN_LDFLAGS) diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index 49e0750fa..253f67d29 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am @@ -228,6 +228,7 @@ libgnunetgns_la_LIBADD = \ $(top_builddir)/src/identity/libgnunetidentity.la \ $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la libgnunetgns_la_LDFLAGS = \ + $(GN_LIBINTL) \ $(GN_LIB_LDFLAGS) @@ -239,6 +240,7 @@ libgnunet_plugin_block_gns_la_LIBADD = \ $(top_builddir)/src/block/libgnunetblockgroup.la \ $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la libgnunet_plugin_block_gns_la_LDFLAGS = \ + $(GN_LIBINTL) \ $(GN_PLUGIN_LDFLAGS) if HAVE_MHD diff --git a/src/hello/Makefile.am b/src/hello/Makefile.am index 7cb71cdce..40a45320f 100644 --- a/src/hello/Makefile.am +++ b/src/hello/Makefile.am @@ -48,4 +48,5 @@ gnunet_hello_SOURCES = \ gnunet_hello_LDADD = \ libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la - +gnunet_hello_LDFLAGS = \ + $(GN_LIBINTL) diff --git a/src/json/Makefile.am b/src/json/Makefile.am index 886c0691d..5968a3596 100644 --- a/src/json/Makefile.am +++ b/src/json/Makefile.am @@ -10,6 +10,7 @@ lib_LTLIBRARIES = \ libgnunetjson.la libgnunetjson_la_LDFLAGS = \ + $(GN_LIBINTL) \ -version-info 0:0:0 \ -no-undefined libgnunetjson_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) diff --git a/src/nat-auto/Makefile.am b/src/nat-auto/Makefile.am index e42ce9491..48ea93d9f 100644 --- a/src/nat-auto/Makefile.am +++ b/src/nat-auto/Makefile.am @@ -20,13 +20,16 @@ gnunet_nat_server_SOURCES = \ gnunet_nat_server_LDADD = \ $(top_builddir)/src/nat/libgnunetnatnew.la \ $(top_builddir)/src/util/libgnunetutil.la +gnunet_nat_server_LDFLAGS = \ + $(GN_LIBINTL) gnunet_nat_auto_SOURCES = \ gnunet-nat-auto.c nat-auto.h gnunet_nat_auto_LDADD = \ libgnunetnatauto.la \ $(top_builddir)/src/util/libgnunetutil.la - +gnunet_nat_auto_LDFLAGS = \ + $(GN_LIBINTL) if USE_COVERAGE AM_CFLAGS = -fprofile-arcs -ftest-coverage diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am index 63a11f1fe..3eea5e2a4 100644 --- a/src/nat/Makefile.am +++ b/src/nat/Makefile.am @@ -42,6 +42,8 @@ gnunet_nat_SOURCES = \ gnunet_nat_LDADD = \ libgnunetnatnew.la \ $(top_builddir)/src/util/libgnunetutil.la +gnunet_nat_LDFLAGS = \ + $(GN_LIBINTL) if USE_COVERAGE diff --git a/src/nt/Makefile.am b/src/nt/Makefile.am index 57b8d1936..2c55ab88f 100644 --- a/src/nt/Makefile.am +++ b/src/nt/Makefile.am @@ -14,6 +14,7 @@ libgnunetnt_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la libgnunetnt_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) \ + $(GN_LIBINTL) \ -version-info 0:0:0 #if ENABLE_TEST_RUN diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am index 3c133427c..8a2efba63 100644 --- a/src/peerinfo-tool/Makefile.am +++ b/src/peerinfo-tool/Makefile.am @@ -37,13 +37,14 @@ libgnunet_plugin_rest_peerinfo_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) gnunet_peerinfo_SOURCES = \ gnunet-peerinfo.c \ gnunet-peerinfo_plugins.c gnunet-peerinfo_plugins.h - gnunet_peerinfo_LDADD = \ $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la +gnunet_peerinfo_LDFLAGS = \ + $(GN_LIBINTL) if HAVE_PYTHON check_SCRIPTS = \ diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am index 831162366..e61e5a13d 100644 --- a/src/peerinfo/Makefile.am +++ b/src/peerinfo/Makefile.am @@ -40,6 +40,8 @@ gnunet_service_peerinfo_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la +gnunet_service_peerinfo_LDFLAGS = \ + $(GN_LIBINTL) if HAVE_BENCHMARKS PEERINFO_BENCHMARKS = \ diff --git a/src/peerstore/Makefile.am b/src/peerstore/Makefile.am index 003bac36d..babf40654 100644 --- a/src/peerstore/Makefile.am +++ b/src/peerstore/Makefile.am @@ -45,6 +45,7 @@ libgnunetpeerstore_la_SOURCES = \ libgnunetpeerstore_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la libgnunetpeerstore_la_LDFLAGS = \ + $(GN_LIBINTL) \ $(GN_LIB_LDFLAGS) if HAVE_EXPERIMENTAL diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am index 2fd00dd09..13413f242 100644 --- a/src/regex/Makefile.am +++ b/src/regex/Makefile.am @@ -64,6 +64,7 @@ libgnunetregex_la_SOURCES = \ libgnunetregex_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la libgnunetregex_la_LDFLAGS = \ + $(GN_LIBINTL) \ $(GN_LIB_LDFLAGS) \ -version-info 3:1:0 @@ -79,6 +80,7 @@ libgnunet_plugin_block_regex_la_LIBADD = \ $(top_builddir)/src/block/libgnunetblockgroup.la \ $(top_builddir)/src/util/libgnunetutil.la libgnunet_plugin_block_regex_la_LDFLAGS = \ + $(GN_LIBINTL) \ $(GN_PLUGIN_LDFLAGS) if HAVE_MYSQL @@ -117,6 +119,8 @@ perf_regex_LDADD = -lm \ libgnunetregexblock.la \ libgnunetregextest.a \ $(top_builddir)/src/util/libgnunetutil.la +perf_regex_LDFLAGS = \ + $(GN_LIBINTL) gnunet_regex_profiler_SOURCES = \ gnunet-regex-profiler.c @@ -129,6 +133,8 @@ gnunet_regex_profiler_LDADD = -lm \ libgnunetregextest.a \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la +gnunet_regex_profiler_LDFLAGS = \ + $(GN_LIBINTL) gnunet_daemon_regexprofiler_SOURCES = \ gnunet-daemon-regexprofiler.c @@ -139,6 +145,8 @@ gnunet_daemon_regexprofiler_LDADD = -lm \ libgnunetregextest.a \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la +gnunet_daemon_regexprofiler_LDFLAGS = \ + $(GN_LIBINTL) check_PROGRAMS = \ test_regex_integration \ diff --git a/src/sq/Makefile.am b/src/sq/Makefile.am index 893c8eac3..80911db7a 100644 --- a/src/sq/Makefile.am +++ b/src/sq/Makefile.am @@ -18,6 +18,7 @@ libgnunetsq_la_SOURCES = \ libgnunetsq_la_LIBADD = -lsqlite3 \ $(top_builddir)/src/util/libgnunetutil.la libgnunetsq_la_LDFLAGS = \ + $(GN_LIBINTL) \ $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 diff --git a/src/testbed-logger/Makefile.am b/src/testbed-logger/Makefile.am index 96b68df27..741e4adfc 100644 --- a/src/testbed-logger/Makefile.am +++ b/src/testbed-logger/Makefile.am @@ -20,6 +20,8 @@ gnunet_service_testbed_logger_SOURCES = \ gnunet-service-testbed-logger.c gnunet_service_testbed_logger_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la +gnunet_service_testbed_logger_LDFLAGS = \ + $(GN_LIBINTL) lib_LTLIBRARIES = \ libgnunettestbedlogger.la diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am index c27a81ae9..62b49af78 100644 --- a/src/testbed/Makefile.am +++ b/src/testbed/Makefile.am @@ -59,6 +59,8 @@ gnunet_testbed_profiler_SOURCES = \ gnunet_testbed_profiler_LDADD = $(XLIB) \ $(top_builddir)/src/util/libgnunetutil.la \ libgnunettestbed.la +gnunet_testbed_profiler_LDFLAGS = \ + $(GN_LIBINTL) gnunet_helper_testbed_SOURCES = \ gnunet-helper-testbed.c diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index d776e99e4..e77220d50 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -166,7 +166,8 @@ libgnunettransporttesting2_la_LIBADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la libgnunettransporttesting2_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) + $(GN_LIBINTL) \ + $(GN_LIB_LDFLAGS) libgnunettransport_la_SOURCES = \ transport.h \ @@ -459,7 +460,8 @@ libgnunet_plugin_transport_http_client_la_LIBADD = \ $(LIB_GNURL) \ $(top_builddir)/src/util/libgnunetutil.la libgnunet_plugin_transport_http_client_la_LDFLAGS = \ - $(GN_PLUGIN_LDFLAGS) + $(GN_LIBINTL) \ + $(GN_PLUGIN_LDFLAGS) libgnunet_plugin_transport_http_client_la_CFLAGS = \ $(CPP_GNURL) $(AM_CFLAGS) @@ -474,6 +476,7 @@ libgnunet_plugin_transport_http_server_la_LIBADD = \ $(top_builddir)/src/nat/libgnunetnatnew.la \ $(top_builddir)/src/util/libgnunetutil.la libgnunet_plugin_transport_http_server_la_LDFLAGS = \ + $(GN_LIBINTL) \ $(GN_PLUGIN_LDFLAGS) libgnunet_plugin_transport_http_server_la_CFLAGS = \ $(MHD_CFLAGS) $(AM_CFLAGS) @@ -487,7 +490,8 @@ libgnunet_plugin_transport_https_client_la_LIBADD = \ $(LIB_GNURL) \ $(top_builddir)/src/util/libgnunetutil.la libgnunet_plugin_transport_https_client_la_LDFLAGS = \ - $(GN_PLUGIN_LDFLAGS) + $(GN_LIBINTL) \ + $(GN_PLUGIN_LDFLAGS) libgnunet_plugin_transport_https_client_la_CFLAGS = \ $(CPP_GNURL) $(AM_CFLAGS) -DBUILD_HTTPS @@ -502,6 +506,7 @@ libgnunet_plugin_transport_https_server_la_LIBADD = \ $(top_builddir)/src/nat/libgnunetnatnew.la \ $(top_builddir)/src/util/libgnunetutil.la libgnunet_plugin_transport_https_server_la_LDFLAGS = \ + $(GN_LIBINTL) \ $(GN_PLUGIN_LDFLAGS) libgnunet_plugin_transport_https_server_la_CFLAGS = \ $(MHD_CFLAGS) $(AM_CFLAGS) -DBUILD_HTTPS diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am index 407d8ba92..d1ecd9f98 100644 --- a/src/vpn/Makefile.am +++ b/src/vpn/Makefile.am @@ -56,4 +56,5 @@ libgnunetvpn_la_SOURCES = \ libgnunetvpn_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la $(XLIB) libgnunetvpn_la_LDFLAGS = \ + $(GN_LIBINTL) \ $(GN_LIB_LDFLAGS) -- 2.25.1