ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Karel Zak 2012-07-09 16:23:51 +02:00
parent 839be2ba6b
commit dcdb349be7
9 changed files with 79 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
disk-utils/Makemodule.am
View File

@ -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

6
fdisks/Makemodule.am
View File

@ -28,7 +28,7 @@ fdisk_SOURCES = \
fdisks/partname.c \
$(fdisk_common_sources)
fdisk_LDADD = libcommon.la
fdisk_LDADD = $(LDADD) libcommon.la
if BUILD_LIBBLKID
fdisk_CFLAGS = -I$(ul_libblkid_incdir)
@ -52,7 +52,7 @@ sfdisk_SOURCES = \
fdisks/partname.c \
fdisks/sfdisk.c \
$(fdisk_common_sources)
sfdisk_LDADD = libcommon.la
sfdisk_LDADD = $(LDADD) libcommon.la
if HAVE_STATIC_SFDISK
sbin_PROGRAMS += sfdisk.static
@ -67,7 +67,7 @@ sbin_PROGRAMS += cfdisk
dist_man_MANS += fdisks/cfdisk.8
cfdisk_SOURCES = fdisks/cfdisk.c $(fdisk_common_sources)
cfdisk_CFLAGS =
cfdisk_LDADD = libcommon.la
cfdisk_LDADD = $(LDADD) libcommon.la
if BUILD_LIBBLKID
cfdisk_CFLAGS += -I$(ul_libblkid_incdir)

14
login-utils/Makemodule.am
View File

@ -10,7 +10,7 @@ sbin_PROGRAMS += sulogin
dist_man_MANS += login-utils/sulogin.8
sulogin_SOURCES = \
login-utils/sulogin.c
sulogin_LDADD = libcommon.la
sulogin_LDADD = $(LDADD) libcommon.la
if HAVE_LIBCRYPT
sulogin_LDADD += -lcrypt
endif
@ -27,7 +27,7 @@ login_SOURCES = \
login-utils/login.c \
login-utils/logindefs.c \
login-utils/logindefs.h
login_LDADD = libcommon.la -lpam -lpam_misc
login_LDADD = $(LDADD) libcommon.la -lpam -lpam_misc
if HAVE_AUDIT
login_LDADD += -laudit
endif
@ -69,12 +69,12 @@ endif
chfn_SOURCES = login-utils/chfn.c $(chfn_chsh_sources)
chfn_CFLAGS = $(chfn_chsh_cflags)
chfn_LDFLAGS = $(chfn_chsh_ldflags)
chfn_LDADD = $(chfn_chsh_ldadd)
chfn_LDADD = $(LDADD) $(chfn_chsh_ldadd)
chsh_SOURCES = login-utils/chsh.c $(chfn_chsh_sources)
chsh_CFLAGS = $(chfn_chsh_cflags)
chsh_LDFLAGS = $(chfn_chsh_ldflags)
chsh_LDADD = $(chfn_chsh_ldadd)
chsh_LDADD = $(LDADD) $(chfn_chsh_ldadd)
endif # BUILD_CHFN_CHSH
@ -86,7 +86,7 @@ su_SOURCES = \
login-utils/logindefs.h
su_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
su_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
su_LDADD = -lpam -lpam_misc
su_LDADD = $(LDADD) -lpam -lpam_misc
endif
@ -96,7 +96,7 @@ dist_man_MANS += login-utils/newgrp.1
newgrp_SOURCES = login-utils/newgrp.c
newgrp_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
newgrp_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
newgrp_LDADD =
newgrp_LDADD = $(LDADD)
if HAVE_LIBCRYPT
newgrp_LDADD += -lcrypt
endif
@ -111,7 +111,7 @@ dist_man_MANS += \
vipw_SOURCES = \
login-utils/vipw.c \
login-utils/setpwnam.h
vipw_LDADD = libcommon.la
vipw_LDADD = $(LDADD) libcommon.la
if HAVE_SELINUX
vipw_LDADD += -lselinux
endif

20
misc-utils/Makemodule.am
View File

