[PATCH 06/33] build system: remove include/Makefile.am, remove a useless recursion

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The headers will be distributed by the top-level Makefile.am

Signed-off-by: Diego Elio 'Flameeyes' Pettenò <flameeyes@xxxxxxxxx>
---
 Makefile.am         |   30 +++++++++++++++++++++++++++++-
 configure.ac        |    1 -
 include/Makefile.am |   30 ------------------------------
 3 files changed, 29 insertions(+), 32 deletions(-)
 delete mode 100644 include/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c489665..9e612ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,34 @@
 include $(top_srcdir)/config/include-Makefile.am
 
+noinst_HEADERS = \
+	include/bitops.h \
+	include/blkdev.h \
+	include/canonicalize.h \
+	include/carefulputc.h \
+	include/c.h \
+	include/cpuset.h \
+	include/crc32.h \
+	include/env.h \
+	include/fsprobe.h \
+	include/ismounted.h \
+	include/linux_reboot.h \
+	include/linux_version.h \
+	include/list.h \
+	include/mangle.h \
+	include/mbsalign.h \
+	include/md5.h \
+	include/nls.h \
+	include/pathnames.h \
+	include/setproctitle.h \
+	include/strtosize.h \
+	include/swapheader.h \
+	include/tt.h \
+	include/usleep.h \
+	include/wholedisk.h \
+	include/widechar.h \
+	include/writeall.h \
+	include/xstrncpy.h
+
 SHLIBS_DIRS =
 
 if BUILD_LIBUUID
@@ -15,7 +44,6 @@ SHLIBS_DIRS += shlibs/mount
 endif
 
 SUBDIRS = \
-	include \
 	disk-utils \
 	fdisk \
 	getopt \
diff --git a/configure.ac b/configure.ac
index 657ebe5..a259157 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1137,7 +1137,6 @@ fdisk/Makefile
 fsck/Makefile
 getopt/Makefile
 hwclock/Makefile
-include/Makefile
 lib/Makefile
 login-utils/Makefile
 Makefile
diff --git a/include/Makefile.am b/include/Makefile.am
deleted file mode 100644
index 3b93acd..0000000
--- a/include/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-include $(top_srcdir)/config/include-Makefile.am
-
-dist_noinst_HEADERS = \
-	bitops.h \
-	blkdev.h \
-	canonicalize.h \
-	carefulputc.h \
-	c.h \
-	cpuset.h \
-	crc32.h \
-	env.h \
-	fsprobe.h \
-	ismounted.h \
-	linux_reboot.h \
-	linux_version.h \
-	list.h \
-	mangle.h \
-	mbsalign.h \
-	md5.h \
-	nls.h \
-	pathnames.h \
-	setproctitle.h \
-	strtosize.h \
-	swapheader.h \
-	tt.h \
-	usleep.h \
-	wholedisk.h \
-	widechar.h \
-	writeall.h \
-	xstrncpy.h
-- 
1.7.1.1

--
To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux