[SCM] GNU M4 source repository branch, master, updated. cvs-readonly-87-g359f9f0

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=359f9f0c4c790aeceedb395eb11813b388cfe60c

The branch, master has been updated
       via  359f9f0c4c790aeceedb395eb11813b388cfe60c (commit)
      from  6608fa6d084d320401f049b259adcf6b383eaa43 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 359f9f0c4c790aeceedb395eb11813b388cfe60c
Author: Eric Blake <address@hidden>
Date:   Fri Mar 28 06:44:20 2008 -0600

    Use GNUmakefile module.
    
    * ltdl/m4/gnulib-cache.m4: Import gnumakefile module.
    * Makefile.am: Split off maintainer rules...
    * maint.mk: ...into this new file.
    
    Signed-off-by: Eric Blake <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 .cvsignore              |    1 +
 .gitignore              |    1 +
 ChangeLog               |    7 ++++++
 Makefile.am             |   35 ------------------------------
 ltdl/m4/gnulib-cache.m4 |    4 +-
 maint.mk                |   54 +++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 65 insertions(+), 37 deletions(-)
 create mode 100644 maint.mk

diff --git a/.cvsignore b/.cvsignore
index 1b25efa..4f6a6be 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -13,6 +13,7 @@ configure
 COPYING
 cscope.*
 gnu
+GNUmakefile
 INSTALL
 intl
 libtool
diff --git a/.gitignore b/.gitignore
index ed1f298..2f710ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ COPYING
 cscope.*
 CVS
 gnu
+GNUmakefile
 INSTALL
 intl
 libtool
diff --git a/ChangeLog b/ChangeLog
index 9d3c860..7c3e174 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-28  Eric Blake  <address@hidden>
+
+       Use GNUmakefile module.
+       * ltdl/m4/gnulib-cache.m4: Import gnumakefile module.
+       * Makefile.am: Split off maintainer rules...
+       * maint.mk: ...into this new file.
+
 2008-03-18  Eric Blake  <address@hidden>
 
        Stage 20b: make m4wrap obey POSIX fifo ordering.
diff --git a/Makefile.am b/Makefile.am
index 1f53c7c..ac0279d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -432,38 +432,3 @@ DISTCLEANFILES += tests/atconfig tests/atlocal tests/m4
 MAINTAINERCLEANFILES += tests/generated.at '$(TESTSUITE)'
 
 clean-local: clean-local-tests