@ -10,7 +10,7 @@ if !HAVE_LANGINFO
cal_SOURCES += lib/langinfo.c
endif
cal_LDADD =
cal_LDADD = $(LDADD)
if HAVE_TINFO
cal_LDADD += -ltinfo @NCURSES_LIBS@
@ -75,7 +75,7 @@ if BUILD_LSBLK
bin_PROGRAMS += lsblk
dist_man_MANS += misc-utils/lsblk.8
lsblk_SOURCES = misc-utils/lsblk.c
lsblk_LDADD = libblkid.la libmount.la libcommon.la
lsblk_LDADD = $(LDADD) libblkid.la libmount.la libcommon.la
lsblk_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -I$(ul_libmount_incdir)
if HAVE_UDEV
lsblk_LDADD += -ludev
@ -86,14 +86,14 @@ if BUILD_LIBUUID
usrbin_exec_PROGRAMS += uuidgen
dist_man_MANS += misc-utils/uuidgen.1
uuidgen_SOURCES = misc-utils/uuidgen.c
uuidgen_LDADD = libuuid.la
uuidgen_LDADD = $(LDADD) libuuid.la
uuidgen_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_incdir)
endif
if BUILD_UUIDD
usrsbin_exec_PROGRAMS += uuidd
dist_man_MANS += misc-utils/uuidd.8
uuidd_LDADD = libuuid.la
uuidd_LDADD = $(LDADD) libuuid.la
uuidd_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_incdir)
uuidd_SOURCES = misc-utils/uuidd.c
if USE_SOCKET_ACTIVATION
@ -118,26 +118,26 @@ if BUILD_LIBBLKID
sbin_PROGRAMS += blkid
dist_man_MANS += misc-utils/blkid.8
blkid_SOURCES = misc-utils/blkid.c
blkid_LDADD = libblkid.la libcommon.la
blkid_LDADD = $(LDADD) libblkid.la libcommon.la
blkid_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
sbin_PROGRAMS += findfs
dist_man_MANS += misc-utils/findfs.8
findfs_LDADD = libblkid.la
findfs_LDADD = $(LDADD) libblkid.la
findfs_SOURCES = misc-utils/findfs.c
findfs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
sbin_PROGRAMS += wipefs
dist_man_MANS += misc-utils/wipefs.8
wipefs_SOURCES = misc-utils/wipefs.c
wipefs_LDADD = libblkid.la libcommon.la
wipefs_LDADD = $(LDADD) libblkid.la libcommon.la
wipefs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
if HAVE_STATIC_BLKID
sbin_PROGRAMS += blkid.static
blkid_static_SOURCES = $(blkid_SOURCES)
blkid_static_LDFLAGS = -all-static
blkid_static_LDADD = libblkid.la
blkid_static_LDADD = $(LDADD) libblkid.la
blkid_static_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
endif
endif # BUILD_LIBBLKID
@ -146,7 +146,7 @@ endif # BUILD_LIBBLKID
if BUILD_LIBMOUNT
bin_PROGRAMS += findmnt
dist_man_MANS += misc-utils/findmnt.8
findmnt_LDADD = libmount.la libcommon.la
findmnt_LDADD = $(LDADD) libmount.la libcommon.la
findmnt_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
findmnt_SOURCES = misc-utils/findmnt.c
endif # BUILD_LIBMOUNT
@ -158,7 +158,7 @@ kill_SOURCES = \
misc-utils/kill.c \
misc-utils/kill.h \
misc-utils/procs.c
kill_LDADD = libcommon.la
kill_LDADD = $(LDADD) libcommon.la
dist_man_MANS += misc-utils/kill.1
endif

8
mount-deprecated/Makemodule.am
View File

@ -23,7 +23,7 @@ dist_man_MANS += mount-deprecated/mount.8
mount_SOURCES = mount-deprecated/mount.c $(mount_common_sources)
mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) -I$(ul_libblkid_incdir)
mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
mount_LDADD = libblkid.la libcommon.la
mount_LDADD = $(LDADD) libblkid.la libcommon.la
if HAVE_SELINUX
mount_LDADD += $(SELINUX_LIBS)
@ -34,7 +34,7 @@ bin_PROGRAMS += mount.static
mount_static_SOURCES = $(mount_SOURCES)
mount_static_CFLAGS = $(mount_CFLAGS)
mount_static_LDFLAGS = -all-static
mount_static_LDADD = libblkid.la libcommon.la
mount_static_LDADD = $(LDADD) libblkid.la libcommon.la
if HAVE_SELINUX
mount_static_LDADD += $(SELINUX_LIBS_STATIC)
endif
@ -48,14 +48,14 @@ dist_man_MANS += mount-deprecated/umount.8
umount_SOURCES = mount-deprecated/umount.c $(mount_common_sources)
umount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) -I$(ul_libblkid_incdir)
umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
umount_LDADD = libblkid.la libcommon.la
umount_LDADD = $(LDADD) libblkid.la libcommon.la
if HAVE_STATIC_UMOUNT
bin_PROGRAMS += umount.static
umount_static_SOURCES = $(umount_SOURCES)
umount_static_CFLAGS = $(umount_CFLAGS)
umount_static_LDFLAGS = -all-static
umount_static_LDADD = libblkid.la libcommon.la
umount_static_LDADD = $(LDADD) libblkid.la libcommon.la
endif

