$(top_srcdir) is not static, and thus causes visible problems were one to use the "subdir-objects" automake option. --- disk-utils/Makefile.am | 12 ++++++------ fdisk/Makefile.am | 10 +++++----- fsck/Makefile.am | 4 ++-- lib/Makefile.am | 2 +- login-utils/Makefile.am | 4 ++-- misc-utils/Makefile.am | 32 ++++++++++++++++---------------- mount/Makefile.am | 22 +++++++++++----------- partx/Makefile.am | 12 ++++++------ schedutils/Makefile.am | 4 ++-- shlibs/blkid/src/Makefile.am | 16 ++++++++-------- shlibs/mount/src/Makefile.am | 12 ++++++------ sys-utils/Makefile.am | 10 +++++----- term-utils/Makefile.am | 2 +- tests/helpers/Makefile.am | 2 +- text-utils/Makefile.am | 4 ++-- 15 files changed, 74 insertions(+), 74 deletions(-) diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am index 5df8064..507c1c8 100644 --- a/disk-utils/Makefile.am +++ b/disk-utils/Makefile.am @@ -1,8 +1,8 @@ include $(top_srcdir)/config/include-Makefile.am -utils_common = $(top_srcdir)/lib/blkdev.c +utils_common = @top_srcdir@/lib/blkdev.c if LINUX -utils_common += $(top_srcdir)/lib/linux_version.c +utils_common += @top_srcdir@/lib/linux_version.c endif if BUILD_LIBUUID @@ -15,7 +15,7 @@ dist_man_MANS = isosize.8 mkfs.8 mkswap.8 \ sbin_PROGRAMS = mkfs mkswap fsck.minix mkfs.minix mkfs.bfs -fsck_minix_SOURCES = fsck.minix.c minix.h $(top_srcdir)/lib/ismounted.c +fsck_minix_SOURCES = fsck.minix.c minix.h @top_srcdir@/lib/ismounted.c mkfs_minix_SOURCES = mkfs.minix.c minix.h $(utils_common) mkfs_bfs_SOURCES = mkfs.bfs.c $(utils_common) @@ -23,7 +23,7 @@ swaplabel_SOURCES = swaplabel.c $(utils_common) swaplabel_LDADD = $(uuid_ldadd) swaplabel_CFLAGS = $(AM_CFLAGS) $(uuid_cflags) -mkswap_SOURCES = mkswap.c $(utils_common) $(top_srcdir)/lib/wholedisk.c $(top_srcdir)/lib/strutils.c +mkswap_SOURCES = mkswap.c $(utils_common) @top_srcdir@/lib/wholedisk.c @top_srcdir@/lib/strutils.c mkswap_LDADD = $(uuid_ldadd) mkswap_CFLAGS = $(AM_CFLAGS) $(uuid_cflags) @@ -49,7 +49,7 @@ endif if BUILD_ELVTUNE sbin_PROGRAMS += elvtune dist_man_MANS += elvtune.8 -elvtune_SOURCES = elvtune.c $(top_srcdir)/lib/linux_version.c +elvtune_SOURCES = elvtune.c @top_srcdir@/lib/linux_version.c endif if HAVE_RAW @@ -63,7 +63,7 @@ if BUILD_CRAMFS cramfs_common = $(utils_common) cramfs.h cramfs_common.c cramfs_common.h sbin_PROGRAMS += fsck.cramfs mkfs.cramfs fsck_cramfs_SOURCES = fsck.cramfs.c $(cramfs_common) -mkfs_cramfs_SOURCES = mkfs.cramfs.c $(cramfs_common) $(top_srcdir)/lib/md5.c +mkfs_cramfs_SOURCES = mkfs.cramfs.c $(cramfs_common) @top_srcdir@/lib/md5.c fsck_cramfs_LDADD = -lz mkfs_cramfs_LDADD = -lz endif diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am index 7cad805..a659a36 100644 --- a/fdisk/Makefile.am +++ b/fdisk/Makefile.am @@ -3,11 +3,11 @@ include $(top_srcdir)/config/include-Makefile.am EXTRA_DIST = README.fdisk README.cfdisk sfdisk.examples partitiontype.c fdisk_common = i386_sys_types.c common.h gpt.c gpt.h \ - $(top_srcdir)/lib/blkdev.c $(top_srcdir)/lib/wholedisk.c \ - $(top_srcdir)/lib/mbsalign.c + @top_srcdir@/lib/blkdev.c @top_srcdir@/lib/wholedisk.c \ + @top_srcdir@/lib/mbsalign.c if LINUX -fdisk_common += $(top_srcdir)/lib/linux_version.c +fdisk_common += @top_srcdir@/lib/linux_version.c endif if !ARCH_M68K @@ -18,7 +18,7 @@ fdisk_SOURCES = fdisk.c fdiskbsdlabel.c fdisksgilabel.c \ fdisksunlabel.c fdiskaixlabel.c fdiskmaclabel.c partname.c \ fdisk.h fdisksunlabel.h fdisksgilabel.h fdiskaixlabel.h \ fdiskbsdlabel.h fdiskmaclabel.h $(fdisk_common) \ - $(top_srcdir)/lib/canonicalize.c + @top_srcdir@/lib/canonicalize.c cflags_blkid = $(AM_CFLAGS) ldadd_blkid = @@ -44,7 +44,7 @@ if !ARCH_SPARC sbin_PROGRAMS += sfdisk dist_man_MANS += sfdisk.8 sfdisk_SOURCES = sfdisk.c partname.c $(fdisk_common) \ - $(top_srcdir)/lib/canonicalize.c + @top_srcdir@/lib/canonicalize.c if HAVE_STATIC_SFDISK sbin_PROGRAMS += sfdisk.static diff --git a/fsck/Makefile.am b/fsck/Makefile.am index ebb5b67..b49c677 100644 --- a/fsck/Makefile.am +++ b/fsck/Makefile.am @@ -3,8 +3,8 @@ include $(top_srcdir)/config/include-Makefile.am sbin_PROGRAMS = fsck dist_man_MANS = fsck.8 -fsck_SOURCES = fsck.c fsck.h $(top_srcdir)/lib/ismounted.c \ - $(top_srcdir)/lib/fsprobe.c $(top_srcdir)/lib/canonicalize.c +fsck_SOURCES = fsck.c fsck.h @top_srcdir@/lib/ismounted.c \ + @top_srcdir@/lib/fsprobe.c @top_srcdir@/lib/canonicalize.c fsck_LDADD = fsck_CFLAGS = $(AM_CFLAGS) diff --git a/lib/Makefile.am b/lib/Makefile.am index 2b64459..eff5cf5 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -19,7 +19,7 @@ test_strutils_SOURCES = strutils.c if LINUX test_cpuset_SOURCES = cpuset.c endif -test_tt_SOURCES = tt.c $(top_srcdir)/lib/mbsalign.c +test_tt_SOURCES = tt.c @top_srcdir@/lib/mbsalign.c test_canonicalize_SOURCES = canonicalize.c if LINUX diff --git a/login-utils/Makefile.am b/login-utils/Makefile.am index 0bedc06..d5648d8 100644 --- a/login-utils/Makefile.am +++ b/login-utils/Makefile.am @@ -26,8 +26,8 @@ login_ldadd_common = chfn_SOURCES = chfn.c $(chfn_chsh_common) chsh_SOURCES = chsh.c $(chfn_chsh_common) chfn_chsh_common = islocal.c setpwnam.c islocal.h setpwnam.h \ - $(top_srcdir)/lib/env.c -login_SOURCES = login.c login.h $(top_srcdir)/lib/setproctitle.c + @top_srcdir@/lib/env.c +login_SOURCES = login.c login.h @top_srcdir@/lib/setproctitle.c vipw_SOURCES = vipw.c setpwnam.h chfn_LDADD = $(login_ldadd_common) diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am index 26d5935..0b6b012 100644 --- a/misc-utils/Makefile.am +++ b/misc-utils/Makefile.am @@ -10,8 +10,8 @@ usrbin_exec_PROGRAMS = cal ddate logger look mcookie namei whereis EXTRA_DIST += README.cal README.ddate README.namei README.namei2 -logger_SOURCES = logger.c $(top_srcdir)/lib/strutils.c -mcookie_SOURCES = mcookie.c $(top_srcdir)/lib/md5.c +logger_SOURCES = logger.c @top_srcdir@/lib/strutils.c +mcookie_SOURCES = mcookie.c @top_srcdir@/lib/md5.c usrbin_exec_SCRIPTS = chkdupexe @@ -20,7 +20,7 @@ CLEANFILES = chkdupexe dist_man_MANS = cal.1 chkdupexe.1 ddate.1 logger.1 look.1 mcookie.1 \ namei.1 whereis.1 -namei_SOURCES = namei.c $(top_srcdir)/lib/strutils.c +namei_SOURCES = namei.c @top_srcdir@/lib/strutils.c if BUILD_LIBUUID usrbin_exec_PROGRAMS += uuidgen @@ -38,15 +38,15 @@ endif if BUILD_LIBBLKID sbin_PROGRAMS += blkid findfs wipefs dist_man_MANS += blkid.8 findfs.8 wipefs.8 -blkid_SOURCES = blkid.c $(top_srcdir)/lib/ismounted.c \ - $(top_srcdir)/lib/strutils.c +blkid_SOURCES = blkid.c @top_srcdir@/lib/ismounted.c \ + @top_srcdir@/lib/strutils.c blkid_LDADD = $(ul_libblkid_la) blkid_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) findfs_LDADD = $(ul_libblkid_la) findfs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -wipefs_SOURCES = wipefs.c $(top_srcdir)/lib/strutils.c +wipefs_SOURCES = wipefs.c @top_srcdir@/lib/strutils.c wipefs_LDADD = $(ul_libblkid_la) wipefs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) @@ -54,11 +54,11 @@ if BUILD_LSBLK bin_PROGRAMS += lsblk dist_man_MANS += lsblk.8 lsblk_SOURCES = lsblk.c \ - $(top_srcdir)/lib/canonicalize.c \ - $(top_srcdir)/lib/ismounted.c \ - $(top_srcdir)/lib/tt.c \ - $(top_srcdir)/lib/mbsalign.c \ - $(top_srcdir)/lib/strutils.c + @top_srcdir@/lib/canonicalize.c \ + @top_srcdir@/lib/ismounted.c \ + @top_srcdir@/lib/tt.c \ + @top_srcdir@/lib/mbsalign.c \ + @top_srcdir@/lib/strutils.c lsblk_LDADD = $(ul_libblkid_la) lsblk_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) endif @@ -77,15 +77,15 @@ bin_PROGRAMS += findmnt dist_man_MANS += findmnt.8 findmnt_LDADD = $(ul_libmount_la) findmnt_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) -findmnt_SOURCES = findmnt.c $(top_srcdir)/lib/tt.c $(top_srcdir)/lib/mbsalign.c +findmnt_SOURCES = findmnt.c @top_srcdir@/lib/tt.c @top_srcdir@/lib/mbsalign.c if !HAVE_LANGINFO -findmnt_SOURCES += $(top_srcdir)/lib/langinfo.c +findmnt_SOURCES += @top_srcdir@/lib/langinfo.c endif endif -cal_SOURCES = cal.c $(top_srcdir)/lib/mbsalign.c +cal_SOURCES = cal.c @top_srcdir@/lib/mbsalign.c if !HAVE_LANGINFO -cal_SOURCES += $(top_srcdir)/lib/langinfo.c +cal_SOURCES += @top_srcdir@/lib/langinfo.c endif if HAVE_TINFO cal_LDADD = -ltinfo @NCURSES_LIBS@ @@ -101,7 +101,7 @@ endif if BUILD_KILL bin_PROGRAMS += kill -kill_SOURCES = kill.c procs.c kill.h $(top_srcdir)/lib/strutils.c +kill_SOURCES = kill.c procs.c kill.h @top_srcdir@/lib/strutils.c dist_man_MANS += kill.1 endif diff --git a/mount/Makefile.am b/mount/Makefile.am index b82464f..8203616 100644 --- a/mount/Makefile.am +++ b/mount/Makefile.am @@ -7,7 +7,7 @@ sbin_PROGRAMS = losetup swapon dist_man_MANS = fstab.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8 # generic sources for all programs (mount, umount, losetup) -srcs_common = sundries.c xmalloc.c $(top_srcdir)/lib/canonicalize.c sundries.h xmalloc.h +srcs_common = sundries.c xmalloc.c @top_srcdir@/lib/canonicalize.c sundries.h xmalloc.h # generic header for mount and umount hdrs_mount = fstab.h mount_mntent.h mount_constants.h \ @@ -15,9 +15,9 @@ hdrs_mount = fstab.h mount_mntent.h mount_constants.h \ # generic sources for mount and umount srcs_mount = fstab.c mount_mntent.c getusername.c lomount.c devname.c devname.h \ - $(srcs_common) $(hdrs_mount) $(top_srcdir)/lib/env.c \ - $(top_srcdir)/lib/linux_version.c $(top_srcdir)/lib/blkdev.c \ - $(top_srcdir)/lib/fsprobe.c $(top_srcdir)/lib/mangle.c + $(srcs_common) $(hdrs_mount) @top_srcdir@/lib/env.c \ + @top_srcdir@/lib/linux_version.c @top_srcdir@/lib/blkdev.c \ + @top_srcdir@/lib/fsprobe.c @top_srcdir@/lib/mangle.c # generic flags for all programs (except losetup) # -- note that pkg-config autoconf macros (pkg.m4) does not differentiate @@ -27,25 +27,25 @@ ldadd_static = cflags_common = $(AM_CFLAGS) ldflags_static = -all-static -mount_SOURCES = mount.c $(srcs_mount) $(top_srcdir)/lib/setproctitle.c \ - $(top_srcdir)/lib/strutils.c +mount_SOURCES = mount.c $(srcs_mount) @top_srcdir@/lib/setproctitle.c \ + @top_srcdir@/lib/strutils.c mount_CFLAGS = $(SUID_CFLAGS) $(cflags_common) mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) mount_LDADD = $(ldadd_common) -umount_SOURCES = umount.c $(srcs_mount) $(top_srcdir)/lib/strutils.c +umount_SOURCES = umount.c $(srcs_mount) @top_srcdir@/lib/strutils.c umount_CFLAGS = $(SUID_CFLAGS) $(cflags_common) umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) umount_LDADD = $(ldadd_common) -swapon_SOURCES = swapon.c swap_constants.h $(top_srcdir)/lib/linux_version.c \ - $(top_srcdir)/lib/blkdev.c $(top_srcdir)/lib/fsprobe.c \ - $(top_srcdir)/lib/canonicalize.c $(top_srcdir)/lib/mangle.c +swapon_SOURCES = swapon.c swap_constants.h @top_srcdir@/lib/linux_version.c \ + @top_srcdir@/lib/blkdev.c @top_srcdir@/lib/fsprobe.c \ + @top_srcdir@/lib/canonicalize.c @top_srcdir@/lib/mangle.c swapon_CFLAGS = $(cflags_common) swapon_LDADD = $(ldadd_common) losetup_SOURCES = lomount.c $(srcs_common) loop.h lomount.h \ - $(top_srcdir)/lib/strutils.c + @top_srcdir@/lib/strutils.c losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS) mount_static_LDADD = diff --git a/partx/Makefile.am b/partx/Makefile.am index 46fc641..bdae3cc 100644 --- a/partx/Makefile.am +++ b/partx/Makefile.am @@ -5,12 +5,12 @@ dist_man_MANS = addpart.8 delpart.8 usrsbin_exec_PROGRAMS += partx partx_SOURCES = partx.c partx.h \ - $(top_srcdir)/lib/blkdev.c \ - $(top_srcdir)/lib/tt.c \ - $(top_srcdir)/lib/at.c \ - $(top_srcdir)/lib/mbsalign.c \ - $(top_srcdir)/lib/strutils.c \ - $(top_srcdir)/lib/linux_version.c + @top_srcdir@/lib/blkdev.c \ + @top_srcdir@/lib/tt.c \ + @top_srcdir@/lib/at.c \ + @top_srcdir@/lib/mbsalign.c \ + @top_srcdir@/lib/strutils.c \ + @top_srcdir@/lib/linux_version.c partx_CFLAGS = -I$(ul_libblkid_incdir) partx_LDADD = $(ul_libblkid_la) diff --git a/schedutils/Makefile.am b/schedutils/Makefile.am index dc33175..15133a9 100644 --- a/schedutils/Makefile.am +++ b/schedutils/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/config/include-Makefile.am if BUILD_SCHEDUTILS -srcs_common = $(top_srcdir)/lib/strutils.c +srcs_common = @top_srcdir@/lib/strutils.c usrbin_exec_PROGRAMS = chrt dist_man_MANS = chrt.1 @@ -19,7 +19,7 @@ endif if HAVE_SCHED_GETAFFINITY usrbin_exec_PROGRAMS += taskset -taskset_SOURCES = taskset.c $(top_srcdir)/lib/cpuset.c $(srcs_common) +taskset_SOURCES = taskset.c @top_srcdir@/lib/cpuset.c $(srcs_common) dist_man_MANS += taskset.1 endif diff --git a/shlibs/blkid/src/Makefile.am b/shlibs/blkid/src/Makefile.am index f385156..52ca3c9 100644 --- a/shlibs/blkid/src/Makefile.am +++ b/shlibs/blkid/src/Makefile.am @@ -22,14 +22,14 @@ libblkid_la_SOURCES = cache.c dev.c devname.c devno.c getsize.c llseek.c \ encode.c blkidP.h superblocks/superblocks.h \ config.c evaluate.c \ $(blkidinc_HEADERS) \ - $(top_srcdir)/lib/blkdev.c \ - $(top_srcdir)/lib/linux_version.c \ - $(top_srcdir)/lib/canonicalize.c \ - $(top_srcdir)/lib/md5.c \ - $(top_srcdir)/lib/crc32.c \ - $(top_srcdir)/include/list.h \ - $(top_srcdir)/lib/env.c \ - $(top_srcdir)/lib/strutils.c + @top_srcdir@/lib/blkdev.c \ + @top_srcdir@/lib/linux_version.c \ + @top_srcdir@/lib/canonicalize.c \ + @top_srcdir@/lib/md5.c \ + @top_srcdir@/lib/crc32.c \ + @top_srcdir@/include/list.h \ + @top_srcdir@/lib/env.c \ + @top_srcdir@/lib/strutils.c nodist_libblkid_la_SOURCES = blkid.h diff --git a/shlibs/mount/src/Makefile.am b/shlibs/mount/src/Makefile.am index 843f5ab..9aa74e6 100644 --- a/shlibs/mount/src/Makefile.am +++ b/shlibs/mount/src/Makefile.am @@ -14,12 +14,12 @@ libmount_la_SOURCES = mountP.h version.c utils.c test.c init.c cache.c \ fs.c tab.c tab_parse.c tab_update.c \ context.c context_mount.c context_umount.c \ $(mountinc_HEADERS) \ - $(top_srcdir)/lib/at.c \ - $(top_srcdir)/include/list.h \ - $(top_srcdir)/lib/mangle.c \ - $(top_srcdir)/lib/canonicalize.c \ - $(top_srcdir)/lib/strutils.c \ - $(top_srcdir)/lib/env.c + @top_srcdir@/lib/at.c \ + @top_srcdir@/include/list.h \ + @top_srcdir@/lib/mangle.c \ + @top_srcdir@/lib/canonicalize.c \ + @top_srcdir@/lib/strutils.c \ + @top_srcdir@/lib/env.c nodist_libmount_la_SOURCES = mountP.h diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am index d916d3d..5597433 100644 --- a/sys-utils/Makefile.am +++ b/sys-utils/Makefile.am @@ -19,7 +19,7 @@ dist_man_MANS += dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \ if HAVE_CPU_SET_T usrbin_exec_PROGRAMS += lscpu -lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c +lscpu_SOURCES = lscpu.c @top_srcdir@/lib/cpuset.c dist_man_MANS += lscpu.1 endif @@ -27,13 +27,13 @@ endif cytune_SOURCES = cytune.c cyclades.h tunelp_SOURCES = tunelp.c lp.h -fstrim_SOURCES = fstrim.c $(top_srcdir)/lib/strutils.c -rtcwake_SOURCES = rtcwake.c $(top_srcdir)/lib/strutils.c -dmesg_SOURCES = dmesg.c $(top_srcdir)/lib/strutils.c +fstrim_SOURCES = fstrim.c @top_srcdir@/lib/strutils.c +rtcwake_SOURCES = rtcwake.c @top_srcdir@/lib/strutils.c +dmesg_SOURCES = dmesg.c @top_srcdir@/lib/strutils.c if BUILD_FALLOCATE usrbin_exec_PROGRAMS += fallocate -fallocate_SOURCES = fallocate.c $(top_srcdir)/lib/strutils.c +fallocate_SOURCES = fallocate.c @top_srcdir@/lib/strutils.c dist_man_MANS += fallocate.1 endif diff --git a/term-utils/Makefile.am b/term-utils/Makefile.am index 26f9244..53123b2 100644 --- a/term-utils/Makefile.am +++ b/term-utils/Makefile.am @@ -24,7 +24,7 @@ sbin_PROGRAMS += agetty dist_man_MANS += agetty.8 agetty_SOURCES = agetty.c if !HAVE_LANGINFO -agetty_SOURCES += $(top_srcdir)/lib/langinfo.c +agetty_SOURCES += @top_srcdir@/lib/langinfo.c endif endif diff --git a/tests/helpers/Makefile.am b/tests/helpers/Makefile.am index 26007d4..904a7b2 100644 --- a/tests/helpers/Makefile.am +++ b/tests/helpers/Makefile.am @@ -3,5 +3,5 @@ include $(top_srcdir)/config/include-Makefile.am noinst_PROGRAMS = test_sysinfo test_pathnames test_byteswap \ test_md5 -test_md5_SOURCES = test_md5.c $(top_srcdir)/lib/md5.c +test_md5_SOURCES = test_md5.c @top_srcdir@/lib/md5.c diff --git a/text-utils/Makefile.am b/text-utils/Makefile.am index 513f1c3..760d25d 100644 --- a/text-utils/Makefile.am +++ b/text-utils/Makefile.am @@ -5,9 +5,9 @@ EXTRA_DIST = README.clear README.col usrbin_exec_PROGRAMS = col colcrt colrm column hexdump rev line tailf hexdump_SOURCES = hexdump.c conv.c display.c hexsyntax.c parse.c \ - hexdump.h $(top_srcdir)/lib/strutils.c + hexdump.h @top_srcdir@/lib/strutils.c -tailf_SOURCES = tailf.c $(top_srcdir)/lib/strutils.c +tailf_SOURCES = tailf.c @top_srcdir@/lib/strutils.c dist_man_MANS = col.1 colcrt.1 colrm.1 column.1 hexdump.1 rev.1 line.1 tailf.1 -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe util-linux" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
