Mercurial > hg > icedtea12
changeset 2536:ad09cd636ff8
PR2256: 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-jtreg): Remove test/jtreg if empty.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Wed, 04 Mar 2015 15:09:23 +0000 |
| parents | 9fe29e53b2f1 |
| children | 4005e0143bc8 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Aug 06 17:12:29 2012 +0200 +++ b/ChangeLog Wed Mar 04 15:09:23 2015 +0000 @@ -1,3 +1,9 @@ +2012-05-30 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (EXTRA_DIST): Add test/tapset. + (clean-jtreg): Remove test/jtreg if empty. + 2012-08-06 Mark Wielaard <mjw@redhat.com> * test/tapset/jstaptest.pl (probestrings): Expect non-zero value
--- a/Makefile.am Mon Aug 06 17:12:29 2012 +0200 +++ b/Makefile.am Wed Mar 04 15:09:23 2015 +0000 @@ -488,7 +488,7 @@ scripts/jni_desc \ rewriter/agpl-3.0.txt \ $(REWRITER_SRCS) \ - THANKYOU + THANKYOU test/tapset # Top-Level Targets # ================= @@ -2099,6 +2099,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