6
schedutils/Makemodule.am
View File

@ -3,20 +3,20 @@ if BUILD_SCHEDUTILS
usrbin_exec_PROGRAMS += chrt
dist_man_MANS += schedutils/chrt.1
chrt_SOURCES = schedutils/chrt.c
chrt_LDADD = libcommon.la
chrt_LDADD = $(LDADD) libcommon.la
if BUILD_IONICE
usrbin_exec_PROGRAMS += ionice
dist_man_MANS += schedutils/ionice.1
ionice_SOURCES = schedutils/ionice.c
ionice_LDADD = libcommon.la
ionice_LDADD = $(LDADD) libcommon.la
endif
if BUILD_TASKSET
usrbin_exec_PROGRAMS += taskset
dist_man_MANS += schedutils/taskset.1
taskset_SOURCES = schedutils/taskset.c
taskset_LDADD = libcommon.la
taskset_LDADD = $(LDADD) libcommon.la
endif
endif # BUILD_SCHEDUTILS

42
sys-utils/Makemodule.am
View File

@ -2,17 +2,17 @@
usrbin_exec_PROGRAMS += flock
dist_man_MANS += sys-utils/flock.1
flock_SOURCES = sys-utils/flock.c
flock_LDADD = libcommon.la
flock_LDADD = $(LDADD) libcommon.la
usrbin_exec_PROGRAMS += ipcmk
dist_man_MANS += sys-utils/ipcmk.1
ipcmk_SOURCES = sys-utils/ipcmk.c
ipcmk_LDADD = libcommon.la
ipcmk_LDADD = $(LDADD) libcommon.la
usrbin_exec_PROGRAMS += ipcrm
dist_man_MANS += sys-utils/ipcrm.1
ipcrm_SOURCES = sys-utils/ipcrm.c
ipcrm_LDADD = libcommon.la
ipcrm_LDADD = $(LDADD) libcommon.la
usrbin_exec_PROGRAMS += ipcs
dist_man_MANS += sys-utils/ipcs.1
@ -39,7 +39,7 @@ if LINUX
bin_PROGRAMS += dmesg
dist_man_MANS += sys-utils/dmesg.1
dmesg_SOURCES = sys-utils/dmesg.c
dmesg_LDADD = libcommon.la
dmesg_LDADD = $(LDADD) libcommon.la
sbin_PROGRAMS += ctrlaltdel
dist_man_MANS += sys-utils/ctrlaltdel.8
@ -52,17 +52,17 @@ fsfreeze_SOURCES = sys-utils/fsfreeze.c
sbin_PROGRAMS += fstrim
dist_man_MANS += sys-utils/fstrim.8
fstrim_SOURCES = sys-utils/fstrim.c
fstrim_LDADD = libcommon.la
fstrim_LDADD = $(LDADD) libcommon.la
usrbin_exec_PROGRAMS += cytune
dist_man_MANS += sys-utils/cytune.8
cytune_SOURCES = sys-utils/cytune.c sys-utils/cyclades.h
cytune_LDADD = libcommon.la
cytune_LDADD = $(LDADD) libcommon.la
usrsbin_exec_PROGRAMS += ldattach
dist_man_MANS += sys-utils/ldattach.8
ldattach_SOURCES = sys-utils/ldattach.c
ldattach_LDADD = libcommon.la
ldattach_LDADD = $(LDADD) libcommon.la
usrsbin_exec_PROGRAMS += tunelp
dist_man_MANS += sys-utils/tunelp.8
@ -71,7 +71,7 @@ tunelp_SOURCES = sys-utils/tunelp.c sys-utils/lp.h
usrsbin_exec_PROGRAMS += rtcwake
dist_man_MANS += sys-utils/rtcwake.8
rtcwake_SOURCES = sys-utils/rtcwake.c
rtcwake_LDADD = libcommon.la
rtcwake_LDADD = $(LDADD) libcommon.la
usrbin_exec_PROGRAMS += setarch
dist_man_MANS += sys-utils/setarch.8
@ -130,7 +130,7 @@ endif # LINUX
if BUILD_EJECT
usrbin_exec_PROGRAMS += eject
eject_SOURCES = sys-utils/eject.c
eject_LDADD = libmount.la libcommon.la
eject_LDADD = $(LDADD) libmount.la libcommon.la
eject_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
dist_man_MANS += sys-utils/eject.1
endif
@ -140,7 +140,7 @@ if BUILD_LOSETUP
sbin_PROGRAMS += losetup
dist_man_MANS += sys-utils/losetup.8
losetup_SOURCES = sys-utils/losetup.c
losetup_LDADD = libcommon.la
losetup_LDADD = $(LDADD) libcommon.la
if HAVE_STATIC_LOSETUP
bin_PROGRAMS += losetup.static
@ -155,7 +155,7 @@ if BUILD_PRLIMIT
usrbin_exec_PROGRAMS += prlimit
dist_man_MANS += sys-utils/prlimit.1
prlimit_SOURCES = sys-utils/prlimit.c
prlimit_LDADD = libcommon.la
prlimit_LDADD = $(LDADD) libcommon.la
endif
@ -170,12 +170,12 @@ dist_man_MANS += \
sys-utils/fstab.5 \
mount-deprecated/umount.8
mount_SOURCES = sys-utils/mount.c
mount_LDADD = libcommon.la libmount.la $(SELINUX_LIBS)
mount_LDADD = $(LDADD) libcommon.la libmount.la $(SELINUX_LIBS)
mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) -I$(ul_libmount_incdir)
mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
umount_SOURCES = sys-utils/umount.c
umount_LDADD = libcommon.la libmount.la
umount_LDADD = $(LDADD) libcommon.la libmount.la
umount_CFLAGS = $(AM_CFLAGS) $(SUID_CFLAGS) -I$(ul_libmount_incdir)
umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
@ -217,24 +217,24 @@ swapon_SOURCES = \
sys-utils/swapon-common.h
swapon_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
swapon_LDADD = libcommon.la libmount.la
swapon_LDADD = $(LDADD) libcommon.la libmount.la
swapoff_SOURCES = sys-utils/swapoff.c sys-utils/swapon-common.c
swapoff_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
swapoff_LDADD = libmount.la
swapoff_LDADD = $(LDADD) libmount.la
endif
if BUILD_LSCPU
usrbin_exec_PROGRAMS += lscpu
lscpu_SOURCES = sys-utils/lscpu.c
lscpu_LDADD = libcommon.la
lscpu_LDADD = $(LDADD) libcommon.la
dist_man_MANS += sys-utils/lscpu.1
endif
if BUILD_CHCPU
sbin_PROGRAMS += chcpu
chcpu_SOURCES = sys-utils/chcpu.c
chcpu_LDADD = libcommon.la
chcpu_LDADD = $(LDADD) libcommon.la
dist_man_MANS += sys-utils/chcpu.8
endif
@ -242,12 +242,12 @@ if BUILD_WDCTL
bin_PROGRAMS += wdctl
dist_man_MANS += sys-utils/wdctl.8
wdctl_SOURCES = sys-utils/wdctl.c
wdctl_LDADD = libcommon.la
wdctl_LDADD = $(LDADD) libcommon.la
endif
if BUILD_MOUNTPOINT
bin_PROGRAMS += mountpoint
mountpoint_LDADD = libmount.la
mountpoint_LDADD = $(LDADD) libmount.la
mountpoint_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
dist_man_MANS += sys-utils/mountpoint.1
mountpoint_SOURCES = sys-utils/mountpoint.c
@ -256,7 +256,7 @@ endif
if BUILD_FALLOCATE
usrbin_exec_PROGRAMS += fallocate
fallocate_SOURCES = sys-utils/fallocate.c
fallocate_LDADD = libcommon.la
fallocate_LDADD = $(LDADD) libcommon.la
dist_man_MANS += sys-utils/fallocate.1
endif
@ -295,7 +295,7 @@ hwclock_SOURCES = \
if LINUX
hwclock_SOURCES += sys-utils/hwclock-rtc.c
endif
hwclock_LDADD = libcommon.la
hwclock_LDADD = $(LDADD) libcommon.la
if HAVE_AUDIT
hwclock_LDADD += -laudit
endif

