changeset in /hg/icedtea: 2007-12-10 Lillian Angel <langel at red...

[Lillian Angel]

changeset 245e85ca98be in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=245e85ca98be
description:
	2007-12-10  Lillian Angel  <langel at redhat.com>

	        * Makefile.am: Fixed update target to create stamp.
	        * Makefile.in: Regenerate.

diffstat:

2 files changed, 22 insertions(+), 10 deletions(-)
Makefile.am |   16 +++++++++++-----
Makefile.in |   16 +++++++++++-----

diffs (133 lines):

diff -r 3697dfe80c91 -r 245e85ca98be Makefile.am
--- a/Makefile.am	Mon Dec 10 11:23:44 2007 -0500
+++ b/Makefile.am	Mon Dec 10 11:46:42 2007 -0500
@@ -18,7 +18,7 @@ install:
 install:
 
 .PHONY: \
-	env env-ecj snapshot clean-clone clean-clone clean-patch \
+	env env-ecj snapshot clean-clone clean-update clean-patch \
 	clean-clone-ecj clean-patch-ecj clean-bootstrap-directory \
 	clean-bootstrap-directory-symlink clean-bootstrap-directory-ecj \
 	clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \
@@ -120,7 +120,7 @@ clean-clone:
 	rm -f stamps/clone.stamp
 	rm -rf openjdk
 
-update:
+stamps/update.stamp:
 	if test -d openjdk ; \
         then \
 	  cd openjdk; \
@@ -128,6 +128,10 @@ update:
           hg fupdate; \
 	  cd ..; \
 	fi
+	touch stamps/update.stamp
+
+clean-update:
+	rm -f stamps/update.stamp
 
 # Link ports sources into tree
 stamps/ports.stamp: stamps/clone.stamp
@@ -188,7 +192,7 @@ ICEDTEA_PATCHES = \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
-stamps/patch.stamp: stamps/clone.stamp update
+stamps/patch.stamp: stamps/clone.stamp stamps/update.stamp
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
 	  echo Checking $$p ; \
@@ -392,7 +396,7 @@ endif
 
 # If you change anything here in the icedtea target, please make sure
 # you change it in the icedtea-debug target as well.
-icedtea: update stamps/tools.stamp stamps/plugs.stamp \
+icedtea: stamps/update.stamp stamps/tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
@@ -403,7 +407,7 @@ icedtea: update stamps/tools.stamp stamp
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
 	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
 
-icedtea-debug: update stamps/bootstrap-directory-symlink.stamp \
+icedtea-debug: stamps/update.stamp stamps/bootstrap-directory-symlink.stamp \
 	stamps/tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
@@ -668,3 +672,5 @@ tools-copy-source-files: stamps/tools-co
 tools-copy-source-files: stamps/tools-copy-source-files.stamp
 
 tools: stamps/tools.stamp
+
+update: stamps/update.stamp
diff -r 3697dfe80c91 -r 245e85ca98be Makefile.in
--- a/Makefile.in	Mon Dec 10 11:23:44 2007 -0500
+++ b/Makefile.in	Mon Dec 10 11:46:42 2007 -0500
@@ -642,7 +642,7 @@ install:
 install:
 
 .PHONY: \
-	env env-ecj snapshot clean-clone clean-clone clean-patch \
+	env env-ecj snapshot clean-clone clean-update clean-patch \
 	clean-clone-ecj clean-patch-ecj clean-bootstrap-directory \
 	clean-bootstrap-directory-symlink clean-bootstrap-directory-ecj \
 	clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \
@@ -673,7 +673,7 @@ clean-clone:
 	rm -f stamps/clone.stamp
 	rm -rf openjdk
 
-update:
+stamps/update.stamp:
 	if test -d openjdk ; \
         then \
 	  cd openjdk; \
@@ -681,6 +681,10 @@ update:
           hg fupdate; \
 	  cd ..; \
 	fi
+	touch stamps/update.stamp
+
+clean-update:
+	rm -f stamps/update.stamp
 
 # Link ports sources into tree
 stamps/ports.stamp: stamps/clone.stamp
@@ -694,7 +698,7 @@ stamps/ports.stamp: stamps/clone.stamp
 	mkdir -p stamps
 	touch stamps/ports.stamp
 
-stamps/patch.stamp: stamps/clone.stamp update
+stamps/patch.stamp: stamps/clone.stamp stamps/update.stamp
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
 	  echo Checking $$p ; \
@@ -877,7 +881,7 @@ clean-bootstrap-directory-symlink-ecj:
 
 # If you change anything here in the icedtea target, please make sure
 # you change it in the icedtea-debug target as well.
-icedtea: update stamps/tools.stamp stamps/plugs.stamp \
+icedtea: stamps/update.stamp stamps/tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
@@ -888,7 +892,7 @@ icedtea: update stamps/tools.stamp stamp
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
 	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
 
-icedtea-debug: update stamps/bootstrap-directory-symlink.stamp \
+icedtea-debug: stamps/update.stamp stamps/bootstrap-directory-symlink.stamp \
 	stamps/tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
@@ -1125,6 +1129,8 @@ tools-copy-source-files: stamps/tools-co
 tools-copy-source-files: stamps/tools-copy-source-files.stamp
 
 tools: stamps/tools.stamp
+
+update: stamps/update.stamp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: