diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-09 11:17:47 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-09 11:17:47 +0200 |
| commit | c8f106c772e608b25aa6a3aa8eeeb0119e097ab2 (patch) | |
| tree | b920b5acc653a716b5ef84b461d79fd022c278f2 /contrib | |
| parent | 1667d369091fe41d2bbdf645490a29d45142556f (diff) | |
| download | automake-c8f106c772e608b25aa6a3aa8eeeb0119e097ab2.tar.gz | |
build: break up monolithic Makefile.am in subdir-specific fragments
This is convenient to do, now that we have improved "relative directory"
support with the '%reladir%' (a.k.a. '%D%') and '%canon_reladir%' (a.k.a.
'%C%') Automake-time substitutions for included makefile fragments.
This move also satisfy our philosophy of using new Automake features in
our own build system, as a way of facilitating early discovery of possible
bugs or interface warts.
* Makefile.am: Break up ...
* doc/Makefile.inc, lib/Automake/Makefile.inc, lib/Makefile.inc,
lib/am/Makefile.inc, m4/Makefile.inc, t/Makefile.inc): ... in this
new included fragments. Adjust as needed, and make deliberate use
of the '%D%' substitution.
* contrib/t/local.am: Rename ...
* contrib/t/Makefile.inc: ... like this.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/t/Makefile.inc | 26 | ||||
| -rw-r--r-- | contrib/t/local.am | 25 |
2 files changed, 26 insertions, 25 deletions
diff --git a/contrib/t/Makefile.inc b/contrib/t/Makefile.inc new file mode 100644 index 000000000..a92b80d96 --- /dev/null +++ b/contrib/t/Makefile.inc @@ -0,0 +1,26 @@ +## Included by top-level Makefile for Automake. + +## Copyright (C) 1995-2013 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/>. + +## -------------------------------- ## +## Tests for stuff in 'contrib/'. ## +## -------------------------------- ## + +contrib_TESTS = \ + %D%/parallel-tests-html.sh \ + %D%/parallel-tests-html-recursive.sh \ + %D%/help-multilib.sh \ + %D%/multilib.sh diff --git a/contrib/t/local.am b/contrib/t/local.am deleted file mode 100644 index f44df9c4e..000000000 --- a/contrib/t/local.am +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (C) 1995-2013 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/>. - -# Automake: tests for stuff in 'contrib/'. - -## Relative to the top-level directory. -contrib_testsuite_dir = contrib/t - -contrib_TESTS = \ - $(contrib_testsuite_dir)/parallel-tests-html.sh \ - $(contrib_testsuite_dir)/parallel-tests-html-recursive.sh \ - $(contrib_testsuite_dir)/help-multilib.sh \ - $(contrib_testsuite_dir)/multilib.sh |