From 18b3e5495b2bd1d89286f452d1d2952e065dfecd Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 22 Sep 2014 13:16:25 +0200 Subject: swapon: split swapon-common.c swapon - requires libmount and libblkid swapoff - requires libmount swaplabel - requires libblkid This patch add lib/swapprober.c with blkid stuff for swap. It allows to use and link libblkid only when necessary. Signed-off-by: Karel Zak --- disk-utils/Makemodule.am | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'disk-utils/Makemodule.am') diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am index 04118c73b..3c4f8d78b 100644 --- a/disk-utils/Makemodule.am +++ b/disk-utils/Makemodule.am @@ -65,10 +65,13 @@ endif # BUILD_MKSWAP if BUILD_SWAPLABEL sbin_PROGRAMS += swaplabel dist_man_MANS += disk-utils/swaplabel.8 -swaplabel_SOURCES = disk-utils/swaplabel.c sys-utils/swapon-common.c +swaplabel_SOURCES = \ + disk-utils/swaplabel.c \ + lib/swapprober.c \ + include/swapprober.h -swaplabel_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -I$(ul_libmount_incdir) -swaplabel_LDADD = $(LDADD) libblkid.la libmount.la libcommon.la +swaplabel_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) +swaplabel_LDADD = $(LDADD) libblkid.la libcommon.la if BUILD_LIBUUID swaplabel_LDADD += libuuid.la -- cgit v1.2.3-55-g7522