From: Karel Zak <kzak@redhat.com>
Date: Wed, 4 May 2016 13:02:02 +0000 (+0200)
Subject: build-sys: remove obsolete [cs]fdisk LDADDs
X-Git-Tag: v2.29-rc1~261
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=832bbc73b26f8bffc1f57c29cf9d819ef5d1bc4f;p=thirdparty%2Futil-linux.git

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 bbdef1d420..49bfe8e189 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 b7014e330e..c96d9a5238 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