/hg/icedtea: Minor Makefile cleanups and addition of VERBOSE.

[andrew at icedtea.classpath.org]

changeset 0cae6a810c07 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0cae6a810c07
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jul 21 09:21:37 2010 +0100

	Minor Makefile cleanups and addition of VERBOSE.

	2010-07-20 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (ICEDTEA_BUILD_TARGET): Match
	formatting used by IcedTea6. (ICEDTEA_DEBUG_BUILD_TARGET):
	Likewise. (clean-local): Remove redundant reference to jni-
	common.o (ports): Remove redundant hotspot/build
	replacement. (plugin-tests): Fix broken reference to reflink
	with SRC_DIR_LINK.

	2010-02-26 Mark Wielaard <mark at klomp.org>

	 (VERBOSE): Use value of VERBOSE passed from user.


diffstat:

2 files changed, 23 insertions(+), 9 deletions(-)
ChangeLog   |   14 ++++++++++++++
Makefile.am |   18 +++++++++---------

diffs (78 lines):

diff -r 1df7fd93eecc -r 0cae6a810c07 ChangeLog
--- a/ChangeLog	Tue Jul 20 22:12:45 2010 +0100
+++ b/ChangeLog	Wed Jul 21 09:21:37 2010 +0100
@@ -1,3 +1,17 @@ 2010-07-20  Andrew John Hughes  <ahughes
+2010-07-20  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_BUILD_TARGET): Match formatting used by IcedTea6.
+	(ICEDTEA_DEBUG_BUILD_TARGET): Likewise.
+	(clean-local): Remove redundant reference to jni-common.o
+	(ports): Remove redundant hotspot/build replacement.
+	(plugin-tests): Fix broken reference to reflink with
+	SRC_DIR_LINK.
+
+2010-02-26  Mark Wielaard  <mark at klomp.org>
+
+	(VERBOSE): Use value of VERBOSE passed from user.
+
 2010-07-20  Andrew John Hughes  <ahughes at redhat.com>
 
 	* configure.ac:
diff -r 1df7fd93eecc -r 0cae6a810c07 Makefile.am
--- a/Makefile.am	Tue Jul 20 22:12:45 2010 +0100
+++ b/Makefile.am	Wed Jul 21 09:21:37 2010 +0100
@@ -216,10 +216,10 @@ endif
 endif
 
 if WITH_CACAO
-  ICEDTEA_BUILD_TARGET=jdk_only
-  ICEDTEA_DEBUG_BUILD_TARGET=jdk_fastdebug_only
+  ICEDTEA_BUILD_TARGET = jdk_only
+  ICEDTEA_DEBUG_BUILD_TARGET = jdk_fastdebug_only
 else
-  ICEDTEA_DEBUG_BUILD_TARGET=debug_build
+  ICEDTEA_DEBUG_BUILD_TARGET = debug_build
 endif
 
 if BOOTSTRAPPING
@@ -534,7 +534,8 @@ ICEDTEA_ENV = \
 	DEBUG_BINARIES="true" \
 	DISABLE_INTREE_EC="true" \
 	ALT_DROPS_DIR="$(abs_top_builddir)/drops" \
-	ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)"
+	ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" \
+	VERBOSE="$(VERBOSE)"
 
 if WITH_CACAO
 ICEDTEA_ENV += \
@@ -786,7 +787,6 @@ clean-local: clean-jtreg clean-jtreg-rep
 	if [ -e lib ]; then \
 	  rmdir lib ; \
 	fi
-	rm -f jni-common.o
 
 distclean-local: clean-local clean-download
 	if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
@@ -1320,7 +1320,7 @@ stamps/ports.stamp: stamps/extract.stamp
 		      $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
 		      $(abs_top_srcdir)/ports/hotspot/src/cpu/zero/vm/* \
 		      $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
-	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'|sed "s#hotspot/build#hotspot/make#"); \
+	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
 	  ln -sfv $$target $$link; \
 	done
 	if ! test "x$(WITH_CACAO)" = "xno" ; then \
@@ -2413,9 +2413,9 @@ stamps/plugin-tests.stamp: $(PLUGIN_TEST
 	 -d plugin/tests/LiveConnect \
 	 -classpath $(LIVECONNECT_JAR) $(PLUGIN_TEST_SRCS) ;
 	$(BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
-	  plugin/tests/LiveConnect/*.class ;
-	cp -pPR --reflink-auto $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} \
-	  plugin/tests/LiveConnect ;
+	  plugin/tests/LiveConnect/*.class 
+	cp -pPR $(SRC_DIR_LINK) $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} \
+	  plugin/tests/LiveConnect
 	echo "Done. Now load \"file://$(abs_top_builddir)/index.html\" in your browser" ; \
 	mkdir -p stamps
 	touch stamps/plugin-tests.stamp