changeset in /hg/icedtea6: Depend on overlay.stamp rather than p...

[Andrew John Hughes]

changeset d31f7236fd89 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d31f7236fd89
description:
	Depend on overlay.stamp rather than patch.stamp.  Some targets would
	not apply overlay.stamp early enough (notably when using --with-icedtea/openjdk).
	As overlay.stamp depends on patch.stamp, later targets should now depend
	on overlay.stamp so that they work against the complete IcedTea source tree.

	ChangeLog:

	2009-02-05  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am:
		Depend on overlay.stamp rather than patch.stamp.

diffstat:

2 files changed, 8 insertions(+), 4 deletions(-)
ChangeLog   |    5 +++++
Makefile.am |    7 +++----

diffs (43 lines):

diff -r 9923df826001 -r d31f7236fd89 ChangeLog
--- a/ChangeLog	Thu Feb 05 19:03:06 2009 +0000
+++ b/ChangeLog	Fri Feb 06 02:04:22 2009 +0000
@@ -1,3 +1,8 @@ 2009-02-05  Andrew John Hughes  <ahughes
+2009-02-05  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Depend on overlay.stamp rather than patch.stamp.
+	
 2009-02-05  Andrew John Hughes  <ahughes at redhat.com>
 
 	Ensure the NIO2 code is in sync with the latest
diff -r 9923df826001 -r d31f7236fd89 Makefile.am
--- a/Makefile.am	Thu Feb 05 19:03:06 2009 +0000
+++ b/Makefile.am	Fri Feb 06 02:04:22 2009 +0000
@@ -797,7 +797,7 @@ endif
 # ======================================
 
 # Copy over OpenJDK sources for ecj.
-stamps/extract-ecj.stamp: stamps/patch.stamp stamps/overlay.stamp
+stamps/extract-ecj.stamp: stamps/overlay.stamp
 	if ! test -d openjdk-ecj ; then \
 	    cp -pPRl openjdk openjdk-ecj ; \
 	fi
@@ -1216,7 +1216,7 @@ ICEDTEA_COPY_DIRS += \
 	javax/script
 endif
 
-stamps/copy-source-files.stamp: stamps/patch.stamp
+stamps/copy-source-files.stamp: stamps/overlay.stamp
 	for copy_dir in $(ICEDTEA_COPY_DIRS) ; \
 	do \
 	  mkdir -p rt/$$copy_dir ; \
@@ -1244,8 +1244,7 @@ OPENJDK_SOURCEPATH_DIRS = \
         $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS)
 
 # tools.jar class files.
-stamps/hotspot-tools-copy-source-files.stamp: stamps/patch.stamp \
-	stamps/overlay.stamp
+stamps/hotspot-tools-copy-source-files.stamp: stamps/overlay.stamp
 	for copy_dir in \
 	  `cat $(abs_top_srcdir)/tools-copy/tools-jdk-copy-files.txt` ; \
 	do \