FYI: Fix distcheck patch #02

[Andrew John Hughes]

With the last patch, make distcheck gets as far as running
make check.  With this patch, make distcheck hopefully should
work completely.  I've tested as far as running the jtreg target
goes but haven't run the full distcheck with testsuite again;
I'll do this tomorrow.

The lack of an icedtea stamp meant that the build was restarted
when make check was run.  This patch also fixes this issue, as
well as making sure jtreg can be built outside the source directory.

ChangeLog:

2008-06-30  Andrew John Hughes  <gnu_andrew at member.fsf.org>

	* Makefile.am:
	Make jtreg target work out of the source directory,
	and use a stamp to mark a finished icedtea build
	so we don't build it twice.
	* Makefile.in: Regenerated.


-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
-------------- next part --------------
diff -r ce9440257cfe Makefile.am
--- a/Makefile.am	Sun Jun 29 22:57:23 2008 +0100
+++ b/Makefile.am	Mon Jun 30 00:38:33 2008 +0100
@@ -734,6 +734,8 @@ icedtea: stamps/bootstrap-directory-syml
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
 	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
+	mkdir -p stamps
+	touch stamps/icedtea.stamp
 
 icedtea-debug: stamps/bootstrap-directory-symlink.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
@@ -758,15 +760,18 @@ icedtea-debug: stamps/bootstrap-director
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
 	@echo "IcedTea (debug build) is served:" \
 	  $(BUILD_OUTPUT_DIR)-debug
+	mkdir -p stamps
+	touch stamps/icedtea.stamp
 
 clean-icedtea: stamps/extract.stamp
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/control/make clobber
+	rm -f stamps/icedtea.stamp
 
 icedtea-against-icedtea: \
 	stamps/bootstrap-directory-symlink.stamp \
-	icedtea
+	stamps/icedtea.stamp
 
 # OpenJDK ecj Targets
 # ===================
@@ -1068,17 +1073,17 @@ clean-gcjwebplugin:
 
 # jtreg
 
-stamps/jtreg.stamp:
+stamps/jtreg.stamp: stamps/icedtea.stamp
 	rm -rf test/jtreg/classes
 	mkdir -p test/jtreg/classes
 	$(ICEDTEA_BOOT_DIR)/bin/javac -g -d test/jtreg/classes -source 1.5 \
-		 -encoding iso-8859-1 `find test/jtreg/com -name '*.java'`
-	(cd test/jtreg; \
-	 $(ICEDTEA_BOOT_DIR)/bin/jar cfm ../jtreg.jar \
+		 -encoding iso-8859-1 `find $(srcdir)/test/jtreg/com -name '*.java'`
+	(cd $(srcdir)/test/jtreg; \
+	 $(ICEDTEA_BOOT_DIR)/bin/jar cfm $(abs_top_builddir)/jtreg.jar \
 		META-INF/MANIFEST.MF \
 		legal  README JavaTest.cmdMgrs.lst JavaTest.toolMgrs.lst \
 		`find com -type f -a -not -name '*.java'` \
-		-C classes com)
+		-C $(abs_top_builddir)/test/jtreg/classes com)
 	mkdir -p stamps
 	touch $@
 
diff -r ce9440257cfe Makefile.in
--- a/Makefile.in	Sun Jun 29 22:57:23 2008 +0100
+++ b/Makefile.in	Mon Jun 30 00:38:33 2008 +0100
@@ -1179,6 +1179,8 @@ icedtea: stamps/bootstrap-directory-syml
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
 	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
+	mkdir -p stamps
+	touch stamps/icedtea.stamp
 
 icedtea-debug: stamps/bootstrap-directory-symlink.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
@@ -1203,15 +1205,18 @@ icedtea-debug: stamps/bootstrap-director
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
 	@echo "IcedTea (debug build) is served:" \
 	  $(BUILD_OUTPUT_DIR)-debug
+	mkdir -p stamps
+	touch stamps/icedtea.stamp
 
 clean-icedtea: stamps/extract.stamp
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/control/make clobber
+	rm -f stamps/icedtea.stamp
 
 icedtea-against-icedtea: \
 	stamps/bootstrap-directory-symlink.stamp \
-	icedtea
+	stamps/icedtea.stamp
 
 # OpenJDK ecj Targets
 # ===================
@@ -1486,17 +1491,17 @@ clean-gcjwebplugin:
 
 # jtreg
 
-stamps/jtreg.stamp:
+stamps/jtreg.stamp: stamps/icedtea.stamp
 	rm -rf test/jtreg/classes
 	mkdir -p test/jtreg/classes
 	$(ICEDTEA_BOOT_DIR)/bin/javac -g -d test/jtreg/classes -source 1.5 \
-		 -encoding iso-8859-1 `find test/jtreg/com -name '*.java'`
-	(cd test/jtreg; \
-	 $(ICEDTEA_BOOT_DIR)/bin/jar cfm ../jtreg.jar \
+		 -encoding iso-8859-1 `find $(srcdir)/test/jtreg/com -name '*.java'`
+	(cd $(srcdir)/test/jtreg; \
+	 $(ICEDTEA_BOOT_DIR)/bin/jar cfm $(abs_top_builddir)/jtreg.jar \
 		META-INF/MANIFEST.MF \
 		legal  README JavaTest.cmdMgrs.lst JavaTest.toolMgrs.lst \
 		`find com -type f -a -not -name '*.java'` \
-		-C classes com)
+		-C $(abs_top_builddir)/test/jtreg/classes com)
 	mkdir -p stamps
 	touch $@