Mercurial > hg > release > icedtea-1.9

changeset 716:9a0bc3372842 cacao

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2007-03-12 Christan Thalinger <twisti@complang.tuwien.ac.at> * Makefile.am (ICEDTEA_BUILD_TARGET): Added. (ICEDTEA_DEBUG_BUILD_TARGET): Likewise. * Makefile.in: Regenerated.
author Christian Thalinger <twisti@complang.tuwien.ac.at>
date Wed, 12 Mar 2008 11:13:40 +0100
parents c582a6c71cda
children 3e03edaa0a54
files ChangeLog Makefile.am Makefile.in
diffstat 3 files changed, 24 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Mar 12 11:05:40 2008 +0100
+++ b/ChangeLog	Wed Mar 12 11:13:40 2008 +0100
@@ -1,3 +1,9 @@
+2007-03-12  Christan Thalinger  <twisti@complang.tuwien.ac.at>
+
+	* Makefile.am (ICEDTEA_BUILD_TARGET): Added.
+	(ICEDTEA_DEBUG_BUILD_TARGET): Likewise.
+	* Makefile.in: Regenerated.
+
 2007-03-12  Christan Thalinger  <twisti@complang.tuwien.ac.at>
 
 	* Makefile.in: Regenerated after transplanting.
--- a/Makefile.am	Wed Mar 12 11:05:40 2008 +0100
+++ b/Makefile.am	Wed Mar 12 11:13:40 2008 +0100
@@ -515,6 +515,14 @@
   MEMORY_LIMIT =
 endif
 
+if WITH_CACAO
+  ICEDTEA_BUILD_TARGET=j2se_only
+  ICEDTEA_DEBUG_BUILD_TARGET=j2se_fastdebug_only
+else
+  ICEDTEA_BUILD_TARGET=
+  ICEDTEA_DEBUG_BUILD_TARGET=debug_build
+endif
+
 # If you change anything here in the icedtea target, please make sure
 # you change it in the icedtea-debug target as well.
 icedtea: stamps/bootstrap-directory-symlink.stamp \
@@ -523,7 +531,8 @@
 	$(ICEDTEAPLUGIN_TARGET)
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
-	  -C openjdk/ j2se_only
+	  -C openjdk/ \
+	  $(ICEDTEA_BUILD_TARGET)
 if ENABLE_LIVECONNECT
 	cp -pPRf IcedTeaPlugin.so \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
@@ -550,7 +559,7 @@
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
-	  j2se_fastdebug_only
+	  $(ICEDTEA_DEBUG_BUILD_TARGET)
 if ENABLE_LIVECONNECT
 	cp -pPRf IcedTeaPlugin.so \
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
--- a/Makefile.in	Wed Mar 12 11:05:40 2008 +0100
+++ b/Makefile.in	Wed Mar 12 11:13:40 2008 +0100
@@ -376,6 +376,10 @@
 # ===============
 @WITH_CACAO_TRUE@@WITH_ICEDTEA_TRUE@MEMORY_LIMIT = -J-Xmx1024m
 @WITH_ICEDTEA_FALSE@MEMORY_LIMIT = 
+@WITH_CACAO_FALSE@ICEDTEA_BUILD_TARGET = 
+@WITH_CACAO_TRUE@ICEDTEA_BUILD_TARGET = j2se_only
+@WITH_CACAO_FALSE@ICEDTEA_DEBUG_BUILD_TARGET = debug_build
+@WITH_CACAO_TRUE@ICEDTEA_DEBUG_BUILD_TARGET = j2se_fastdebug_only
 
 # Shared objects.
 SHARED_OBJECT_FILES = \
@@ -973,7 +977,8 @@
 	$(ICEDTEAPLUGIN_TARGET)
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
-	  -C openjdk/ j2se_only
+	  -C openjdk/ \
+	  $(ICEDTEA_BUILD_TARGET)
 @ENABLE_LIVECONNECT_TRUE@	cp -pPRf IcedTeaPlugin.so \
 @ENABLE_LIVECONNECT_TRUE@	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 @ENABLE_LIVECONNECT_TRUE@	cp -pPRf IcedTeaPlugin.so \
@@ -995,7 +1000,7 @@
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
-	  j2se_fastdebug_only
+	  $(ICEDTEA_DEBUG_BUILD_TARGET)
 @ENABLE_LIVECONNECT_TRUE@	cp -pPRf IcedTeaPlugin.so \
 @ENABLE_LIVECONNECT_TRUE@	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 @ENABLE_LIVECONNECT_TRUE@	cp -pPRf IcedTeaPlugin.so \