/hg/icedtea: Make clean-icedtea* targets only run make if the di...

[andrew at icedtea.classpath.org]

changeset e9eb1d9c06e7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e9eb1d9c06e7
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Dec 07 16:36:16 2009 +0000

	Make clean-icedtea* targets only run make if the directory exists.

	2009-12-07 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (clean-icedtea): Only run make if
	openjdk directory exists and remove dependency.
	(clean-icedtea-boot): Likewise for openjdk-boot.


diffstat:

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

diffs (51 lines):

diff -r e586d9354652 -r e9eb1d9c06e7 ChangeLog
--- a/ChangeLog	Thu Dec 03 14:38:27 2009 -0500
+++ b/ChangeLog	Mon Dec 07 16:36:16 2009 +0000
@@ -1,3 +1,10 @@ 2009-12-03  Man Lung Wong <mwong at redhat.
+2009-12-07  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(clean-icedtea): Only run make if openjdk
+	directory exists and remove dependency.
+	(clean-icedtea-boot): Likewise for openjdk-boot.
+	
 2009-12-03  Man Lung Wong <mwong at redhat.com>
 
 	* rt/net/sourceforge/jnlp/JNLPFile.java
diff -r e586d9354652 -r e9eb1d9c06e7 Makefile.am
--- a/Makefile.am	Thu Dec 03 14:38:27 2009 -0500
+++ b/Makefile.am	Mon Dec 07 16:36:16 2009 +0000
@@ -1847,10 +1847,12 @@ endif
 	mkdir -p stamps
 	touch $@
 
-clean-icedtea: stamps/download.stamp
-	$(ARCH_PREFIX) $(MAKE) \
-	  $(ICEDTEA_ENV) \
-	  -C openjdk clobber
+clean-icedtea: 
+	if [ -e $(abs_top_builddir)/openjdk ]; then \
+	  $(ARCH_PREFIX) $(MAKE) \
+	    $(ICEDTEA_ENV) \
+	    -C openjdk clobber ; \
+	fi
 	rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp
 
 stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \
@@ -1903,10 +1905,12 @@ hotspot-helper: stamps/bootstrap-directo
 	  $(ICEDTEA_ENV_BOOT) \
 	  -C openjdk-boot hotspot
 
-clean-icedtea-boot: stamps/clone-boot.stamp
-	$(ARCH_PREFIX) $(MAKE) \
-	  $(ICEDTEA_ENV_BOOT) \
-	  -C openjdk-boot clobber
+clean-icedtea-boot: 
+	if [ -e $(abs_top_builddir)/openjdk-boot ]; then \
+	  $(ARCH_PREFIX) $(MAKE) \
+	    $(ICEDTEA_ENV_BOOT) \
+	    -C openjdk-boot clobber ; \
+	fi 
 	rm -f stamps/icedtea-boot.stamp
 
 stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp