diff options
Diffstat (limited to 'disk-utils/Makefile.am')
| -rw-r--r-- | disk-utils/Makefile.am | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am index ed0a6e4b8..67aeae40e 100644 --- a/disk-utils/Makefile.am +++ b/disk-utils/Makefile.am @@ -5,17 +5,32 @@ if LINUX utils_common += ../lib/linux_version.c endif +if HAVE_UUID +if BUILD_LIBUUID +uuid_cflags = -I$(ul_libuuid_srcdir) +uuid_ldadd = $(ul_libuuid_la) +else +uuid_cflags = $(UUID_CFLAGS) +uuid_ldadd = $(UUID_LIBS) +endif +endif + dist_man_MANS = isosize.8 mkfs.8 mkswap.8 \ fsck.minix.8 mkfs.minix.8 mkfs.bfs.8 sbin_PROGRAMS = mkfs mkswap fsck.minix mkfs.minix mkfs.bfs + fsck_minix_SOURCES = fsck.minix.c minix.h mkfs_minix_SOURCES = mkfs.minix.c minix.h $(utils_common) mkfs_bfs_SOURCES = mkfs.bfs.c $(utils_common) +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_LDADD = -mkswap_CFLAGS = $(AM_CFLAGS) +mkswap_LDADD = $(uuid_ldadd) +mkswap_CFLAGS = $(AM_CFLAGS) $(uuid_cflags) usrbin_exec_PROGRAMS = isosize usrsbin_exec_PROGRAMS = @@ -27,6 +42,13 @@ usrsbin_exec_PROGRAMS += fdformat blockdev_SOURCES = blockdev.c $(utils_common) endif +if BUILD_LIBBLKID +sbin_PROGRAMS += swaplabel +dist_man_MANS += swaplabel.8 +swaplabel_LDADD += $(ul_libblkid_la) +swaplabel_CFLAGS += -I$(ul_libblkid_incdir) +endif + if BUILD_ELVTUNE sbin_PROGRAMS += elvtune dist_man_MANS += elvtune.8 @@ -49,16 +71,6 @@ fsck_cramfs_LDADD = -lz mkfs_cramfs_LDADD = -lz endif -if HAVE_UUID -if BUILD_LIBUUID -mkswap_LDADD += $(ul_libuuid_la) -mkswap_CFLAGS += -I$(ul_libuuid_srcdir) -else -mkswap_LDADD += $(UUID_LIBS) -mkswap_CFLAGS += $(UUID_CFLAGS) -endif -endif - if BUILD_LIBBLKID # only in-tree libblkid has partitions parsing support mkswap_LDADD += $(ul_libblkid_la) |