diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-04-23 11:22:40 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-04-23 11:22:40 +0200 |
| commit | 6b22deff997b02052f4315777ca4ab4b64b8d8fe (patch) | |
| tree | a008df883c7bc48b1b1906f40141dd430d443019 /tests | |
| parent | 3b0c8d59b79346861dd48242672b7aed7f863c9f (diff) | |
| parent | e9bb4e913957b0388182de7350e198d6fe74bf02 (diff) | |
| download | automake-6b22deff997b02052f4315777ca4ab4b64b8d8fe.tar.gz | |
Merge branch 'maint'
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/Makefile.in | 1 | ||||
| -rwxr-xr-x | tests/maintclean-vpath.test | 2 | ||||
| -rwxr-xr-x | tests/mclean.test | 34 |
4 files changed, 1 insertions, 37 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index f748ef545..28058d9a0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -633,7 +633,6 @@ man2.test \ man3.test \ man4.test \ man5.test \ -mclean.test \ mdate.test \ mdate2.test \ mdate3.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 859eed6ab..5342b96cd 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -898,7 +898,6 @@ man2.test \ man3.test \ man4.test \ man5.test \ -mclean.test \ mdate.test \ mdate2.test \ mdate3.test \ diff --git a/tests/maintclean-vpath.test b/tests/maintclean-vpath.test index 00c6d3f2b..5b5420c50 100755 --- a/tests/maintclean-vpath.test +++ b/tests/maintclean-vpath.test @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Make sure distclean and maintainer-clean erase the right files. -# This test is for VPATH builds; see sister test `maintclean-vpath.test' +# This test is for VPATH builds; see sister test `maintclean.test' # for in-tree builds. . ./defs || Exit 1 diff --git a/tests/mclean.test b/tests/mclean.test deleted file mode 100755 index 07ae0fef3..000000000 --- a/tests/mclean.test +++ /dev/null @@ -1,34 +0,0 @@ -#! /bin/sh -# Copyright (C) 1999, 2001, 2002, 2010, 2011 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 -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program 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/>. - -# Make sure MAINTAINERCLEANFILES works. -# Report from Paul D. Smith. - -. ./defs || Exit 1 - -cat > Makefile.am << 'END' -MAINTAINERCLEANFILES = foo -END - -: > FOO - -$ACLOCAL -$AUTOMAKE - -grep 'rm -f .*MAINTAINERCLEANFILES' Makefile.in - -: |