From: Karel Zak <kzak@redhat.com>
Date: Wed, 10 Jul 2013 15:39:22 +0000 (+0200)
Subject: fdisk: remove common.h
X-Git-Tag: v2.24-rc1~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d9362988ec5117e4fd8efe50eae0ef3c0a2664a;p=thirdparty%2Futil-linux.git

fdisk: remove common.h

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

diff --git a/fdisks/Makemodule.am b/fdisks/Makemodule.am
index 1fc56c3c6f..43287e804b 100644
--- a/fdisks/Makemodule.am
+++ b/fdisks/Makemodule.am
@@ -8,9 +8,7 @@ fdisk_SOURCES = \
 	fdisks/fdisk.c \
 	fdisks/fdisk.h \
 	fdisks/fdisk-ask.c \
-	fdisks/fdisk-menu.c \
-	fdisks/partname.c \
-	fdisks/common.h
+	fdisks/fdisk-menu.c
 
 fdisk_LDADD = $(LDADD) libcommon.la libfdisk.la
 fdisk_CFLAGS = $(AM_CFLAGS) -I$(ul_libfdisk_incdir)
@@ -49,7 +47,7 @@ dist_man_MANS += fdisks/sfdisk.8
 sfdisk_SOURCES = \
 	fdisks/partname.c \
 	fdisks/sfdisk.c \
-	fdisks/common.h
+	fdisks/partname.h
 sfdisk_LDADD = $(LDADD) libcommon.la
 
 if HAVE_STATIC_SFDISK
@@ -63,7 +61,7 @@ endif
 if BUILD_CFDISK
 sbin_PROGRAMS += cfdisk
 dist_man_MANS += fdisks/cfdisk.8
-cfdisk_SOURCES = fdisks/cfdisk.c fdisks/common.h
+cfdisk_SOURCES = fdisks/cfdisk.c
 cfdisk_CFLAGS =
 cfdisk_LDADD = $(LDADD) libcommon.la
 
diff --git a/fdisks/cfdisk.c b/fdisks/cfdisk.c
index bc9c159604..5007fc99e3 100644
--- a/fdisks/cfdisk.c
+++ b/fdisks/cfdisk.c
@@ -102,7 +102,6 @@
 #include "rpmatch.h"
 #include "blkdev.h"
 #include "strutils.h"
-#include "common.h"
 #include "mbsalign.h"
 #include "widechar.h"
 
diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c
index b8fc37abe1..44c9281c1c 100644
--- a/fdisks/fdisk.c
+++ b/fdisks/fdisk.c
@@ -27,7 +27,6 @@
 #include "nls.h"
 #include "rpmatch.h"
 #include "blkdev.h"
-#include "common.h"
 #include "mbsalign.h"
 #include "fdisk.h"
 #include "wholedisk.h"
diff --git a/fdisks/partname.c b/fdisks/partname.c
index 1671e19205..db85d56726 100644
--- a/fdisks/partname.c
+++ b/fdisks/partname.c
@@ -4,7 +4,7 @@
 
 #include "blkdev.h"
 #include "pathnames.h"
-#include "common.h"
+#include "partname.h"
 #include "c.h"
 
 /*
diff --git a/fdisks/common.h b/fdisks/partname.h
similarity index 100%
rename from fdisks/common.h
rename to fdisks/partname.h
diff --git a/fdisks/sfdisk.c b/fdisks/sfdisk.c
index b078fc2e6a..b4ca9a0ce4 100644
--- a/fdisks/sfdisk.c
+++ b/fdisks/sfdisk.c
@@ -46,7 +46,7 @@
 #include "xalloc.h"
 #include "blkdev.h"
 #include "linux_version.h"
-#include "common.h"
+#include "partname.h"
 #include "wholedisk.h"
 #include "pathnames.h"
 #include "canonicalize.h"