10
term-utils/Makemodule.am
View File

@ -2,7 +2,7 @@
usrbin_exec_PROGRAMS += script
dist_man_MANS += term-utils/script.1
script_SOURCES = term-utils/script.c
script_LDADD =
script_LDADD = $(LDADD)
if HAVE_UTIL
script_LDADD += -lutil
endif
@ -20,7 +20,7 @@ if BUILD_AGETTY
sbin_PROGRAMS += agetty
dist_man_MANS += term-utils/agetty.8
agetty_SOURCES = term-utils/agetty.c
agetty_LDADD = libcommon.la
agetty_LDADD = $(LDADD) libcommon.la
endif # BUILD_AGETTY
@ -32,9 +32,9 @@ dist_man_MANS += term-utils/setterm.1
setterm_SOURCES = term-utils/setterm.c
endif
if HAVE_TINFO
setterm_LDADD = -ltinfo
setterm_LDADD = $(LDADD) -ltinfo
else
setterm_LDADD = @NCURSES_LIBS@
setterm_LDADD = $(LDADD) @NCURSES_LIBS@
endif
endif
@ -62,7 +62,7 @@ wall_SOURCES = \
dist_man_MANS += term-utils/wall.1
wall_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
wall_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
wall_LDADD = libcommon.la
wall_LDADD = $(LDADD) libcommon.la
if USE_TTY_GROUP
if MAKEINSTALL_DO_CHOWN
install-exec-hook-wall::

