From 5dfc518c2e2a02b9011295dbfc3015f239acde00 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 24 May 2010 12:37:12 +0200 Subject: [PATCH] build-sys: replace ../ with $top_srcdir Signed-off-by: Karel Zak --- disk-utils/Makefile.am | 10 +++++----- fdisk/Makefile.am | 7 ++++--- fsck/Makefile.am | 4 ++-- login-utils/Makefile.am | 4 ++-- misc-utils/Makefile.am | 7 ++++--- mount/Makefile.am | 19 +++++++++++-------- partx/Makefile.am | 4 ++-- sys-utils/Makefile.am | 2 +- 8 files changed, 31 insertions(+), 26 deletions(-) diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am index 67aeae40..664c9980 100644 --- a/disk-utils/Makefile.am +++ b/disk-utils/Makefile.am @@ -1,8 +1,8 @@ include $(top_srcdir)/config/include-Makefile.am -utils_common = ../lib/blkdev.c +utils_common = $(top_srcdir)/lib/blkdev.c if LINUX -utils_common += ../lib/linux_version.c +utils_common += $(top_srcdir)/lib/linux_version.c endif if HAVE_UUID @@ -28,7 +28,7 @@ swaplabel_SOURCES = swaplabel.c $(utils_common) swaplabel_LDADD = $(uuid_ldadd) swaplabel_CFLAGS = $(AM_CFLAGS) $(uuid_cflags) -mkswap_SOURCES = mkswap.c $(utils_common) ../lib/wholedisk.c +mkswap_SOURCES = mkswap.c $(utils_common) $(top_srcdir)/lib/wholedisk.c mkswap_LDADD = $(uuid_ldadd) mkswap_CFLAGS = $(AM_CFLAGS) $(uuid_cflags) @@ -52,7 +52,7 @@ endif if BUILD_ELVTUNE sbin_PROGRAMS += elvtune dist_man_MANS += elvtune.8 -elvtune_SOURCES = elvtune.c ../lib/linux_version.c +elvtune_SOURCES = elvtune.c $(top_srcdir)/lib/linux_version.c endif if HAVE_RAW @@ -66,7 +66,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) ../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 7b87d6cf..9a9db0c2 100644 --- a/fdisk/Makefile.am +++ b/fdisk/Makefile.am @@ -3,10 +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 \ - ../lib/blkdev.c ../lib/wholedisk.c ../lib/mbsalign.c + $(top_srcdir)/lib/blkdev.c $(top_srcdir)/lib/wholedisk.c \ + $(top_srcdir)/lib/mbsalign.c if LINUX -fdisk_common += ../lib/linux_version.c +fdisk_common += $(top_srcdir)/lib/linux_version.c endif if !ARCH_M68K @@ -53,7 +54,7 @@ endif if USE_SLANG sbin_PROGRAMS += cfdisk dist_man_MANS += cfdisk.8 -cfdisk_SOURCES = cfdisk.c $(fdisk_common) ../lib/mbsalign.c +cfdisk_SOURCES = cfdisk.c $(fdisk_common) $(top_srcdir)/lib/mbsalign.c cfdisk_CFLAGS = $(cflags_blkid) cfdisk_LDADD = -lslang $(ldadd_blkid) else diff --git a/fsck/Makefile.am b/fsck/Makefile.am index 203d36b0..b0949e25 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 = base_device.c fsck.c fsck.h ../lib/ismounted.c \ - ../lib/fsprobe.c ../lib/canonicalize.c +fsck_SOURCES = base_device.c 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/login-utils/Makefile.am b/login-utils/Makefile.am index 920a6e7c..9ebd0b7c 100644 --- a/login-utils/Makefile.am +++ b/login-utils/Makefile.am @@ -46,8 +46,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 my_crypt.h setpwnam.h \ - ../lib/env.c -login_SOURCES = login.c login.h my_crypt.h ../lib/setproctitle.c + $(top_srcdir)/lib/env.c +login_SOURCES = login.c login.h my_crypt.h $(top_srcdir)/lib/setproctitle.c newgrp_SOURCES = newgrp.c my_crypt.h vipw_SOURCES = vipw.c setpwnam.h diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am index ca272560..c98107d6 100644 --- a/misc-utils/Makefile.am +++ b/misc-utils/Makefile.am @@ -10,7 +10,7 @@ usrbin_exec_PROGRAMS = cal ddate logger look mcookie \ namei script whereis scriptreplay EXTRA_DIST += README.cal README.ddate README.namei README.namei2 -mcookie_SOURCES = mcookie.c ../lib/md5.c +mcookie_SOURCES = mcookie.c $(top_srcdir)/lib/md5.c script_LDADD = usrbin_exec_SCRIPTS = chkdupexe @@ -36,12 +36,13 @@ 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 ../lib/strtosize.c +blkid_SOURCES = blkid.c $(top_srcdir)/lib/ismounted.c \ + $(top_srcdir)/lib/strtosize.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 ../lib/strtosize.c +wipefs_SOURCES = wipefs.c $(top_srcdir)/lib/strtosize.c wipefs_LDADD = $(ul_libblkid_la) wipefs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) if HAVE_STATIC_BLKID diff --git a/mount/Makefile.am b/mount/Makefile.am index 8465d11e..83e1fcdd 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 ../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,8 +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) ../lib/env.c ../lib/linux_version.c \ - ../lib/blkdev.c ../lib/fsprobe.c ../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 @@ -26,7 +27,8 @@ ldadd_static = cflags_common = $(AM_CFLAGS) ldflags_static = -all-static -mount_SOURCES = mount.c $(srcs_mount) ../lib/setproctitle.c ../lib/strtosize.c +mount_SOURCES = mount.c $(srcs_mount) $(top_srcdir)/lib/setproctitle.c \ + $(top_srcdir)/lib/strtosize.c mount_CFLAGS = $(SUID_CFLAGS) $(cflags_common) mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) mount_LDADD = $(ldadd_common) @@ -36,13 +38,14 @@ umount_CFLAGS = $(SUID_CFLAGS) $(cflags_common) umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) umount_LDADD = $(ldadd_common) -swapon_SOURCES = swapon.c swap_constants.h ../lib/linux_version.c \ - ../lib/blkdev.c ../lib/fsprobe.c ../lib/canonicalize.c \ - ../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 ../lib/strtosize.c +losetup_SOURCES = lomount.c $(srcs_common) loop.h lomount.h \ + $(top_srcdir)/lib/strtosize.c losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS) mount_static_LDADD = diff --git a/partx/Makefile.am b/partx/Makefile.am index 238f3228..36163aa9 100644 --- a/partx/Makefile.am +++ b/partx/Makefile.am @@ -4,10 +4,10 @@ if BUILD_PARTX usrsbin_exec_PROGRAMS = addpart delpart partx partx_SOURCES = bsd.c dos.c partx.c solaris.c unixware.c gpt.c crc32.c \ - efi.h gpt.h crc32.h partx.h dos.h ../lib/blkdev.c + efi.h gpt.h crc32.h partx.h dos.h $(top_srcdir)/lib/blkdev.c if LINUX -partx_SOURCES += ../lib/linux_version.c +partx_SOURCES += $(top_srcdir)/lib/linux_version.c endif dist_man_MANS = addpart.8 delpart.8 partx.8 diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am index 06d991c3..0d9b3798 100644 --- a/sys-utils/Makefile.am +++ b/sys-utils/Makefile.am @@ -25,7 +25,7 @@ info_TEXINFOS = ipc.texi if BUILD_FALLOCATE usrbin_exec_PROGRAMS += fallocate -fallocate_SOURCES = fallocate.c ../lib/strtosize.c +fallocate_SOURCES = fallocate.c $(top_srcdir)/lib/strtosize.c dist_man_MANS += fallocate.1 endif -- 2.39.5