Fixes from coreutils sync: some files now required and removed generateable files

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1395 f882894a-f735-0410-b71e-b25c423dba1c

2 files changed, 3 insertions, 50 deletions

diff --git a/m4/Makefile.am b/m4/Makefile.am
deleted file mode 100644
index 404c043..0000000
--- a/m4/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-## Process this file with automake to produce Makefile.in.
-EXTRA_DIST =
-EXTRA_DIST += Makefile.am.in
-EXTRA_DIST += afs.m4
-EXTRA_DIST += codeset.m4
-EXTRA_DIST += error.m4
-EXTRA_DIST += exitfail.m4
-EXTRA_DIST += extensions.m4
-EXTRA_DIST += fstypename.m4
-EXTRA_DIST += fsusage.m4
-EXTRA_DIST += getopt.m4
-EXTRA_DIST += gettext.m4
-EXTRA_DIST += glibc21.m4
-EXTRA_DIST += iconv.m4
-EXTRA_DIST += intdiv0.m4
-EXTRA_DIST += inttypes-pri.m4
-EXTRA_DIST += inttypes.m4
-EXTRA_DIST += inttypes_h.m4
-EXTRA_DIST += isc-posix.m4
-EXTRA_DIST += lcmessage.m4
-EXTRA_DIST += lib-ld.m4
-EXTRA_DIST += lib-link.m4
-EXTRA_DIST += lib-prefix.m4
-EXTRA_DIST += ls-mntd-fs.m4
-EXTRA_DIST += malloc.m4
-EXTRA_DIST += mountlist.m4
-EXTRA_DIST += np_coreutils.m4
-EXTRA_DIST += onceonly.m4
-EXTRA_DIST += progtest.m4
-EXTRA_DIST += realloc.m4
-EXTRA_DIST += stdbool.m4
-EXTRA_DIST += stdint_h.m4
-EXTRA_DIST += uintmax_t.m4
-EXTRA_DIST += ulonglong.m4
-EXTRA_DIST += unlocked-io.m4
-EXTRA_DIST += xalloc.m4
-
-Makefile.am: Makefile.am.in
-        rm -f $@ $@t
-        (echo "## Process this file with automake to produce Makefile.in."; \
-         echo EXTRA_DIST =;                             \
-         echo "EXTRA_DIST += Makefile.am.in";           \
-         ls -1 *.m4 | sed 's/^/EXTRA_DIST += /'; echo ) \
-          >> $@t
-        sed -n '/^Makefile\.am:/,$$p' $@.in >> $@t
-        chmod a-w $@t
-        mv $@t $@
-
-print_coreutil_files:
-        @echo $(EXTRA_DIST)
diff --git a/m4/Makefile.am.in b/m4/Makefile.am.in
index f5e1931..fb60ada 100644
--- a/m4/Makefile.am.in
+++ b/m4/Makefile.am.in
@@ -10,3 +10,6 @@ Makefile.am: Makefile.am.in
         sed -n '/^Makefile\.am:/,$$p' $@.in >> $@t
         chmod a-w $@t
         mv $@t $@
+
+print_coreutil_files:
+        @echo $(EXTRA_DIST)