diff options
| author | Karel Zak | 2016-05-04 15:02:02 +0200 |
|---|---|---|
| committer | Karel Zak | 2016-05-04 15:02:02 +0200 |
| commit | 832bbc73b26f8bffc1f57c29cf9d819ef5d1bc4f (patch) | |
| tree | 8d95cb77dc45c5f153770f2baeb79fa983636a9a | |
| parent | sfdisk: add --wipe-partitions=auto|never|default (diff) | |
| download | kernel-qcow2-util-linux-832bbc73b26f8bffc1f57c29cf9d819ef5d1bc4f.tar.gz kernel-qcow2-util-linux-832bbc73b26f8bffc1f57c29cf9d819ef5d1bc4f.tar.xz kernel-qcow2-util-linux-832bbc73b26f8bffc1f57c29cf9d819ef5d1bc4f.zip | |
build-sys: remove obsolete [cs]fdisk LDADDs
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | disk-utils/Makemodule.am | 25 | ||||
| -rw-r--r-- | disk-utils/cfdisk.c | 4 |
2 files changed, 0 insertions, 29 deletions
diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am index bbdef1d42..49bfe8e18 100644 --- a/disk-utils/Makemodule.am +++ b/disk-utils/Makemodule.am @@ -143,16 +143,6 @@ fdisk_LDADD = $(LDADD) libcommon.la libfdisk.la \ libsmartcols.la libtcolors.la $(READLINE_LIBS) fdisk_CFLAGS = $(AM_CFLAGS) -I$(ul_libfdisk_incdir) -I$(ul_libsmartcols_incdir) -if BUILD_LIBBLKID -fdisk_CFLAGS += -I$(ul_libblkid_incdir) -fdisk_LDADD += libblkid.la -endif - -if BUILD_LIBUUID -fdisk_CFLAGS += -I$(ul_libuuid_incdir) -fdisk_LDADD += libuuid.la -endif - if HAVE_STATIC_FDISK sbin_PROGRAMS += fdisk.static fdisk_static_SOURCES = $(fdisk_SOURCES) @@ -175,16 +165,6 @@ sfdisk_LDADD = $(LDADD) libcommon.la libfdisk.la \ libsmartcols.la libtcolors.la $(READLINE_LIBS) sfdisk_CFLAGS = $(AM_CFLAGS) -I$(ul_libfdisk_incdir) -I$(ul_libsmartcols_incdir) -if BUILD_LIBUUID -sfdisk_CFLAGS += -I$(ul_libuuid_incdir) -sfdisk_LDADD += libuuid.la -endif - -if BUILD_LIBBLKID -sfdisk_CFLAGS += -I$(ul_libblkid_incdir) -sfdisk_LDADD += libblkid.la -endif - if HAVE_STATIC_SFDISK sbin_PROGRAMS += sfdisk.static sfdisk_static_SOURCES = $(sfdisk_SOURCES) @@ -210,11 +190,6 @@ cfdisk_CFLAGS = \ -I$(ul_libfdisk_incdir) \ -I$(ul_libsmartcols_incdir) -if BUILD_LIBBLKID -cfdisk_CFLAGS += -I$(ul_libblkid_incdir) -cfdisk_LDADD += libblkid.la -endif - if BUILD_LIBMOUNT cfdisk_CFLAGS += -I$(ul_libmount_incdir) cfdisk_LDADD += libmount.la diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c index b7014e330..c96d9a523 100644 --- a/disk-utils/cfdisk.c +++ b/disk-utils/cfdisk.c @@ -23,10 +23,6 @@ #include <sys/ioctl.h> #include <libfdisk.h> -#ifdef HAVE_LIBBLKID -# include <blkid.h> /* keep it optional */ -#endif - #ifdef HAVE_LIBMOUNT # include <libmount.h> /* keep it optional for non-linux systems */ #endif |