build-sys: convert lib/ to libcommon.la

Signed-off-by: Karel Zak <kzak@redhat.com>

1 files changed, 26 insertions, 52 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