diff options
author | Gary V. Vaughan <gary@gnu.org> | 2013-09-15 20:51:11 +0700 |
---|---|---|
committer | Gary V. Vaughan <gary@gnu.org> | 2013-09-15 21:35:20 +0700 |
commit | 6bdb0a4b75b44bf8e809b874006ff1975eaa690e (patch) | |
tree | 2ace172faea66e564adb8eae6d71b7778d443b77 | |
parent | fd5af29d49ea6fd34b626557e3264f0ba9ea443b (diff) | |
download | m4-6bdb0a4b75b44bf8e809b874006ff1975eaa690e.tar.gz |
maint: move to gitlog-to-changelog.
* ChangeLog: Move from here...
* ChangeLog.old: ...to here.
* .gitignore: Add ChangeLog.
* ltdl/m4/gnulib-cache.m4: Add gitlog-to-changelog.
* Makefile.am (ChangeLog): New rule to generate a ChangeLog on
demand.
(EXTRA_DIST): Distribute gitlog-to-changelog.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | ChangeLog.old (renamed from Changelog) | 34 | ||||
-rw-r--r-- | Makefile.am | 18 | ||||
-rw-r--r-- | ltdl/m4/gnulib-cache.m4 | 3 |
4 files changed, 20 insertions, 36 deletions
@@ -27,6 +27,7 @@ ABOUT-NLS /aclocal.m4t autom4te.cache /build-aux +/ChangeLog /config.cache /config.h /config-h.in diff --git a/Changelog b/ChangeLog.old index 1f1bd8ff..d5f2ad70 100644 --- a/Changelog +++ b/ChangeLog.old @@ -1,37 +1,3 @@ -2013-09-15 Gary V. Vaughan <gary@gnu.org> - - doc: use .texi extension consistently. - * doc/m4.texinfo: Rename from this... - * doc/m4.texi: ...to this. - * Makefile.am (m4_texinfo): Rename from this... - (m4_texi): ...to this. Adjust all callers. - * doc/Makeflie.am (m4_TEXINFOS): Adjust. - - bootstrap: set copyright_holder explicitly. - * bootstrap.conf (copyright_holder): Explicitly set to the FSF. - - configury: don't check in generated files. - * COPYING: Install explicitly to avoid confusion over M4 - license. - * INSTALL, build-aux/compile, bulid-aux/config.guess, - build-aux/config.sub, build-aux/depcomp, build-aux/install-sh, - build-aux/mdate-sh, build-aux/missing, build-aux/texinfo.tex: - Remove. - - configury: don't install modules to pkglibexecdir. - Modern Automake (correctly) oerrors out when trying to install - modules to pkglibexecdir; we should be using pkglibdir here. - * Makefile.am (pkglibexec_LTLIBRARIES): Rename from this... - (pkglib_LTLIBRARIES): ...to this. - - bootstrap: sync with upstream. - * bootstrap.conf: New file. - * gl/build-aux/bootstrap.in, gl/build-aux/extract-trace, - gl/build-aux/funclib.sh, gl/build-aux/options-parser: Update - from upstream to pick up recent improvements. - * bootstrap: Regenerate. - * ltdl/m3/gnulib-cache.m4: Regenerate. - 2010-03-02 Giuseppe Scrivano <gscrivano@gnu.org> (tiny change) Support bootstrap --gnulib-srcdir=DIR. diff --git a/Makefile.am b/Makefile.am index 0977068a..1e10f006 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,6 +28,11 @@ SUBDIRS = po gnu . doc tests/gnu ACLOCAL_AMFLAGS = -I ltdl/m4 AUTOMAKE_OPTIONS = nostdinc +gitlog_to_changelog = $(srcdir)/$(config_aux_dir)/gitlog-to-changelog +git_log_fix = $(srcdir)/$(config_aux_dir)/git-log-fix +changelog = $(srcdir)/ChangeLog +changelog_old = $(srcdir)/ChangeLog.old + # Prime the variables that will be augmented by libtool. # FIXME - the -export-symbols-regex ".*" is a hack to work around the # fact that on cygwin, the convenience library libltdl exports symbols, @@ -63,13 +68,24 @@ AM_CPPFLAGS += -Ignu -I$(srcdir)/gnu \ -Im4 -I$(srcdir)/m4 EXTRA_DIST += bootstrap cfg.mk maint.mk .version .prev-version \ $(config_macro_dir)/gnulib-cache.m4 \ - $(syntax_check_exceptions) + $(syntax_check_exceptions) $(gitlog_to_changelog) BUILT_SOURCES += .version .version: echo $(VERSION) > $@-t && mv $@-t $@ dist-hook: dist-tarball-version dist-tarball-version: echo $(VERSION) > $(distdir)/.tarball-version + +dist-hook: ChangeLog +changelog_start_date = 2011-01-01 +$(changelog): FORCE + $(AM_V_GEN)if test -d '$(srcdir)/.git'; then \ + $(gitlog_to_changelog) \ + --since=$(changelog_start_date) > '$@T'; \ + rm -f '$@'; mv '$@T' '$@'; \ + cat '$(changelog_old)' >> '$@'; \ + fi + MAINTAINERCLEANFILES = \ ABOUT-NLS INSTALL Makefile.in aclocal.m4 \ config-h.in configure stamp-h.in \ diff --git a/ltdl/m4/gnulib-cache.m4 b/ltdl/m4/gnulib-cache.m4 index c14a61c0..35f1c1eb 100644 --- a/ltdl/m4/gnulib-cache.m4 +++ b/ltdl/m4/gnulib-cache.m4 @@ -27,7 +27,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --local-dir=gl --lib=libgnu --source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --tests-base=tests/gnu --aux-dir=build-aux --with-tests --no-conditional-dependencies --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 update-copyright vasnprintf-posix verify verror wait-process xalloc xalloc-die xmemdup0 xoset xprintf-posix xstrndup xvasprintf-posix +# gnulib-tool --import --dir=. --local-dir=gl --lib=libgnu --source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --tests-base=tests/gnu --aux-dir=build-aux --with-tests --no-conditional-dependencies --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 gitlog-to-changelog 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 update-copyright 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([gl]) @@ -59,6 +59,7 @@ gl_MODULES([ gendocs gettext git-version-gen + gitlog-to-changelog gnumakefile gnupload gpl-3.0 |