Mercurial > hg > release > icedtea7-2.2
changeset 2550:842df9bcefbd
Fix make distcheck broken by addition of SystemTap tests.
2012-05-30 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(EXTRA_DIST): Add test/tapset.
(clean-tests): Add clean-jtreg-reports.
(clean-local): Remove clean-jtreg-reports.
(clean-jtreg): Remove test/jtreg if empty.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 30 May 2012 22:01:15 +0100 |
| parents | d1be68ac65c5 |
| children | 6ab510483077 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 16 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed May 30 22:34:45 2012 +0100 +++ b/ChangeLog Wed May 30 22:01:15 2012 +0100 @@ -1,3 +1,11 @@ +2012-05-30 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (EXTRA_DIST): Add test/tapset. + (clean-tests): Add clean-jtreg-reports. + (clean-local): Remove clean-jtreg-reports. + (clean-jtreg): Remove test/jtreg if empty. + 2012-05-30 Andrew John Hughes <ahughes@redhat.com> Include 2.2 tag.
--- a/Makefile.am Wed May 30 22:34:45 2012 +0100 +++ b/Makefile.am Wed May 30 22:01:15 2012 +0100 @@ -724,7 +724,7 @@ scripts/jni_desc \ rewriter/agpl-3.0.txt \ $(REWRITER_SRCS) \ - THANKYOU + THANKYOU test/tapset # Top-Level Targets # ================= @@ -733,14 +733,14 @@ check-local: jtregcheck check-tapset -clean-tests: clean-jtreg clean-tapset-report +clean-tests: clean-jtreg clean-tapset-report clean-jtreg-reports if [ $(abs_top_srcdir) != $(abs_top_builddir) ] ; then \ if [ -e test ] ; then \ rmdir test ; \ fi \ fi -clean-local: clean-tests clean-jtreg-reports clean-pulse-java \ +clean-local: clean-tests clean-pulse-java \ clean-icedtea clean-icedtea-boot clean-clone clean-clone-boot \ clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \ clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \ @@ -2228,6 +2228,11 @@ clean-jtreg: rm -rf test/jtreg/classes + if [ $(abs_top_srcdir) != $(abs_top_builddir) ] ; then \ + if [ -e test/jtreg ] ; then \ + rmdir test/jtreg ; \ + fi ; \ + fi rm -f test/jtreg.jar rm -f stamps/jtreg.stamp