build-sys: always use global LDADD

This was a major showstopper when building on a system where
LTLIBINTL libs are needed (e.g. OSX). Maybe there are a few test
programs which wouldn't need LDADD ... never mind.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index 8e1fea25e4ea315167edfd5d564e8d78640c519e..152190b78b413956c10741dd60f8323438cfb7f6 100644 (file)
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -78,15 +78,15 @@ endif
 
 test_ttyutils_SOURCES = lib/ttyutils.c
 test_ttyutils_CFLAGS = -DTEST_PROGRAM
-test_ttyutils_LDADD = libcommon.la
+test_ttyutils_LDADD = $(LDADD) libcommon.la
 
 test_blkdev_SOURCES = lib/blkdev.c
 test_blkdev_CFLAGS = -DTEST_PROGRAM_BLKDEV
-test_blkdev_LDADD = libcommon.la
+test_blkdev_LDADD = $(LDADD) libcommon.la
 
 test_ismounted_SOURCES = lib/ismounted.c
 test_ismounted_CFLAGS = -DTEST_PROGRAM
-test_ismounted_LDADD = libcommon.la
+test_ismounted_LDADD = $(LDADD) libcommon.la
 
 test_mangle_SOURCES = lib/mangle.c
 test_mangle_CFLAGS = -DTEST_PROGRAM
@@ -113,7 +113,7 @@ test_cpuset_CFLAGS = -DTEST_PROGRAM
 
 test_sysfs_SOURCES = lib/sysfs.c
 test_sysfs_CFLAGS = -DTEST_PROGRAM_SYSFS
-test_sysfs_LDADD = libcommon.la
+test_sysfs_LDADD = $(LDADD) libcommon.la
 
 test_pager_SOURCES = lib/pager.c
 test_pager_CFLAGS = -DTEST_PROGRAM

diff --git a/libblkid/samples/Makemodule.am b/libblkid/samples/Makemodule.am
index 0ffbf14773c8b0f82c04fb47517bc9f82a794634..e92049f0429e016375bfd10ef3f3ba219cb49bea 100644 (file)
--- a/libblkid/samples/Makemodule.am
+++ b/libblkid/samples/Makemodule.am
@@ -6,17 +6,17 @@ check_PROGRAMS += \
        sample-topology
 
 sample_mkfs_SOURCES = libblkid/samples/mkfs.c
-sample_mkfs_LDADD = libblkid.la
+sample_mkfs_LDADD = $(LDADD) libblkid.la
 sample_mkfs_CFLAGS = -I$(ul_libblkid_incdir)
 
 sample_partitions_SOURCES = libblkid/samples/partitions.c
-sample_partitions_LDADD = libblkid.la
+sample_partitions_LDADD = $(LDADD) libblkid.la
 sample_partitions_CFLAGS = -I$(ul_libblkid_incdir)
 
 sample_superblocks_SOURCES = libblkid/samples/superblocks.c
-sample_superblocks_LDADD = libblkid.la
+sample_superblocks_LDADD = $(LDADD) libblkid.la
 sample_superblocks_CFLAGS = -I$(ul_libblkid_incdir)
 
 sample_topology_SOURCES = libblkid/samples/topology.c
-sample_topology_LDADD = libblkid.la
+sample_topology_LDADD = $(LDADD) libblkid.la
 sample_topology_CFLAGS = -I$(ul_libblkid_incdir)

diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am
index 1d03d92d631ccf21faf491a4f3df1e2df242bcad..5018de4928b85bf244482584318a448c19cec118 100644 (file)
--- a/libblkid/src/Makemodule.am
+++ b/libblkid/src/Makemodule.am
@@ -158,7 +158,7 @@ blkid_tests_ldadd   = libblkid.la
 
 if BUILD_LIBUUID
 blkid_tests_ldflags += libuuid.la
-blkid_tests_ldadd   += $(UUID_LIBS)
+blkid_tests_ldadd   += $(LDADD) $(UUID_LIBS)
 endif
 
 blkid_tests_ldflags += -static

diff --git a/libfdisk/src/Makemodule.am b/libfdisk/src/Makemodule.am
index 69a3f3e34b750581caf59fcacb77b29a96a222ee..f8a5cb19cbbe9a3f29ecdf12cd6870661ef24a9d 100644 (file)
--- a/libfdisk/src/Makemodule.am
+++ b/libfdisk/src/Makemodule.am
@@ -73,7 +73,7 @@ check_PROGRAMS += \
 
 libfdisk_tests_cflags  = -DTEST_PROGRAM $(libfdisk_la_CFLAGS)
 libfdisk_tests_ldflags = libuuid.la -static
-libfdisk_tests_ldadd   = libfdisk.la $(UUID_LIBS)
+libfdisk_tests_ldadd   = $(LDADD) libfdisk.la $(UUID_LIBS)
 
 if BUILD_LIBBLKID
 libfdisk_tests_ldflags += libblkid.la

