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>

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

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)

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

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

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)

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)
 

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

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
 
 

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