24
text-utils/Makemodule.am
View File

@ -18,15 +18,15 @@ dist_man_MANS += \
text-utils/tailf.1
col_SOURCES = text-utils/col.c
col_LDADD = libcommon.la
col_LDADD = $(LDADD) libcommon.la
colcrt_SOURCES = text-utils/colcrt.c
colrm_SOURCES = text-utils/colrm.c
colrm_LDADD = libcommon.la
colrm_LDADD = $(LDADD) libcommon.la
column_SOURCES = text-utils/column.c
column_LDADD = libcommon.la
column_LDADD = $(LDADD) libcommon.la
hexdump_SOURCES = \
text-utils/conv.c \
@ -35,12 +35,12 @@ hexdump_SOURCES = \
text-utils/hexdump.h \
text-utils/hexsyntax.c \
text-utils/parse.c
hexdump_LDADD = libcommon.la
hexdump_LDADD = $(LDADD) libcommon.la
rev_SOURCES = text-utils/rev.c
tailf_SOURCES = text-utils/tailf.c
tailf_LDADD = libcommon.la
tailf_LDADD = $(LDADD) libcommon.la
if BUILD_LINE
usrbin_exec_PROGRAMS += line
@ -58,13 +58,13 @@ ul_SOURCES = text-utils/ul.c
pg_SOURCES = text-utils/pg.c
if HAVE_TINFO
more_LDADD = -ltinfo
pg_LDADD = -ltinfo @NCURSES_LIBS@
ul_LDADD = -ltinfo
more_LDADD = $(LDADD) -ltinfo
pg_LDADD = $(LDADD) -ltinfo @NCURSES_LIBS@
ul_LDADD = $(LDADD) -ltinfo
else
more_LDADD = @NCURSES_LIBS@
pg_LDADD = @NCURSES_LIBS@
ul_LDADD = @NCURSES_LIBS@
more_LDADD = $(LDADD) @NCURSES_LIBS@
pg_LDADD = $(LDADD) @NCURSES_LIBS@
ul_LDADD = $(LDADD) @NCURSES_LIBS@
endif
dist_man_MANS += \
@ -75,7 +75,7 @@ else
if HAVE_TERMCAP
bin_PROGRAMS += more
more_SOURCES = text-utils/more.c
more_LDADD = -ltermcap
more_LDADD = $(LDADD) -ltermcap
dist_man_MANS += text-utils/more.1
endif
endif # !HAVE_NCURSES