-
-##                                                                      ##
-##                   --- RULES FOR THE MAINTAINER ---                   ##
-##           You shouldn't need to touch anything below here.           ##
-##              (mostly copied from automake/Makefile.am)               ##
-##                                                                      ##
-
-CVS    = cvs # set it to `:' to avoid CVS operations at dist time
-
-# Tag before making distribution.  Also, don't make a distribution if
-# checks fail.  Also, make sure the NEWS file is up-to-date.
-cvs-dist: distcheck # maintainer-check
-       @if sed '1,2d;3q' $(srcdir)/NEWS | grep -e "$(VERSION)" > dev/null; \
-         echo "NEWS not updated; not releasing" 1>&2; \
-         exit 1;
-       fi
-       cd $(srcdir) && \
-         $(CVS) -q tag `echo "Release-$(VERSION)" | sed 's/\./-/g'`
-       $(MAKE) dist
-
-cvs-diff:
-       thisver=`echo "Release-$(VERSION)" | sed 's/\./-/g'`; \
-       if test -z "$$OLDVERSION"; then \
-         prevno=`echo "$(VERSION)" - 0.01 | bc | sed 's/^\./0./'`; \
-       else prevno="$$OLDVERSION"; fi; \
-       prevver=Release-`echo $$prevno | sed 's/\./-/g'`; \
-       cvs -f rdiff -c -r $$prevver -r $$thisver $(PACKAGE) \
-           > $(PACKAGE)-$$prevno-$(VERSION).diff
-
-.PHONY: web-manual
-web-manual:
-       @cd $(srcdir)/doc; \
-         $(SHELL) "$(abs_srcdir)/$(config_aux_dir)/gendocs.sh" $(PACKAGE) \
-           "GNU $(PACKAGE)- GNU macro processor"
-       @echo " *** Upload the doc/manual directory to web-cvs."
diff --git a/ltdl/m4/gnulib-cache.m4 b/ltdl/m4/gnulib-cache.m4
index 958e7b3..2a2a6dd 100644
--- a/ltdl/m4/gnulib-cache.m4
+++ b/ltdl/m4/gnulib-cache.m4
@@ -15,11 +15,11 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=local --lib=libgnu 
--source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --aux-dir=build-aux 
--with-tests --libtool --macro-prefix=M4 assert autobuild avltree-oset 
binary-io clean-temp cloexec close-stream closein config-h configmake dirname 
error exit fdl fflush filenamecat flexmember fopen-safer fseeko gendocs gettext 
gnupload gpl-3.0 intprops memmem mkstemp obstack progname quote regex 
regexprops-generic sprintf-posix stdbool stdlib-safer strnlen strtod strtol 
tempname unlocked-io vasnprintf-posix verror xalloc xalloc-die xprintf-posix 
xstrndup xvasprintf-posix
+#   gnulib-tool --import --dir=. --local-dir=local --lib=libgnu 
--source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --aux-dir=build-aux 
--with-tests --libtool --macro-prefix=M4 assert autobuild avltree-oset 
binary-io clean-temp cloexec close-stream closein config-h configmake dirname 
error exit fdl fflush filenamecat flexmember fopen-safer fseeko gendocs gettext 
gnumakefile gnupload gpl-3.0 intprops memmem mkstemp obstack progname quote 
regex regexprops-generic sprintf-posix stdbool stdlib-safer strnlen strtod 
strtol tempname unlocked-io vasnprintf-posix verror xalloc xalloc-die 
xprintf-posix xstrndup xvasprintf-posix
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([local])
-gl_MODULES([assert autobuild avltree-oset binary-io clean-temp cloexec 
close-stream closein config-h configmake dirname error exit fdl fflush 
filenamecat flexmember fopen-safer fseeko gendocs gettext gnupload gpl-3.0 
intprops memmem mkstemp obstack progname quote regex regexprops-generic 
sprintf-posix stdbool stdlib-safer strnlen strtod strtol tempname unlocked-io 
vasnprintf-posix verror xalloc xalloc-die xprintf-posix xstrndup 
xvasprintf-posix])
+gl_MODULES([assert autobuild avltree-oset binary-io clean-temp cloexec 
close-stream closein config-h configmake dirname error exit fdl fflush 
filenamecat flexmember fopen-safer fseeko gendocs gettext gnumakefile gnupload 
gpl-3.0 intprops memmem mkstemp obstack progname quote regex regexprops-generic 
sprintf-posix stdbool stdlib-safer strnlen strtod strtol tempname unlocked-io 
vasnprintf-posix verror xalloc xalloc-die xprintf-posix xstrndup 
xvasprintf-posix])
 gl_AVOID([])
 gl_SOURCE_BASE([gnu])
 gl_M4_BASE([ltdl/m4])
diff --git a/maint.mk b/maint.mk
new file mode 100644
index 0000000..2ab4c77
--- /dev/null
+++ b/maint.mk
@@ -0,0 +1,54 @@
+## maint.mk - maintainer rules for managing m4 distributions
+##
+## Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008 Free
+## Software Foundation, Inc.
+##
+## This file is part of GNU M4.
+##
+## GNU M4 is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## GNU M4 is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+##                                                                      ##
+##                   --- RULES FOR THE MAINTAINER ---                   ##
+##                                                                      ##
+
+## TODO - fix this file now that m4 is maintained in git, not CVS.
+
+CVS    = cvs # set it to `:' to avoid CVS operations at dist time
+
+# Tag before making distribution.  Also, don't make a distribution if
+# checks fail.  Also, make sure the NEWS file is up-to-date.
+cvs-dist: distcheck # maintainer-check
+       @if sed '1,2d;3q' $(srcdir)/NEWS | grep -e "$(VERSION)" > dev/null; \
+         echo "NEWS not updated; not releasing" 1>&2; \
+         exit 1;
+       fi
+       cd $(srcdir) && \
+         $(CVS) -q tag `echo "Release-$(VERSION)" | sed 's/\./-/g'`
+       $(MAKE) dist
+
+cvs-diff:
+       thisver=`echo "Release-$(VERSION)" | sed 's/\./-/g'`; \
+       if test -z "$$OLDVERSION"; then \
+         prevno=`echo "$(VERSION)" - 0.01 | bc | sed 's/^\./0./'`; \
+       else prevno="$$OLDVERSION"; fi; \
+       prevver=Release-`echo $$prevno | sed 's/\./-/g'`; \
+       cvs -f rdiff -c -r $$prevver -r $$thisver $(PACKAGE) \
+           > $(PACKAGE)-$$prevno-$(VERSION).diff
+
+.PHONY: web-manual
+web-manual:
+       @cd $(srcdir)/doc; \
+         $(SHELL) "$(abs_srcdir)/$(config_aux_dir)/gendocs.sh" $(PACKAGE) \
+           "GNU $(PACKAGE)- GNU macro processor"
+       @echo " *** Upload the doc/manual directory to web-cvs."


hooks/post-receive
--
GNU M4 source repository