diff options
| author | Ruediger Meier | 2016-02-22 19:48:30 +0100 |
|---|---|---|
| committer | Ruediger Meier | 2016-02-23 01:16:58 +0100 |
| commit | b201f1d86c871f2cf3e9f9f96a6d72f363aa1947 (patch) | |
| tree | 9bba4512973c478c98168a9fac33b51d01266e65 /libblkid | |
| parent | libsmartcols: fix scols_table_print_range() to print header (diff) | |
| download | kernel-qcow2-util-linux-b201f1d86c871f2cf3e9f9f96a6d72f363aa1947.tar.gz kernel-qcow2-util-linux-b201f1d86c871f2cf3e9f9f96a6d72f363aa1947.tar.xz kernel-qcow2-util-linux-b201f1d86c871f2cf3e9f9f96a6d72f363aa1947.zip | |
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>
Diffstat (limited to 'libblkid')
| -rw-r--r-- | libblkid/samples/Makemodule.am | 8 | ||||
| -rw-r--r-- | libblkid/src/Makemodule.am | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libblkid/samples/Makemodule.am b/libblkid/samples/Makemodule.am index 0ffbf1477..e92049f04 100644 --- 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 1d03d92d6..5018de492 100644 --- 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 |