From e343227a1004122bb3f4b54ed06d00a6927cf7c0 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Wed, 28 Mar 2012 13:15:52 +0200 Subject: [PATCH] maint: reorganize the source tree and make it less cluttered * TODO: Move ... * old/TODO: ... here. This is done because this file is quite outdated, and today TODO and wishlist items are better handled though the debbugs tracker. * ChangeLog.00: Move ... * old/ChangeLog.00: ... here. * ChangeLog.01: Move ... * old/ChangeLog.01: ... here. * ChangeLog.02: Move ... * old/ChangeLog.02: ... here. * ChangeLog.03: Move ... * old/ChangeLog.03: ... here. * ChangeLog.04: Move ... * old/ChangeLog.04: ... here. * ChangeLog.09: Move ... * old/ChangeLog.09: ... here. * ChangeLog.11: Move ... * old/ChangeLog.11: ... here. * ChangeLog.96: Move ... * old/ChangeLog.96: ... here. * ChangeLog.98: Move ... * old/ChangeLog.98: ... here. * tests/ChangeLog-old: Move ... * old/ChangeLog-tests: .. here. * tests/Makefile.am (EXTRA_DIST): Adjust. * Makefile.am (EXTRA_DIST): Likewise. * .autom4te.cfg: New file, instructing the autotools to place the autom4te cache directory in '.autom4te.cache' rather than in 'autom4te.cache'. * .gitignore: Adjust. * Makefile.am (maintainer-clean-local): Remove the '.autom4te.cache' directory. Signed-off-by: Stefano Lattarini --- .autom4te.cfg | 5 +++++ .gitignore | 2 +- Makefile.am | 29 ++++++++++++++++++----------- tests/ChangeLog-old => old/ChangeLog-tests | 0 ChangeLog.00 => old/ChangeLog.00 | 0 ChangeLog.01 => old/ChangeLog.01 | 0 ChangeLog.02 => old/ChangeLog.02 | 0 ChangeLog.03 => old/ChangeLog.03 | 0 ChangeLog.04 => old/ChangeLog.04 | 0 ChangeLog.09 => old/ChangeLog.09 | 0 ChangeLog.11 => old/ChangeLog.11 | 0 ChangeLog.96 => old/ChangeLog.96 | 0 ChangeLog.98 => old/ChangeLog.98 | 0 TODO => old/TODO | 0 tests/Makefile.am | 2 +- 15 files changed, 25 insertions(+), 13 deletions(-) create mode 100644 .autom4te.cfg rename tests/ChangeLog-old => old/ChangeLog-tests (100%) rename ChangeLog.00 => old/ChangeLog.00 (100%) rename ChangeLog.01 => old/ChangeLog.01 (100%) rename ChangeLog.02 => old/ChangeLog.02 (100%) rename ChangeLog.03 => old/ChangeLog.03 (100%) rename ChangeLog.04 => old/ChangeLog.04 (100%) rename ChangeLog.09 => old/ChangeLog.09 (100%) rename ChangeLog.11 => old/ChangeLog.11 (100%) rename ChangeLog.96 => old/ChangeLog.96 (100%) rename ChangeLog.98 => old/ChangeLog.98 (100%) rename TODO => old/TODO (100%) diff --git a/.autom4te.cfg b/.autom4te.cfg new file mode 100644 index 0000000..787905a --- /dev/null +++ b/.autom4te.cfg @@ -0,0 +1,5 @@ +## autom4te.cfg for the Automake package. +## +begin-language: "Autoconf-without-aclocal-m4" +args: --cache=.autom4te.cache +end-language: "Autoconf-without-aclocal-m4" diff --git a/.gitignore b/.gitignore index 6ee3708..fd0c05b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ Makefile /ChangeLog /aclocal.m4 /configure -/autom4te.cache +/.autom4te.cache /config.cache /config.log /config.status diff --git a/Makefile.am b/Makefile.am index a06cd8d..985e7da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,21 +31,23 @@ AUTOMAKESOURCES = automake.in aclocal.in TAGS_FILES = $(AUTOMAKESOURCES) EXTRA_DIST = \ + $(AUTOMAKESOURCES) \ + bootstrap \ GNUmakefile \ syntax-checks.mk \ HACKING \ - ChangeLog.96 \ - ChangeLog.98 \ - ChangeLog.00 \ - ChangeLog.01 \ - ChangeLog.02 \ - ChangeLog.03 \ - ChangeLog.04 \ - ChangeLog.09 \ - ChangeLog.11 \ - bootstrap \ $(gitlog_to_changelog_fixes) \ - $(AUTOMAKESOURCES) + old/ChangeLog-tests \ + old/ChangeLog.96 \ + old/ChangeLog.98 \ + old/ChangeLog.00 \ + old/ChangeLog.01 \ + old/ChangeLog.02 \ + old/ChangeLog.03 \ + old/ChangeLog.04 \ + old/ChangeLog.09 \ + old/ChangeLog.11 \ + old/TODO ## Make versioned links. We only run the transform on the root name; ## then we make a versioned link with the transformed base name. This @@ -107,6 +109,11 @@ recheck: $(am__cd) tests && $(MAKE) $(AM_MAKEFLAGS) $@ .PHONY: recheck +# We don't use the default name for the autom4te cache directory, +# so we need this. +maintainer-clean-local: + rm -rf .autom4te.cache + ################################################################ ## ## Everything past here is useful to the maintainer, but probably not diff --git a/tests/ChangeLog-old b/old/ChangeLog-tests similarity index 100% rename from tests/ChangeLog-old rename to old/ChangeLog-tests diff --git a/ChangeLog.00 b/old/ChangeLog.00 similarity index 100% rename from ChangeLog.00 rename to old/ChangeLog.00 diff --git a/ChangeLog.01 b/old/ChangeLog.01 similarity index 100% rename from ChangeLog.01 rename to old/ChangeLog.01 diff --git a/ChangeLog.02 b/old/ChangeLog.02 similarity index 100% rename from ChangeLog.02 rename to old/ChangeLog.02 diff --git a/ChangeLog.03 b/old/ChangeLog.03 similarity index 100% rename from ChangeLog.03 rename to old/ChangeLog.03 diff --git a/ChangeLog.04 b/old/ChangeLog.04 similarity index 100% rename from ChangeLog.04 rename to old/ChangeLog.04 diff --git a/ChangeLog.09 b/old/ChangeLog.09 similarity index 100% rename from ChangeLog.09 rename to old/ChangeLog.09 diff --git a/ChangeLog.11 b/old/ChangeLog.11 similarity index 100% rename from ChangeLog.11 rename to old/ChangeLog.11 diff --git a/ChangeLog.96 b/old/ChangeLog.96 similarity index 100% rename from ChangeLog.96 rename to old/ChangeLog.96 diff --git a/ChangeLog.98 b/old/ChangeLog.98 similarity index 100% rename from ChangeLog.98 rename to old/ChangeLog.98 diff --git a/TODO b/old/TODO similarity index 100% rename from TODO rename to old/TODO diff --git a/tests/Makefile.am b/tests/Makefile.am index 8901155..864bd24 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -28,7 +28,7 @@ TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh AM_TAP_LOG_DRIVER_FLAGS = --merge -EXTRA_DIST = ax/is ChangeLog-old +EXTRA_DIST = ax/is TESTS = ## Will be updated later. -- 2.7.4