summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.autom4te.cfg5
-rw-r--r--.gitignore2
-rw-r--r--Makefile.am29
-rw-r--r--old/ChangeLog-tests (renamed from tests/ChangeLog-old)0
-rw-r--r--old/ChangeLog.00 (renamed from ChangeLog.00)0
-rw-r--r--old/ChangeLog.01 (renamed from ChangeLog.01)0
-rw-r--r--old/ChangeLog.02 (renamed from ChangeLog.02)0
-rw-r--r--old/ChangeLog.03 (renamed from ChangeLog.03)0
-rw-r--r--old/ChangeLog.04 (renamed from ChangeLog.04)0
-rw-r--r--old/ChangeLog.09 (renamed from ChangeLog.09)0
-rw-r--r--old/ChangeLog.11 (renamed from ChangeLog.11)0
-rw-r--r--old/ChangeLog.96 (renamed from ChangeLog.96)0
-rw-r--r--old/ChangeLog.98 (renamed from ChangeLog.98)0
-rw-r--r--old/TODO (renamed from TODO)0
-rw-r--r--tests/Makefile.am2
15 files changed, 25 insertions, 13 deletions
diff --git a/.autom4te.cfg b/.autom4te.cfg
new file mode 100644
index 000000000..787905ad8
--- /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 6ee37087b..fd0c05b21 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 a06cd8d94..985e7da2e 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
index 84649444b..84649444b 100644
--- a/tests/ChangeLog-old
+++ b/old/ChangeLog-tests
diff --git a/ChangeLog.00 b/old/ChangeLog.00
index c50c4ebd0..c50c4ebd0 100644
--- a/ChangeLog.00
+++ b/old/ChangeLog.00
diff --git a/ChangeLog.01 b/old/ChangeLog.01
index cb7b37a41..cb7b37a41 100644
--- a/ChangeLog.01
+++ b/old/ChangeLog.01
diff --git a/ChangeLog.02 b/old/ChangeLog.02
index b99f7578a..b99f7578a 100644
--- a/ChangeLog.02
+++ b/old/ChangeLog.02
diff --git a/ChangeLog.03 b/old/ChangeLog.03
index b7e8c6a8c..b7e8c6a8c 100644
--- a/ChangeLog.03
+++ b/old/ChangeLog.03
diff --git a/ChangeLog.04 b/old/ChangeLog.04
index 111f87b1d..111f87b1d 100644
--- a/ChangeLog.04
+++ b/old/ChangeLog.04
diff --git a/ChangeLog.09 b/old/ChangeLog.09
index 02a1e33f7..02a1e33f7 100644
--- a/ChangeLog.09
+++ b/old/ChangeLog.09
diff --git a/ChangeLog.11 b/old/ChangeLog.11
index ce9d2b8ad..ce9d2b8ad 100644
--- a/ChangeLog.11
+++ b/old/ChangeLog.11
diff --git a/ChangeLog.96 b/old/ChangeLog.96
index d89c2e35d..d89c2e35d 100644
--- a/ChangeLog.96
+++ b/old/ChangeLog.96
diff --git a/ChangeLog.98 b/old/ChangeLog.98
index 3eeb35376..3eeb35376 100644
--- a/ChangeLog.98
+++ b/old/ChangeLog.98
diff --git a/TODO b/old/TODO
index f8e4754df..f8e4754df 100644
--- a/TODO
+++ b/old/TODO
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 890115575..864bd24c2 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.