From dcdb349be73f7223962f55e4f2e74583f5b78687 Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Mon, 9 Jul 2012 16:23:51 +0200
Subject: build-sys: always use default $(LDADD)

The global variable $(LDADD) is always used if program_LDADD is
not specified. Let's use $LDADD everywhere to avoid exceptions for
people who need to specify global $LDADD.

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 disk-utils/Makemodule.am | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'disk-utils/Makemodule.am')

diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am
index 0dbb25313..830e8f72f 100644
--- a/disk-utils/Makemodule.am
+++ b/disk-utils/Makemodule.am
@@ -5,14 +5,14 @@ fsck_minix_SOURCES = \
 	disk-utils/fsck.minix.c \
 	disk-utils/minix_programs.h \
 	lib/ismounted.c
-fsck_minix_LDADD = libcommon.la
+fsck_minix_LDADD = $(LDADD) libcommon.la
 
 sbin_PROGRAMS += mkfs.minix
 dist_man_MANS += disk-utils/mkfs.minix.8
 mkfs_minix_SOURCES = \
 	disk-utils/minix_programs.h \
 	disk-utils/mkfs.minix.c
-mkfs_minix_LDADD = libcommon.la
+mkfs_minix_LDADD = $(LDADD) libcommon.la
 
 sbin_PROGRAMS += mkfs
 dist_man_MANS += disk-utils/mkfs.8
@@ -21,19 +21,19 @@ mkfs_SOURCES = disk-utils/mkfs.c
 usrbin_exec_PROGRAMS += isosize
 dist_man_MANS += disk-utils/isosize.8
 isosize_SOURCES = disk-utils/isosize.c
-isosize_LDADD = libcommon.la
+isosize_LDADD = $(LDADD) libcommon.la
 
 sbin_PROGRAMS += mkfs.bfs
 dist_man_MANS += disk-utils/mkfs.bfs.8
 mkfs_bfs_SOURCES = \
 	disk-utils/mkfs.bfs.c
-mkfs_bfs_LDADD = libcommon.la
+mkfs_bfs_LDADD = $(LDADD) libcommon.la
 
 sbin_PROGRAMS += mkswap
 dist_man_MANS += disk-utils/mkswap.8
 mkswap_SOURCES = \
 	disk-utils/mkswap.c
-mkswap_LDADD = libcommon.la
+mkswap_LDADD = $(LDADD) libcommon.la
 
 mkswap_CFLAGS = $(AM_CFLAGS)
 if BUILD_LIBUUID
@@ -55,7 +55,7 @@ dist_man_MANS += disk-utils/swaplabel.8
 swaplabel_SOURCES = disk-utils/swaplabel.c
 
 swaplabel_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
-swaplabel_LDADD = libblkid.la libcommon.la
+swaplabel_LDADD = $(LDADD) libblkid.la libcommon.la
 
 if BUILD_LIBUUID
 swaplabel_LDADD += libuuid.la
@@ -68,7 +68,7 @@ if BUILD_FSCK
 sbin_PROGRAMS += fsck
 dist_man_MANS += disk-utils/fsck.8
 fsck_SOURCES = disk-utils/fsck.c
-fsck_LDADD = libmount.la libblkid.la
+fsck_LDADD = $(LDADD) libmount.la libblkid.la
 fsck_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) -I$(ul_libblkid_incdir)
 endif
 
@@ -77,7 +77,7 @@ if BUILD_ELVTUNE
 sbin_PROGRAMS += elvtune
 dist_man_MANS += disk-utils/elvtune.8
 elvtune_SOURCES = disk-utils/elvtune.c
-elvtune_LDADD = libcommon.la
+elvtune_LDADD = $(LDADD) libcommon.la
 endif
 
 
@@ -92,11 +92,11 @@ if BUILD_CRAMFS
 cramfs_common_sources = disk-utils/cramfs.h disk-utils/cramfs_common.c
 sbin_PROGRAMS += fsck.cramfs
 fsck_cramfs_SOURCES = disk-utils/fsck.cramfs.c $(cramfs_common_sources)
-fsck_cramfs_LDADD = -lz libcommon.la
+fsck_cramfs_LDADD = $(LDADD) -lz libcommon.la
 
 sbin_PROGRAMS += mkfs.cramfs
 mkfs_cramfs_SOURCES = disk-utils/mkfs.cramfs.c $(cramfs_common_sources)
-mkfs_cramfs_LDADD = -lz libcommon.la
+mkfs_cramfs_LDADD = $(LDADD) -lz libcommon.la
 endif
 
 
@@ -104,7 +104,7 @@ if LINUX
 sbin_PROGRAMS += blockdev
 dist_man_MANS += disk-utils/blockdev.8
 blockdev_SOURCES = disk-utils/blockdev.c
-blockdev_LDADD = libcommon.la
+blockdev_LDADD = $(LDADD) libcommon.la
 
 usrsbin_exec_PROGRAMS += fdformat
 dist_man_MANS += disk-utils/fdformat.8
@@ -123,17 +123,17 @@ dist_man_MANS += \
 addpart_SOURCES = \
 	disk-utils/addpart.c \
 	disk-utils/partx.h
-addpart_LDADD = libcommon.la
+addpart_LDADD = $(LDADD) libcommon.la
 
 delpart_SOURCES = \
 	disk-utils/delpart.c \
 	disk-utils/partx.h
-delpart_LDADD = libcommon.la
+delpart_LDADD = $(LDADD) libcommon.la
 
 partx_SOURCES = \
 	disk-utils/partx.c \
 	disk-utils/partx.h
 partx_CFLAGS = -I$(ul_libblkid_incdir)
-partx_LDADD = libblkid.la libcommon.la
+partx_LDADD = $(LDADD) libblkid.la libcommon.la
 
 endif # BUILD_PARTX
-- 
cgit v1.2.3-55-g7522