diff options
author | Eric Blake <ebb9@byu.net> | 2009-12-28 14:09:35 -0700 |
---|---|---|
committer | Eric Blake <ebb9@byu.net> | 2010-01-05 22:03:43 -0700 |
commit | dc9d4612150ed7f515739af6d8dc777744c528e1 (patch) | |
tree | 9610f8c44313a4ddb67a99c93c3f487bcc046390 | |
parent | 652c73271aa3feeb9ca1524ba2af8bd48929b931 (diff) | |
download | m4-dc9d4612150ed7f515739af6d8dc777744c528e1.tar.gz |
Use gnulib maintainer-makefile module.
* ltdl/m4/gnulib-cache.m4: Import maintainer-makefile module.
* cfg.mk (local-checks-to-skip): Drop changelog-check; add
sc_cast_of_x_alloc_return_value.
(gnu_ftp_host-alpha, gnu_ftp_host-beta, gnu_ftp_host-major)
(gnu_rel_host): Delete; provided by maint.mk.
(old_NEWS_hash): New macro.
* .prev-version: New file.
* .x-sc_require_config_h: Likewise.
* .x-sc_require_config_h_first: Likewise.
* Makefile.am (syntax_check_exceptions, EXTRA_DIST): Ship new
files.
* maint.mk: Remove from version control; use gnulib instead.
* .gitignore: Update.
Signed-off-by: Eric Blake <ebb9@byu.net>
(cherry picked from commit 260383467b3ae57f2cb3c6821718b99fdf278c4b)
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | .prev-version | 1 | ||||
-rw-r--r-- | .x-sc_require_config_h | 2 | ||||
-rw-r--r-- | .x-sc_require_config_h_first | 2 | ||||
-rw-r--r-- | ChangeLog | 15 | ||||
-rw-r--r-- | Makefile.am | 9 | ||||
-rw-r--r-- | cfg.mk | 27 | ||||
-rw-r--r-- | ltdl/m4/gnulib-cache.m4 | 3 | ||||
-rw-r--r-- | maint.mk | 56 |
9 files changed, 36 insertions, 80 deletions
@@ -104,6 +104,7 @@ libtool /m4/obstack.h /m4/pathconf.h /m4/system.h +/maint.mk Makefile Makefile.in Makefile.inc diff --git a/.prev-version b/.prev-version new file mode 100644 index 00000000..acd81d7f --- /dev/null +++ b/.prev-version @@ -0,0 +1 @@ +1.4.13 diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h new file mode 100644 index 00000000..053cd3f1 --- /dev/null +++ b/.x-sc_require_config_h @@ -0,0 +1,2 @@ +modules/evalparse.c +modules/format.c diff --git a/.x-sc_require_config_h_first b/.x-sc_require_config_h_first new file mode 100644 index 00000000..053cd3f1 --- /dev/null +++ b/.x-sc_require_config_h_first @@ -0,0 +1,2 @@ +modules/evalparse.c +modules/format.c @@ -1,5 +1,20 @@ 2010-01-05 Eric Blake <ebb9@byu.net> + Use gnulib maintainer-makefile module. + * ltdl/m4/gnulib-cache.m4: Import maintainer-makefile module. + * cfg.mk (local-checks-to-skip): Drop changelog-check; add + sc_cast_of_x_alloc_return_value. + (gnu_ftp_host-alpha, gnu_ftp_host-beta, gnu_ftp_host-major) + (gnu_rel_host): Delete; provided by maint.mk. + (old_NEWS_hash): New macro. + * .prev-version: New file. + * .x-sc_require_config_h: Likewise. + * .x-sc_require_config_h_first: Likewise. + * Makefile.am (syntax_check_exceptions, EXTRA_DIST): Ship new + files. + * maint.mk: Remove from version control; use gnulib instead. + * .gitignore: Update. + Update to latest gnulib. * gnulib: Update. * ltdl/m4/gnulib-cache.m4: Import xoset. diff --git a/Makefile.am b/Makefile.am index c4af0c40..05fd0bc9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,10 +52,15 @@ include ltdl/Makefile.inc # Additional configuration. Version management comes from suggestions # given in build-aux/git-version-gen. +syntax_check_exceptions = \ + .x-sc_require_config_h \ + .x-sc_require_config_h_first + AM_CPPFLAGS += -Ignu -I$(srcdir)/gnu \ -Im4 -I$(srcdir)/m4 -EXTRA_DIST += bootstrap cfg.mk maint.mk .version \ - $(config_macro_dir)/gnulib-cache.m4 +EXTRA_DIST += bootstrap cfg.mk maint.mk .version .prev-version \ + $(config_macro_dir)/gnulib-cache.m4 \ + $(syntax_check_exceptions) BUILT_SOURCES += .version .version: echo $(VERSION) > $@-t && mv $@-t $@ @@ -1,5 +1,5 @@ # Customize maint.mk. -*- makefile -*- -# Copyright (C) 2003-2009 Free Software Foundation, Inc. +# Copyright (C) 2003-2010 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -14,27 +14,12 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# Use alpha.gnu.org for alpha and beta releases. -# Use ftp.gnu.org for major releases. -gnu_ftp_host-alpha = alpha.gnu.org -gnu_ftp_host-beta = alpha.gnu.org -gnu_ftp_host-major = ftp.gnu.org -gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE)) - # Used in maint.mk's web-manual rule manual_title = GNU macro processor -url_dir_list = ftp://$(gnu_rel_host)/gnu/m4 - -# The GnuPG ID of the key used to sign the tarballs. -gpg_key_ID = F4850180 - -# Tests not to run as part of "make distcheck". -# Exclude changelog-check here so that there's less churn in ChangeLog -# files -- otherwise, you'd need to have the upcoming version number -# at the top of the file for each `make distcheck' run. -local-checks-to-skip = changelog-check +# Tests not to run as part of "make syntax-check". +# M4 intentionally uses a coding style that compiles under C++. +local-checks-to-skip = sc_cast_of_x_alloc_return_value -# The local directory containing the checked-out copy of gnulib used in this -# release. Used solely to get gnulib's SHA1 for the "announcement" target. -gnulib_dir = $(srcdir)/gnulib +# Hash of NEWS contents, to ensure we don't add entries to wrong section. +old_NEWS_hash = b63892a79436f9f3cd05e10c3c4657ef diff --git a/ltdl/m4/gnulib-cache.m4 b/ltdl/m4/gnulib-cache.m4 index eb2ce98f..06a8fb82 100644 --- a/ltdl/m4/gnulib-cache.m4 +++ b/ltdl/m4/gnulib-cache.m4 @@ -15,7 +15,7 @@ # 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 --tests-base=tests/gnu --aux-dir=build-aux --with-tests --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io bitrotate clean-temp cloexec close-stream closein config-h configmake dirname error execute exit fdl-1.3 fflush filenamecat flexmember fopen fopen-safer freadptr freadseek fseeko gendocs gettext git-version-gen gnumakefile gnupload gpl-3.0 intprops inttypes memchr2 memcmp2 memmem mkstemp obstack obstack-printf-posix pipe progname propername quote regex regexprops-generic rename setenv snprintf-posix sprintf-posix stdbool stdlib-safer strnlen strtod strtol tempname unlocked-io unsetenv vasnprintf-posix verify verror wait-process xalloc xalloc-die xmemdup0 xoset xprintf-posix xstrndup xvasprintf-posix +# gnulib-tool --import --dir=. --local-dir=local --lib=libgnu --source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --tests-base=tests/gnu --aux-dir=build-aux --with-tests --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io bitrotate clean-temp cloexec close-stream closein config-h configmake dirname error execute exit fdl-1.3 fflush filenamecat flexmember fopen fopen-safer freadptr freadseek fseeko gendocs gettext git-version-gen gnumakefile gnupload gpl-3.0 intprops inttypes maintainer-makefile memchr2 memcmp2 memmem mkstemp obstack obstack-printf-posix pipe progname propername quote regex regexprops-generic rename setenv snprintf-posix sprintf-posix stdbool stdlib-safer strnlen strtod strtol tempname unlocked-io unsetenv vasnprintf-posix verify verror wait-process xalloc xalloc-die xmemdup0 xoset xprintf-posix xstrndup xvasprintf-posix # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([local]) @@ -52,6 +52,7 @@ gl_MODULES([ gpl-3.0 intprops inttypes + maintainer-makefile memchr2 memcmp2 memmem diff --git a/maint.mk b/maint.mk deleted file mode 100644 index 88089c38..00000000 --- a/maint.mk +++ /dev/null @@ -1,56 +0,0 @@ -## maint.mk - maintainer rules for managing m4 distributions -## -## Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -## 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) ../$(config_aux_dir)/gendocs.sh \ - -o '$(abs_builddir)/doc/manual' \ - --email $(PACKAGE_BUGREPORT) $(PACKAGE) \ - "$(PACKAGE_NAME) - $(manual_title)" - @echo " *** Upload the doc/manual directory to web-cvs." |