build-sys: remove generated headers from dist tar ball

Headers should only be listed in either *_HEADERS or
*_SOURCES, especially when we want nodist_*_HEADERS.

Since all the generated headers are made by configure we
don't even need to use BUILT_SOURCES or other tricks.

Also see automake docs 9.4.1 Built Sources Example:
  case "Build bindir.h from configure"

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am
index 65d2e66ed1dbd9b42ce1093781345da706201214..b8843e8963d0bcac9fda043cae68ebd03d80e39e 100644 (file)
--- a/libblkid/src/Makemodule.am
+++ b/libblkid/src/Makemodule.am
@@ -26,7 +26,6 @@ libblkid_la_SOURCES = \
        libblkid/src/tag.c \
        libblkid/src/verify.c \
        libblkid/src/version.c \
-       $(nodist_blkidinc_HEADERS) \
        \
        libblkid/src/partitions/aix.c \
        libblkid/src/partitions/aix.h \
@@ -112,7 +111,6 @@ libblkid_la_SOURCES += \
        libblkid/src/topology/sysfs.c
 endif
 
-nodist_libblkid_la_SOURCES = libblkid/src/blkid.h
 libblkid_la_LIBADD = libcommon.la
 
 libblkid_la_DEPENDENCIES = \

diff --git a/libfdisk/src/Makemodule.am b/libfdisk/src/Makemodule.am
index b51de58f4525b765efc09ca7e2858e1dc23cbc14..0e568381fb2ed677c2864766f997e492f8b030e0 100644 (file)
--- a/libfdisk/src/Makemodule.am
+++ b/libfdisk/src/Makemodule.am
@@ -29,11 +29,7 @@ libfdisk_la_SOURCES = \
        libfdisk/src/sgi.c \
        libfdisk/src/dos.c \
        libfdisk/src/bsd.c \
-       libfdisk/src/gpt.c \
-       $(nodist_fdiskinc_HEADERS)
-
-
-nodist_libfdisk_la_SOURCES = libfdisk/src/fdiskP.h
+       libfdisk/src/gpt.c
 
 libfdisk_la_LIBADD = libcommon.la libuuid.la
 

diff --git a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am
index e5861b0baf7668f17acab07d6e6fdf2cb30082ff..516bebbfa096fdebad09aa4983a139ce1321a5d5 100644 (file)
--- a/libmount/src/Makemodule.am
+++ b/libmount/src/Makemodule.am
@@ -8,12 +8,12 @@ libmount_la_SOURCES = \
        include/list.h \
        lib/monotonic.c \
        \
+       libmount/src/mountP.h \
        libmount/src/cache.c \
        libmount/src/fs.c \
        libmount/src/init.c \
        libmount/src/iter.c \
        libmount/src/lock.c \
-       libmount/src/mountP.h \
        libmount/src/optmap.c \
        libmount/src/optstr.c \
        libmount/src/tab.c \
@@ -22,8 +22,7 @@ libmount_la_SOURCES = \
        libmount/src/tab_update.c \
        libmount/src/test.c \
        libmount/src/utils.c \
-       libmount/src/version.c \
-       $(nodist_mountinc_HEADERS)
+       libmount/src/version.c
 
 if LINUX
 libmount_la_SOURCES += \
@@ -39,7 +38,6 @@ endif
 
 endif # LINUX
 
-nodist_libmount_la_SOURCES = libmount/src/mountP.h
 
 libmount_la_LIBADD = \
        libcommon.la \

diff --git a/libsmartcols/src/Makemodule.am b/libsmartcols/src/Makemodule.am
index 83c12ca54c5edc562bf729e1e89b21fe61ab7373..2b1c1fd1ccaa52fd3a2f560d9fa236a83cbed955 100644 (file)
--- a/libsmartcols/src/Makemodule.am
+++ b/libsmartcols/src/Makemodule.am
@@ -17,10 +17,7 @@ libsmartcols_la_SOURCES= \
        libsmartcols/src/table.c \
        libsmartcols/src/table_print.c \
        libsmartcols/src/version.c \
-       libsmartcols/src/init.c \
-       $(nodist_smartcolsinc_HEADERS)
-
-nodist_libsmartcols_la_SOURCES = libsmartcols/src/smartcolsP.h
+       libsmartcols/src/init.c
 
 libsmartcols_la_LIBADD = libcommon.la
 

diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am
index 0816fac4a62f11ff998838ac33f137d98f41b588..a1c1e4ab35382049bca39293775db76b1d1c4cdb 100644 (file)
--- a/libuuid/src/Makemodule.am
+++ b/libuuid/src/Makemodule.am
@@ -11,6 +11,7 @@ uuidinc_HEADERS = libuuid/src/uuid.h
 usrlib_exec_LTLIBRARIES += libuuid.la
 
 libuuid_la_SOURCES = \
+       libuuid/src/uuidP.h \
        libuuid/src/clear.c \
        libuuid/src/compare.c \
        libuuid/src/copy.c \
@@ -21,11 +22,8 @@ libuuid_la_SOURCES = \
        libuuid/src/unpack.c \
        libuuid/src/unparse.c \
        libuuid/src/uuidd.h \
-       libuuid/src/uuidd.h \
-       libuuid/src/uuidP.h \
        libuuid/src/uuid_time.c \
        libuuid/src/predefined.c \
-       $(uuidinc_HEADERS) \
        lib/randutils.c \
        lib/md5.c \
        lib/sha1.c