build-sys: remove obsolete [cs]fdisk LDADDs

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

diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am
index bbdef1d420e5904d6398df90728b882f06d1fa74..49bfe8e189e6957acb39be14503efa351e887c15 100644 (file)
--- 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 b7014e330eae974b2f75943b075c43c3ff6c2aea..c96d9a52387eae0662787de8ea152288ccb04ef7 100644 (file)
--- 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