Update to upstream util-linux 2.20.1

[framework/base/util-linux-ng.git] / disk-utils / Makefile.am

diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
index 6bd22bc..6ca19c6 100644 (file)
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
@@ -1,22 +1,34 @@
 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 BUILD_LIBUUID
+uuid_cflags = -I$(ul_libuuid_srcdir)
+uuid_ldadd = $(ul_libuuid_la)
 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)
 
-mkswap_SOURCES = mkswap.c $(utils_common) ../lib/wholedisk.c ../lib/pttype.c
-mkswap_LDADD =
-mkswap_CFLAGS =
+fsck_minix_SOURCES = fsck.minix.c minix_programs.h $(top_srcdir)/lib/ismounted.c
+mkfs_minix_SOURCES = mkfs.minix.c minix_programs.h $(utils_common) \
+                   $(top_srcdir)/lib/strutils.c 
+mkfs_bfs_SOURCES = mkfs.bfs.c $(utils_common) $(top_srcdir)/lib/strutils.c
 
+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_LDADD = $(uuid_ldadd)
+mkswap_CFLAGS = $(AM_CFLAGS) $(uuid_cflags)
+
+isosize_SOURCES = isosize.c $(top_srcdir)/lib/strutils.c
 usrbin_exec_PROGRAMS = isosize
 usrsbin_exec_PROGRAMS =
 
@@ -27,10 +39,19 @@ 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)
+mkswap_LDADD += $(ul_libblkid_la)
+mkswap_CFLAGS += -I$(ul_libblkid_incdir)
+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
@@ -41,24 +62,14 @@ endif
 endif
 
 if BUILD_CRAMFS
-cramfs_common = $(utils_common) cramfs.h cramfs_common.c cramfs_common.h
+cramfs_common = $(utils_common) cramfs.h cramfs_common.c
 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 $(top_srcdir)/lib/strutils.c
 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 HAVE_SELINUX
 mkswap_LDADD += -lselinux
 endif