[libxml++] Fix examples/Makefile.am for new versions of automake.
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxml++] Fix examples/Makefile.am for new versions of automake.
- Date: Sat, 14 Sep 2013 08:15:23 +0000 (UTC)
commit 171edb4a2fa2f77e94748600e2fb79912610c169
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date: Sat Sep 14 10:10:45 2013 +0200
Fix examples/Makefile.am for new versions of automake.
* examples/Makefile.am: Don't use make functions, such as addsuffix, in
check_SCRIPTS. New versions of automake (e.g. 1.13.4) expect to find only
a blank-separated list of filenames.
* .gitignore: With new versions of automake, 'make check' generates more
output files. Ignore them. Bug #678390.
.gitignore | 5 ++++-
examples/Makefile.am | 24 ++++++++++++++++++++----
2 files changed, 24 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aea0202..0c6cc7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,7 +60,10 @@ stamp-h?
/examples/sax_parser_entities/sax_parser_entities
/examples/schemavalidation/schemavalidation
/examples/textreader/textreader
-/examples/*/make-check-sh
+/examples/*/make_check.sh
+/examples/*/make_check.sh.log
+/examples/*/make_check.sh.trs
+/examples/test-suite.log
# macros
/macros/compile-binding.am
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 1ce5618..d9541ca 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -37,7 +37,23 @@ check_PROGRAMS = \
textreader/textreader
# Shell scripts that call the example programs.
-check_SCRIPTS = $(addsuffix make-check-sh,$(dir $(check_PROGRAMS)))
+check_SCRIPTS = \
+ dom_build/make_check.sh \
+ dom_parse_entities/make_check.sh \
+ dom_parser/make_check.sh \
+ dom_parser_raw/make_check.sh \
+ dom_read_write/make_check.sh \
+ dom_xinclude/make_check.sh \
+ dom_xpath/make_check.sh \
+ dtdvalidation/make_check.sh \
+ import_node/make_check.sh \
+ sax_exception/make_check.sh \
+ sax_parser/make_check.sh \
+ sax_parser_build_dom/make_check.sh \
+ sax_parser_entities/make_check.sh \
+ schemavalidation/make_check.sh \
+ textreader/make_check.sh
+
TESTS = $(check_SCRIPTS)
xmlpp_test_util = testutilities.h testutilities.cc
@@ -129,18 +145,18 @@ dist_noinst_DATA = \
# which may or may not be the same as the source directory.
# Here it's necessary to specify parameters when the input file and the output
# file are located in different directories.
-dom_read_write/make-check-sh: Makefile
+dom_read_write/make_check.sh: Makefile
echo '# Generated and used by "make check"' >$@
echo 'dom_read_write/dom_read_write "$(srcdir)/dom_read_write/example.xml"
dom_read_write/example_output.xml >/dev/null' >>$@
chmod +x $@
script_template = cd "$(srcdir)/<!progname!>" && "$(abs_builddir)/<!progname!>/<!progname!>" >/dev/null
-standard_scripts = $(filter-out dom_read_write/make-check-sh,$(check_SCRIPTS))
+standard_scripts = $(filter-out dom_read_write/make_check.sh,$(check_SCRIPTS))
# All other script files are generated like so:
$(standard_scripts): Makefile
echo '# Generated and used by "make check"' >$@
- echo '$(subst <!progname!>,$(subst /make-check-sh,,$@),$(script_template))' >>$@
+ echo '$(subst <!progname!>,$(subst /make_check.sh,,$@),$(script_template))' >>$@
chmod +x $@
CLEANFILES = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]