From 8365ed42acd4bd5468f7b32eb80652ee55d85d6b Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Wed, 16 May 2012 15:05:11 +0200
Subject: build-sys: convert include/ to module

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 Makefile.am           |  8 +++++++-
 configure.ac          |  1 -
 include/Makefile.am   | 45 ---------------------------------------------
 include/Makemodule.am | 44 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 47 deletions(-)
 delete mode 100644 include/Makefile.am
 create mode 100644 include/Makemodule.am

diff --git a/Makefile.am b/Makefile.am
index 0f6414189..1e5ac615f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,8 @@
 include $(top_srcdir)/config/include-Makefile.am
 
+dist_noinst_HEADERS =
+
+
 SHLIBS_DIRS =
 
 if BUILD_LIBUUID
@@ -22,7 +25,6 @@ SUBDIRS = \
 	disk-utils \
 	fdisk \
 	getopt \
-	include \
 	lib \
 	login-utils \
 	misc-utils \
@@ -62,6 +64,10 @@ EXTRA_DIST = \
 	po/update-potfiles \
 	README.licensing
 
+
+include include/Makemodule.am
+
+
 # Arrange so that .tarball-version appears only in the distribution
 # tarball, and never in a checked-out repository.
 dist-hook:
diff --git a/configure.ac b/configure.ac
index 046a0679d..055a7de4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1304,7 +1304,6 @@ disk-utils/Makefile
 fdisk/Makefile
 getopt/Makefile
 hwclock/Makefile
-include/Makefile
 lib/Makefile
 libblkid/Makefile
 libblkid/blkid.pc
diff --git a/include/Makefile.am b/include/Makefile.am
deleted file mode 100644
index 82164e416..000000000
--- a/include/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-include $(top_srcdir)/config/include-Makefile.am
-
-dist_noinst_HEADERS = \
-	all-io.h \
-	at.h \
-	bitops.h \
-	blkdev.h \
-	c.h \
-	canonicalize.h \
-	carefulputc.h \
-	closestream.h \
-	cpuset.h \
-	crc32.h \
-	env.h \
-	exitcodes.h \
-	fileutils.h \
-	ismounted.h \
-	linux_reboot.h \
-	linux_version.h \
-	list.h \
-	loopdev.h \
-	mangle.h \
-	match.h \
-	mbsalign.h \
-	md5.h \
-	minix.h \
-	nls.h \
-	optutils.h \
-	pamfail.h \
-	path.h \
-	pathnames.h \
-	procutils.h \
-	randutils.h \
-	rpmatch.h \
-	setproctitle.h \
-	strutils.h \
-	swapheader.h \
-	sysfs.h \
-	tt.h \
-	ttyutils.h \
-	usleep.h \
-	wholedisk.h \
-	widechar.h \
-	xalloc.h \
-	xgetpass.h
diff --git a/include/Makemodule.am b/include/Makemodule.am
new file mode 100644
index 000000000..087bb4126
--- /dev/null
+++ b/include/Makemodule.am
@@ -0,0 +1,44 @@
+
+dist_noinst_HEADERS += \
+	include/all-io.h \
+	include/at.h \
+	include/bitops.h \
+	include/blkdev.h \
+	include/c.h \
+	include/canonicalize.h \
+	include/carefulputc.h \
+	include/closestream.h \
+	include/cpuset.h \
+	include/crc32.h \
+	include/env.h \
+	include/exitcodes.h \
+	include/fileutils.h \
+	include/ismounted.h \
+	include/linux_reboot.h \
+	include/linux_version.h \
+	include/list.h \
+	include/loopdev.h \
+	include/mangle.h \
+	include/match.h \
+	include/mbsalign.h \
+	include/md5.h \
+	include/minix.h \
+	include/nls.h \
+	include/optutils.h \
+	include/pamfail.h \
+	include/path.h \
+	include/pathnames.h \
+	include/procutils.h \
+	include/randutils.h \
+	include/rpmatch.h \
+	include/setproctitle.h \
+	include/strutils.h \
+	include/swapheader.h \
+	include/sysfs.h \
+	include/tt.h \
+	include/ttyutils.h \
+	include/usleep.h \
+	include/wholedisk.h \
+	include/widechar.h \
+	include/xalloc.h \
+	include/xgetpass.h
-- 
cgit v1.2.3-55-g7522