diff options
| -rw-r--r-- | disk-utils/Makemodule.am | 78 | ||||
| -rw-r--r-- | fdisks/Makemodule.am | 25 | ||||
| -rw-r--r-- | lib/Makemodule.am | 55 | ||||
| -rw-r--r-- | libblkid/src/Makemodule.am | 12 | ||||
| -rw-r--r-- | libmount/src/Makemodule.am | 11 | ||||
| -rw-r--r-- | login-utils/Makemodule.am | 23 | ||||
| -rw-r--r-- | misc-utils/Makemodule.am | 42 | ||||
| -rw-r--r-- | mount-deprecated/Makemodule.am | 64 | ||||
| -rw-r--r-- | schedutils/Makemodule.am | 23 | ||||
| -rw-r--r-- | sys-utils/Makemodule.am | 114 | ||||
| -rw-r--r-- | term-utils/Makemodule.am | 11 | ||||
| -rw-r--r-- | text-utils/Makemodule.am | 25 |
12 files changed, 183 insertions, 300 deletions
diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am index 48506980c..381243246 100644 --- a/disk-utils/Makemodule.am +++ b/disk-utils/Makemodule.am @@ -1,24 +1,18 @@ -lib_blkdev_sources = lib/blkdev.c -if LINUX -lib_blkdev_sources += lib/linux_version.c -endif - - sbin_PROGRAMS += fsck.minix dist_man_MANS += disk-utils/fsck.minix.8 fsck_minix_SOURCES = \ disk-utils/fsck.minix.c \ disk-utils/minix_programs.h \ lib/ismounted.c +fsck_minix_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 \ - lib/strutils.c \ - $(lib_blkdev_sources) + disk-utils/mkfs.minix.c +mkfs_minix_LDADD = libcommon.la sbin_PROGRAMS += mkfs dist_man_MANS += disk-utils/mkfs.8 @@ -26,26 +20,22 @@ mkfs_SOURCES = disk-utils/mkfs.c usrbin_exec_PROGRAMS += isosize dist_man_MANS += disk-utils/isosize.8 -isosize_SOURCES = disk-utils/isosize.c lib/strutils.c +isosize_SOURCES = disk-utils/isosize.c +isosize_LDADD = libcommon.la sbin_PROGRAMS += mkfs.bfs dist_man_MANS += disk-utils/mkfs.bfs.8 mkfs_bfs_SOURCES = \ - disk-utils/mkfs.bfs.c \ - lib/strutils.c \ - $(lib_blkdev_sources) - + disk-utils/mkfs.bfs.c +mkfs_bfs_LDADD = libcommon.la sbin_PROGRAMS += mkswap dist_man_MANS += disk-utils/mkswap.8 mkswap_SOURCES = \ - disk-utils/mkswap.c \ - lib/ismounted.c \ - lib/strutils.c \ - lib/wholedisk.c \ - $(lib_blkdev_sources) + disk-utils/mkswap.c +mkswap_LDADD = libcommon.la + mkswap_CFLAGS = $(AM_CFLAGS) -mkswap_LDADD = if BUILD_LIBUUID mkswap_CFLAGS += -I$(ul_libuuid_incdir) mkswap_LDADD += libuuid.la @@ -62,10 +52,10 @@ endif if BUILD_SWAPLABEL sbin_PROGRAMS += swaplabel dist_man_MANS += disk-utils/swaplabel.8 -swaplabel_SOURCES = disk-utils/swaplabel.c $(lib_blkdev_sources) +swaplabel_SOURCES = disk-utils/swaplabel.c swaplabel_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -swaplabel_LDADD = libblkid.la +swaplabel_LDADD = libblkid.la libcommon.la if BUILD_LIBUUID swaplabel_LDADD += $(uuid_ldadd) @@ -86,7 +76,8 @@ endif if BUILD_ELVTUNE sbin_PROGRAMS += elvtune dist_man_MANS += disk-utils/elvtune.8 -elvtune_SOURCES = disk-utils/elvtune.c lib/linux_version.c +elvtune_SOURCES = disk-utils/elvtune.c +elvtune_LDADD = libcommon.la endif @@ -98,29 +89,22 @@ endif if BUILD_CRAMFS -cramfs_common_sources = \ - disk-utils/cramfs.h \ - disk-utils/cramfs_common.c \ - $(lib_blkdev_sources) - +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 +fsck_cramfs_LDADD = -lz libcommon.la sbin_PROGRAMS += mkfs.cramfs -mkfs_cramfs_SOURCES = \ - disk-utils/mkfs.cramfs.c \ - $(cramfs_common_sources) \ - lib/md5.c \ - lib/strutils.c -mkfs_cramfs_LDADD = -lz +mkfs_cramfs_SOURCES = disk-utils/mkfs.cramfs.c $(cramfs_common_sources) +mkfs_cramfs_LDADD = -lz libcommon.la endif if LINUX sbin_PROGRAMS += blockdev dist_man_MANS += disk-utils/blockdev.8 -blockdev_SOURCES = disk-utils/blockdev.c $(lib_blkdev_sources) +blockdev_SOURCES = disk-utils/blockdev.c +blockdev_LDADD = libcommon.la usrsbin_exec_PROGRAMS += fdformat dist_man_MANS += disk-utils/fdformat.8 @@ -138,28 +122,18 @@ dist_man_MANS += \ addpart_SOURCES = \ disk-utils/addpart.c \ - disk-utils/partx.h \ - lib/strutils.c + disk-utils/partx.h +addpart_LDADD = libcommon.la delpart_SOURCES = \ disk-utils/delpart.c \ - disk-utils/partx.h \ - lib/strutils.c + disk-utils/partx.h +delpart_LDADD = libcommon.la partx_SOURCES = \ disk-utils/partx.c \ - disk-utils/partx.h \ - lib/at.c \ - lib/blkdev.c \ - lib/canonicalize.c \ - lib/linux_version.c \ - lib/loopdev.c \ - lib/mbsalign.c \ - lib/strutils.c \ - lib/sysfs.c \ - lib/tt.c - + disk-utils/partx.h partx_CFLAGS = -I$(ul_libblkid_incdir) -partx_LDADD = libblkid.la +partx_LDADD = libblkid.la libcommon.la endif # BUILD_PARTX diff --git a/fdisks/Makemodule.am b/fdisks/Makemodule.am index ac176fe99..799f8e47f 100644 --- a/fdisks/Makemodule.am +++ b/fdisks/Makemodule.am @@ -3,16 +3,7 @@ fdisk_common_sources = \ fdisks/common.h \ fdisks/gpt.c \ fdisks/gpt.h \ - fdisks/i386_sys_types.c \ - lib/blkdev.c \ - lib/mbsalign.c \ - lib/strutils.c \ - lib/randutils.c \ - lib/wholedisk.c - -if LINUX -fdisk_common_sources += lib/linux_version.c -endif + fdisks/i386_sys_types.c if !ARCH_M68K @@ -35,12 +26,13 @@ fdisk_SOURCES = \ fdisks/fdiskdoslabel.c \ fdisks/fdiskdoslabel.h \ fdisks/partname.c \ - $(fdisk_common_sources) \ - lib/canonicalize.c + $(fdisk_common_sources) + +fdisk_LDADD = libcommon.la if BUILD_LIBBLKID fdisk_CFLAGS = -I$(ul_libblkid_incdir) -fdisk_LDADD = libblkid.la +fdisk_LDADD += libblkid.la endif if HAVE_STATIC_FDISK @@ -59,13 +51,14 @@ dist_man_MANS += fdisks/sfdisk.8 sfdisk_SOURCES = \ fdisks/partname.c \ fdisks/sfdisk.c \ - $(fdisk_common_sources) \ - lib/canonicalize.c + $(fdisk_common_sources) +sfdisk_LDADD = libcommon.la if HAVE_STATIC_SFDISK sbin_PROGRAMS += sfdisk.static sfdisk_static_SOURCES = $(sfdisk_SOURCES) sfdisk_static_LDFLAGS = -all-static +sfdisk_static_LDADD = $(sfdisk_LDADD) endif @@ -74,7 +67,7 @@ sbin_PROGRAMS += cfdisk dist_man_MANS += fdisks/cfdisk.8 cfdisk_SOURCES = fdisks/cfdisk.c $(fdisk_common_sources) cfdisk_CFLAGS = -cfdisk_LDADD = +cfdisk_LDADD = libcommon.la if BUILD_LIBBLKID cfdisk_CFLAGS += -I$(ul_libblkid_incdir) diff --git a/lib/Makemodule.am b/lib/Makemodule.am index 3a46c699a..064cc9f4e 100644 --- a/lib/Makemodule.am +++ b/lib/Makemodule.am @@ -1,4 +1,39 @@ +noinst_LTLIBRARIES += libcommon.la +libcommon_la_CFLAGS = $(AM_CFLAGS) +libcommon_la_SOURCES = \ + lib/at.c \ + lib/blkdev.c \ + lib/canonicalize.c \ + lib/cpuset.c \ + lib/crc32.c \ + lib/env.c \ + lib/fileutils.c \ + lib/ismounted.c \ + lib/loopdev.c \ + lib/mangle.c \ + lib/match.c \ + lib/mbsalign.c \ + lib/md5.c \ + lib/pager.c \ + lib/path.c \ + lib/procutils.c \ + lib/randutils.c \ + lib/setproctitle.c \ + lib/strutils.c \ + lib/sysfs.c \ + lib/tt.c \ + lib/wholedisk.c \ + lib/xgetpass.c + +if LINUX +libcommon_la_SOURCES += lib/linux_version.c +endif + +if !HAVE_LANGINFO +libcommon_la_SOURCES += lib/langinfo.c +endif + noinst_PROGRAMS += \ test_at \ test_blkdev \ @@ -24,6 +59,7 @@ endif test_blkdev_SOURCES = lib/blkdev.c test_blkdev_CFLAGS = -DTEST_PROGRAM +test_blkdev_LDADD = libcommon.la test_ismounted_SOURCES = lib/ismounted.c test_ismounted_CFLAGS = -DTEST_PROGRAM @@ -50,32 +86,25 @@ if LINUX test_cpuset_SOURCES = lib/cpuset.c test_cpuset_CFLAGS = -DTEST_PROGRAM -test_sysfs_SOURCES = lib/sysfs.c lib/at.c +test_sysfs_SOURCES = lib/sysfs.c test_sysfs_CFLAGS = -DTEST_PROGRAM_SYSFS +test_sysfs_LDADD = libcommon.la test_pager_SOURCES = lib/pager.c test_pager_CFLAGS = -DTEST_PROGRAM -test_loopdev_SOURCES = \ - $(test_sysfs_SOURCES) \ - lib/loopdev.c \ - lib/canonicalize.c \ - lib/linux_version.c - +test_loopdev_SOURCES = lib/loopdev.c test_loopdev_CFLAGS = -DTEST_PROGRAM_LOOPDEV +test_loopdev_LDADD = libcommon.la endif test_fileutils_SOURCES = lib/fileutils.c test_fileutils_CFLAGS = -DTEST_PROGRAM -test_tt_SOURCES = \ - lib/tt.c \ - lib/mbsalign.c +test_tt_SOURCES = lib/tt.c test_tt_CFLAGS = -DTEST_PROGRAM +test_tt_LDADD = libcommon.la test_canonicalize_SOURCES = lib/canonicalize.c test_canonicalize_CFLAGS = -DTEST_PROGRAM_CANONICALIZE -if LINUX -test_blkdev_SOURCES += lib/linux_version.c -endif diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am index c1a2f4cab..3d469fd9a 100644 --- a/libblkid/src/Makemodule.am +++ b/libblkid/src/Makemodule.am @@ -6,15 +6,6 @@ nodist_blkidinc_HEADERS = $(top_builddir)/libblkid/src/blkid.h usrlib_exec_LTLIBRARIES += libblkid.la libblkid_la_SOURCES = \ include/list.h \ - lib/at.c \ - lib/blkdev.c \ - lib/canonicalize.c \ - lib/crc32.c \ - lib/env.c \ - lib/linux_version.c \ - lib/md5.c \ - lib/strutils.c \ - lib/sysfs.c \ \ libblkid/src/blkidP.h \ libblkid/src/cache.c \ @@ -114,9 +105,10 @@ libblkid_la_SOURCES += \ endif nodist_libblkid_la_SOURCES = libblkid/src/blkid.h +libblkid_la_LIBADD = libcommon.la if BUILD_LIBUUID -libblkid_la_LIBADD = libuuid.la +libblkid_la_LIBADD += libuuid.la endif libblkid_la_CFLAGS = \ diff --git a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am index d05f9026d..211834e7f 100644 --- a/libmount/src/Makemodule.am +++ b/libmount/src/Makemodule.am @@ -6,15 +6,6 @@ nodist_mountinc_HEADERS = $(top_builddir)/libmount/src/libmount.h usrlib_exec_LTLIBRARIES += libmount.la libmount_la_SOURCES = \ include/list.h \ - lib/at.c \ - lib/canonicalize.c \ - lib/env.c \ - lib/linux_version.c \ - lib/loopdev.c \ - lib/mangle.c \ - lib/match.c \ - lib/strutils.c \ - lib/sysfs.c \ \ libmount/src/cache.c \ libmount/src/context.c \ @@ -39,7 +30,7 @@ libmount_la_SOURCES = \ nodist_libmount_la_SOURCES = libmount/src/mountP.h -libmount_la_LIBADD = libblkid.la $(SELINUX_LIBS) +libmount_la_LIBADD = libcommon.la libblkid.la $(SELINUX_LIBS) libmount_la_CFLAGS = \ -I$(ul_libblkid_incdir) \ diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am index ec119896c..42507e46c 100644 --- a/login-utils/Makemodule.am +++ b/login-utils/Makemodule.am @@ -9,9 +9,8 @@ if BUILD_SULOGIN sbin_PROGRAMS += sulogin dist_man_MANS += login-utils/sulogin.8 sulogin_SOURCES = \ - login-utils/sulogin.c \ - lib/strutils.c -sulogin_LDADD = + login-utils/sulogin.c +sulogin_LDADD = libcommon.la if HAVE_LIBCRYPT sulogin_LDADD += -lcrypt endif @@ -27,10 +26,8 @@ dist_man_MANS += login-utils/login.1 login_SOURCES = \ login-utils/login.c \ login-utils/logindefs.c \ - login-utils/logindefs.h \ - lib/fileutils.c \ - lib/setproctitle.c -login_LDADD = -lpam -lpam_misc + login-utils/logindefs.h +login_LDADD = libcommon.la -lpam -lpam_misc if HAVE_AUDIT login_LDADD += -laudit endif @@ -50,13 +47,10 @@ chfn_chsh_sources = \ login-utils/islocal.c \ login-utils/islocal.h \ login-utils/setpwnam.c \ - login-utils/setpwnam.h \ - lib/env.c \ - lib/fileutils.c - + login-utils/setpwnam.h chfn_chsh_cflags = $(SUID_CFLAGS) $(AM_CFLAGS) chfn_chsh_ldflags = $(SUID_LDFLAGS) $(AM_LDFLAGS) -chfn_chsh_ldadd = -lpam -lpam_misc +chfn_chsh_ldadd = libcommon.la -lpam -lpam_misc if HAVE_SELINUX chfn_chsh_sources += \ @@ -109,9 +103,8 @@ dist_man_MANS += \ login-utils/vipw.8 vipw_SOURCES = \ login-utils/vipw.c \ - login-utils/setpwnam.h \ - lib/fileutils.c -vipw_LDADD = + login-utils/setpwnam.h +vipw_LDADD = libcommon.la if HAVE_SELINUX vipw_LDADD += -lselinux endif diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am index 222ac0303..5fe3a3ff7 100644 --- a/misc-utils/Makemodule.am +++ b/misc-utils/Makemodule.am @@ -74,16 +74,8 @@ endif if BUILD_LSBLK bin_PROGRAMS += lsblk dist_man_MANS += misc-utils/lsblk.8 -lsblk_SOURCES = \ - misc-utils/lsblk.c \ - lib/at.c \ - lib/canonicalize.c \ - lib/mbsalign.c \ - lib/mangle.c \ - lib/strutils.c \ - lib/sysfs.c \ - lib/tt.c -lsblk_LDADD = libblkid.la libmount.la +lsblk_SOURCES = misc-utils/lsblk.c +lsblk_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 @@ -125,11 +117,8 @@ CLEANFILES += misc-utils/uuidd.service if BUILD_LIBBLKID sbin_PROGRAMS += blkid dist_man_MANS += misc-utils/blkid.8 -blkid_SOURCES = \ - misc-utils/blkid.c \ - lib/ismounted.c \ - lib/strutils.c -blkid_LDADD = libblkid.la +blkid_SOURCES = misc-utils/blkid.c +blkid_LDADD = libblkid.la libcommon.la blkid_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) sbin_PROGRAMS += findfs @@ -140,11 +129,8 @@ findfs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) sbin_PROGRAMS += wipefs dist_man_MANS += misc-utils/wipefs.8 -wipefs_SOURCES = \ - misc-utils/wipefs.c \ - lib/match.c \ - lib/strutils.c -wipefs_LDADD = libblkid.la +wipefs_SOURCES = misc-utils/wipefs.c +wipefs_LDADD = libblkid.la libcommon.la wipefs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) if HAVE_STATIC_BLKID @@ -160,17 +146,9 @@ endif # BUILD_LIBBLKID if BUILD_LIBMOUNT bin_PROGRAMS += findmnt dist_man_MANS += misc-utils/findmnt.8 -findmnt_LDADD = libmount.la +findmnt_LDADD = libmount.la libcommon.la findmnt_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) -findmnt_SOURCES = \ - misc-utils/findmnt.c \ - lib/mbsalign.c \ - lib/strutils.c \ - lib/tt.c - -if !HAVE_LANGINFO -findmnt_SOURCES += lib/langinfo.c -endif +findmnt_SOURCES = misc-utils/findmnt.c endif # BUILD_LIBMOUNT @@ -179,8 +157,8 @@ bin_PROGRAMS += kill kill_SOURCES = \ misc-utils/kill.c \ misc-utils/kill.h \ - misc-utils/procs.c \ - lib/strutils.c + misc-utils/procs.c +kill_LDADD = libcommon.la dist_man_MANS += misc-utils/kill.1 endif diff --git a/mount-deprecated/Makemodule.am b/mount-deprecated/Makemodule.am index d3205f504..89944cc6e 100644 --- a/mount-deprecated/Makemodule.am +++ b/mount-deprecated/Makemodule.am @@ -1,10 +1,5 @@ if BUILD_DEPRECATED_MOUNT -bin_PROGRAMS += mount umount -dist_man_MANS += \ - mount-deprecated/mount.8 \ - mount-deprecated/umount.8 - mount_common_sources = \ mount-deprecated/sundries.c \ mount-deprecated/sundries.h \ @@ -18,58 +13,51 @@ mount_common_sources = \ mount-deprecated/fstab.c \ mount-deprecated/getusername.c \ mount-deprecated/mount_mntent.c \ - mount-deprecated/fsprobe.c \ - \ - lib/canonicalize.c \ - lib/at.c \ - lib/blkdev.c \ - lib/env.c \ - lib/linux_version.c \ - lib/loopdev.c \ - lib/mangle.c \ - lib/strutils.c \ - lib/xgetpass.c \ - lib/sysfs.c + mount-deprecated/fsprobe.c -mount_SOURCES = \ - mount-deprecated/mount.c \ - $(mount_common_sources) \ - lib/setproctitle.c +# +# mount +# +bin_PROGRAMS += mount +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 - -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 - +mount_LDADD = libblkid.la libcommon.la - -mount_static_LDADD = +if HAVE_SELINUX +mount_LDADD += $(SELINUX_LIBS) +endif if HAVE_STATIC_MOUNT bin_PROGRAMS += mount.static mount_static_SOURCES = $(mount_SOURCES) mount_static_CFLAGS = $(mount_CFLAGS) mount_static_LDFLAGS = -all-static -mount_static_LDADD += libblkid.la +mount_static_LDADD = libblkid.la libcommon.la +if HAVE_SELINUX +mount_static_LDADD += $(SELINUX_LIBS_STATIC) endif +endif # HAVE_STATIC_MOUNT + +# +# umount +# +bin_PROGRAMS += umount +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 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 +umount_static_LDADD = libblkid.la libcommon.la endif -if HAVE_SELINUX -mount_LDADD += $(SELINUX_LIBS) -mount_static_LDADD += $(SELINUX_LIBS_STATIC) -endif if MAKEINSTALL_DO_SETUID install-exec-hook-mount: diff --git a/schedutils/Makemodule.am b/schedutils/Makemodule.am index 060eba148..f64a70bdb 100644 --- a/schedutils/Makemodule.am +++ b/schedutils/Makemodule.am @@ -2,32 +2,21 @@ if BUILD_SCHEDUTILS usrbin_exec_PROGRAMS += chrt dist_man_MANS += schedutils/chrt.1 - -sched_common = \ - lib/strutils.c \ - lib/procutils.c - -chrt_SOURCES = \ - schedutils/chrt.c \ - $(sched_common) +chrt_SOURCES = schedutils/chrt.c +chrt_LDADD = libcommon.la if BUILD_IONICE usrbin_exec_PROGRAMS += ionice -ionice_SOURCES = \ - schedutils/ionice.c \ - $(sched_common) - dist_man_MANS += schedutils/ionice.1 +ionice_SOURCES = schedutils/ionice.c +ionice_LDADD = libcommon.la endif if BUILD_TASKSET usrbin_exec_PROGRAMS += taskset -taskset_SOURCES = \ - schedutils/taskset.c \ - lib/cpuset.c \ - $(sched_common) - dist_man_MANS += schedutils/taskset.1 +taskset_SOURCES = schedutils/taskset.c +taskset_LDADD = libcommon.la endif endif # BUILD_SCHEDUTILS diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am index cc1a3f63a..35f130014 100644 --- a/sys-utils/Makemodule.am +++ b/sys-utils/Makemodule.am @@ -1,15 +1,18 @@ usrbin_exec_PROGRAMS += flock dist_man_MANS += sys-utils/flock.1 -flock_SOURCES = sys-utils/flock.c lib/strutils.c +flock_SOURCES = sys-utils/flock.c +flock_LDADD = libcommon.la usrbin_exec_PROGRAMS += ipcmk dist_man_MANS += sys-utils/ipcmk.1 -ipcmk_SOURCES = sys-utils/ipcmk.c lib/strutils.c +ipcmk_SOURCES = sys-utils/ipcmk.c +ipcmk_LDADD = libcommon.la usrbin_exec_PROGRAMS += ipcrm dist_man_MANS += sys-utils/ipcrm.1 -ipcrm_SOURCES = sys-utils/ipcrm.c lib/strutils.c +ipcrm_SOURCES = sys-utils/ipcrm.c +ipcrm_LDADD = libcommon.la usrbin_exec_PROGRAMS += ipcs dist_man_MANS += sys-utils/ipcs.1 @@ -35,7 +38,8 @@ if LINUX # bin_PROGRAMS += dmesg dist_man_MANS += sys-utils/dmesg.1 -dmesg_SOURCES = sys-utils/dmesg.c lib/strutils.c +dmesg_SOURCES = sys-utils/dmesg.c +dmesg_LDADD = libcommon.la sbin_PROGRAMS += ctrlaltdel dist_man_MANS += sys-utils/ctrlaltdel.8 @@ -47,18 +51,18 @@ fsfreeze_SOURCES = sys-utils/fsfreeze.c sbin_PROGRAMS += fstrim dist_man_MANS += sys-utils/fstrim.8 -fstrim_SOURCES = sys-utils/fstrim.c lib/strutils.c +fstrim_SOURCES = sys-utils/fstrim.c +fstrim_LDADD = libcommon.la usrbin_exec_PROGRAMS += cytune dist_man_MANS += sys-utils/cytune.8 -cytune_SOURCES = \ - sys-utils/cytune.c \ - sys-utils/cyclades.h \ - lib/strutils.c +cytune_SOURCES = sys-utils/cytune.c sys-utils/cyclades.h +cytune_LDADD = libcommon.la usrsbin_exec_PROGRAMS += ldattach dist_man_MANS += sys-utils/ldattach.8 -ldattach_SOURCES = sys-utils/ldattach.c lib/strutils.c +ldattach_SOURCES = sys-utils/ldattach.c +ldattach_LDADD = libcommon.la usrsbin_exec_PROGRAMS += tunelp dist_man_MANS += sys-utils/tunelp.8 @@ -66,8 +70,8 @@ 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 lib/strutils.c - +rtcwake_SOURCES = sys-utils/rtcwake.c +rtcwake_LDADD = libcommon.la usrbin_exec_PROGRAMS += setarch dist_man_MANS += sys-utils/setarch.8 @@ -125,12 +129,8 @@ endif # LINUX if BUILD_EJECT usrbin_exec_PROGRAMS += eject -eject_SOURCES = \ - sys-utils/eject.c \ - lib/strutils.c \ - lib/sysfs.c \ - lib/at.c -eject_LDADD = libmount.la +eject_SOURCES = sys-utils/eject.c +eject_LDADD = libmount.la libcommon.la eject_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) dist_man_MANS += sys-utils/eject.1 endif @@ -139,20 +139,14 @@ endif if BUILD_LOSETUP sbin_PROGRAMS += losetup dist_man_MANS += sys-utils/losetup.8 -losetup_SOURCES = \ - sys-utils/losetup.c \ - lib/at.c \ - lib/canonicalize.c \ - lib/linux_version.c \ - lib/loopdev.c \ - lib/strutils.c \ - lib/sysfs.c \ - lib/xgetpass.c +losetup_SOURCES = sys-utils/losetup.c +losetup_LDADD = libcommon.la if HAVE_STATIC_LOSETUP bin_PROGRAMS += losetup.static losetup_static_SOURCES = $(losetup_SOURCES) losetup_static_LDFLAGS = -all-static +losetup_static_LDADD = $(losetup_LDADD) endif endif # BUILD_LOSETUP @@ -160,11 +154,8 @@ endif # BUILD_LOSETUP if BUILD_PRLIMIT usrbin_exec_PROGRAMS += prlimit dist_man_MANS += sys-utils/prlimit.1 -prlimit_SOURCES = \ - sys-utils/prlimit.c \ - lib/mbsalign.c \ - lib/strutils.c \ - lib/tt.c +prlimit_SOURCES = sys-utils/prlimit.c +prlimit_LDADD = libcommon.la endif @@ -178,20 +169,13 @@ dist_man_MANS += \ sys-utils/mount.8 \ sys-utils/fstab.5 \ mount-deprecated/umount.8 -mount_SOURCES = \ - sys-utils/mount.c \ - lib/env.c \ - lib/strutils.c \ - lib/xgetpass.c - -mount_LDADD = libmount.la $(SELINUX_LIBS) +mount_SOURCES = sys-utils/mount.c +mount_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 \ - lib/env.c -umount_LDADD = libmount.la +umount_SOURCES = sys-utils/umount.c +umount_LDADD = libcommon.la libmount.la umount_CFLAGS = $(AM_CFLAGS) $(SUID_CFLAGS) -I$(ul_libmount_incdir) umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) @@ -230,49 +214,35 @@ dist_man_MANS += \ swapon_SOURCES = \ sys-utils/swapon.c \ sys-utils/swapon-common.c \ - sys-utils/swapon-common.h \ - lib/blkdev.c \ - lib/linux_version.c + sys-utils/swapon-common.h swapon_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) -swapon_LDADD = libmount.la +swapon_LDADD = libcommon.la libmount.la -swapoff_SOURCES = \ - sys-utils/swapoff.c \ - sys-utils/swapon-common.c +swapoff_SOURCES = sys-utils/swapoff.c sys-utils/swapon-common.c swapoff_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) swapoff_LDADD = libmount.la endif if BUILD_LSCPU usrbin_exec_PROGRAMS += lscpu -lscpu_SOURCES = \ - sys-utils/lscpu.c \ - lib/cpuset.c \ - lib/mbsalign.c \ - lib/path.c \ - lib/strutils.c \ - lib/tt.c +lscpu_SOURCES = sys-utils/lscpu.c +lscpu_LDADD = libcommon.la dist_man_MANS += sys-utils/lscpu.1 endif if BUILD_CHCPU sbin_PROGRAMS += chcpu -chcpu_SOURCES = \ - sys-utils/chcpu.c \ - lib/cpuset.c \ - lib/path.c +chcpu_SOURCES = sys-utils/chcpu.c +chcpu_LDADD = libcommon.la dist_man_MANS += sys-utils/chcpu.8 endif if BUILD_WDCTL bin_PROGRAMS += wdctl dist_man_MANS += sys-utils/wdctl.8 -wdctl_SOURCES = \ - sys-utils/wdctl.c \ - lib/strutils.c \ - lib/tt.c \ - lib/mbsalign.c +wdctl_SOURCES = sys-utils/wdctl.c +wdctl_LDADD = libcommon.la endif if BUILD_MOUNTPOINT @@ -285,9 +255,8 @@ endif if BUILD_FALLOCATE usrbin_exec_PROGRAMS += fallocate -fallocate_SOURCES = \ - sys-utils/fallocate.c \ - lib/strutils.c +fallocate_SOURCES = sys-utils/fallocate.c +fallocate_LDADD = libcommon.la dist_man_MANS += sys-utils/fallocate.1 endif @@ -322,14 +291,11 @@ hwclock_SOURCES = \ sys-utils/hwclock.c \ sys-utils/hwclock.h \ sys-utils/hwclock-cmos.c \ - sys-utils/hwclock-kd.c \ - lib/strutils.c - + sys-utils/hwclock-kd.c if LINUX hwclock_SOURCES += sys-utils/hwclock-rtc.c endif - -hwclock_LDADD = +hwclock_LDADD = libcommon.la if HAVE_AUDIT hwclock_LDADD += -laudit endif diff --git a/term-utils/Makemodule.am b/term-utils/Makemodule.am index 419aec535..d3528c6a3 100644 --- a/term-utils/Makemodule.am +++ b/term-utils/Makemodule.am @@ -20,9 +20,7 @@ if BUILD_AGETTY sbin_PROGRAMS += agetty dist_man_MANS += term-utils/agetty.8 agetty_SOURCES = term-utils/agetty.c -if !HAVE_LANGINFO -agetty_SOURCES += lib/langinfo.c -endif +agetty_LDADD = libcommon.la endif # BUILD_AGETTY @@ -60,14 +58,11 @@ usrbin_exec_PROGRAMS += wall wall_SOURCES = \ term-utils/wall.c \ term-utils/ttymsg.c \ - term-utils/ttymsg.h \ - lib/strutils.c \ - lib/fileutils.c - + term-utils/ttymsg.h dist_man_MANS += term-utils/wall.1 wall_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) wall_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) - +wall_LDADD = libcommon.la if USE_TTY_GROUP if MAKEINSTALL_DO_CHOWN install-exec-hook-wall:: diff --git a/text-utils/Makemodule.am b/text-utils/Makemodule.am index b8eae9bd0..691ed1d5e 100644 --- a/text-utils/Makemodule.am +++ b/text-utils/Makemodule.am @@ -17,19 +17,16 @@ dist_man_MANS += \ text-utils/rev.1 \ text-utils/tailf.1 -col_SOURCES = \ - text-utils/col.c \ - lib/strutils.c +col_SOURCES = text-utils/col.c +col_LDADD = libcommon.la colcrt_SOURCES = text-utils/colcrt.c -colrm_SOURCES = \ - text-utils/colrm.c \ - lib/strutils.c +colrm_SOURCES = text-utils/colrm.c +colrm_LDADD = libcommon.la -column_SOURCES = \ - text-utils/column.c \ - lib/strutils.c +column_SOURCES = text-utils/column.c +column_LDADD = libcommon.la hexdump_SOURCES = \ text-utils/conv.c \ @@ -37,15 +34,13 @@ hexdump_SOURCES = \ text-utils/hexdump.c \ text-utils/hexdump.h \ text-utils/hexsyntax.c \ - text-utils/parse.c \ - lib/strutils.c + text-utils/parse.c +hexdump_LDADD = libcommon.la rev_SOURCES = text-utils/rev.c -tailf_SOURCES = \ - text-utils/tailf.c \ - lib/strutils.c - +tailf_SOURCES = text-utils/tailf.c +tailf_LDADD = libcommon.la if BUILD_LINE usrbin_exec_PROGRAMS += line |