diff --git a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am
index 36bb00c565c90988539dbab234761dce4272c4c2..9ff15823ac52eca6f525a97e72a1c8a7c01af6e6 100644 (file)
--- a/libmount/src/Makemodule.am
+++ b/libmount/src/Makemodule.am
@@ -86,7 +86,7 @@ check_PROGRAMS += \
 
 libmount_tests_cflags  = -DTEST_PROGRAM $(libmount_la_CFLAGS)
 libmount_tests_ldflags = libblkid.la -static
-libmount_tests_ldadd   = libmount.la $(UUID_LIBS) $(REALTIME_LIBS)
+libmount_tests_ldadd   = $(LDADD) libmount.la $(UUID_LIBS) $(REALTIME_LIBS)
 
 if HAVE_SELINUX
 libmount_tests_ldadd += $(SELINUX_LIBS)

diff --git a/libsmartcols/samples/Makemodule.am b/libsmartcols/samples/Makemodule.am
index 9c8869208ce7eceb2b9fa8cc63815109c7100b95..0a351e3d0e7b61b0fa52f72afd086518b825acc6 100644 (file)
--- a/libsmartcols/samples/Makemodule.am
+++ b/libsmartcols/samples/Makemodule.am
@@ -6,18 +6,18 @@ check_PROGRAMS += \
        sample-scols-continuous
 
 sample_scols_tree_SOURCES = libsmartcols/samples/tree.c
-sample_scols_tree_LDADD = libsmartcols.la libcommon.la
+sample_scols_tree_LDADD = $(LDADD) libsmartcols.la libcommon.la
 sample_scols_tree_CFLAGS = -I$(ul_libsmartcols_incdir)
 
 sample_scols_title_SOURCES = libsmartcols/samples/title.c
-sample_scols_title_LDADD = libsmartcols.la
+sample_scols_title_LDADD = $(LDADD) libsmartcols.la
 sample_scols_title_CFLAGS = -I$(ul_libsmartcols_incdir)
 
 sample_scols_wrap_SOURCES = libsmartcols/samples/wrap.c
-sample_scols_wrap_LDADD = libsmartcols.la
+sample_scols_wrap_LDADD = $(LDADD) libsmartcols.la
 sample_scols_wrap_CFLAGS = -I$(ul_libsmartcols_incdir)
 
 sample_scols_continuous_SOURCES = libsmartcols/samples/continuous.c
-sample_scols_continuous_LDADD = libsmartcols.la libcommon.la
+sample_scols_continuous_LDADD = $(LDADD) libsmartcols.la libcommon.la
 sample_scols_continuous_CFLAGS = -I$(ul_libsmartcols_incdir)
 

diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am
index dc8d8672a2f1fa6a75c7ce1bf14bfca219857365..0efa803c0878a177ddd9eb41c3ae841c36cb15c0 100644 (file)
--- a/libuuid/src/Makemodule.am
+++ b/libuuid/src/Makemodule.am
@@ -1,7 +1,7 @@
 
 check_PROGRAMS += test_uuid_parser
 test_uuid_parser_SOURCES = libuuid/src/test_uuid.c
-test_uuid_parser_LDADD = libuuid.la $(SOCKET_LIBS)
+test_uuid_parser_LDADD = $(LDADD) libuuid.la $(SOCKET_LIBS)
 test_uuid_parser_CFLAGS = -I$(ul_libuuid_incdir)
 
 # includes

diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am
index fb58b46cd598720b5e4615512367bcead2acce53..8794c262c82611149b4f9d2205bff9d562e1a442 100644 (file)
--- a/login-utils/Makemodule.am
+++ b/login-utils/Makemodule.am
@@ -32,7 +32,7 @@ endif
 check_PROGRAMS += test_consoles
 test_consoles_SOURCES = login-utils/sulogin-consoles.c
 test_consoles_CFLAGS = -DTEST_PROGRAM
-test_consoles_LDADD = libcommon.la
+test_consoles_LDADD = $(LDADD) libcommon.la
 endif # BUILD_SULOGIN
 
 

diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am
index f49200312c9bc29de9f2982de706f087bbbb31b8..8e16b80a2d6065af73c8af8772d83cbbb0bad064 100644 (file)
--- a/misc-utils/Makemodule.am
+++ b/misc-utils/Makemodule.am
@@ -19,8 +19,9 @@ if BUILD_LOGGER
 usrbin_exec_PROGRAMS += logger
 dist_man_MANS += misc-utils/logger.1
 logger_SOURCES = misc-utils/logger.c lib/strutils.c lib/strv.c
+logger_LDADD = $(LDADD)
 if HAVE_SYSTEMD
-logger_LDADD = $(SYSTEMD_LIBS) $(SYSTEMD_DAEMON_LIBS) $(SYSTEMD_JOURNAL_LIBS)
+logger_LDADD += $(SYSTEMD_LIBS) $(SYSTEMD_DAEMON_LIBS) $(SYSTEMD_JOURNAL_LIBS)
 logger_CFLAGS = $(SYSTEMD_CFLAGS) $(SYSTEMD_DAEMON_CFLAGS) $(SYSTEMD_JOURNAL_CFLAGS)
 endif