changeset in /hg/icedtea: * Merged.

[Christian Thalinger]

changeset c74818f04a5e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c74818f04a5e
description:
	* Merged.

diffstat:

4 files changed, 25 insertions(+), 3 deletions(-)
ChangeLog    |   12 ++++++++++++
Makefile.am  |    5 ++++-
Makefile.in  |    5 ++++-
acinclude.m4 |    6 +++++-

diffs (95 lines):

diff -r 19a9c530d8e2 -r c74818f04a5e ChangeLog
--- a/ChangeLog	Wed Sep 12 19:42:05 2007 +0200
+++ b/ChangeLog	Wed Sep 12 19:43:43 2007 +0200
@@ -1,3 +1,15 @@ 2007-09-11  Joshua Sumali  <jsumali at redh
+2007-09-12  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Added BUILD_NUMBER to environment. This should be
+	updated with each bXX release. Also, added dependency for
+	icedtea-debug target.
+	* Makefile.in: Regenerated.
+
+2007-09-12  Joshua Sumali  <jsumali at redhat.com>
+
+	* Makefile.am: Fixed error that broke the build.
+	* Makefile.in: Regenerated
+
 2007-09-11  Joshua Sumali  <jsumali at redhat.com>
 
 	* patches/icedtea-demos.patch: New File. Patches the sample
diff -r 19a9c530d8e2 -r c74818f04a5e Makefile.am
--- a/Makefile.am	Wed Sep 12 19:42:05 2007 +0200
+++ b/Makefile.am	Wed Sep 12 19:43:43 2007 +0200
@@ -44,6 +44,7 @@ ICEDTEA_ENDORSED_DIR = \
 ICEDTEA_ENDORSED_DIR = \
 	$(abs_top_srcdir)/bootstrap/jdk1.6.0/lib/endorsed
 ICEDTEA_ENV = \
+	"BUILD_NUMBER=b19" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
@@ -71,6 +72,7 @@ ICEDTEA_CLS_DIR_ECJ = \
 ICEDTEA_CLS_DIR_ECJ = \
 	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
 ICEDTEA_ENV_ECJ = \
+	"BUILD_NUMBER=b19" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
@@ -350,7 +352,8 @@ icedtea: stamps/tools.stamp stamps/plugs
 	  openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
 	@echo "IcedTea is served:" openjdk/control/build/$(LINUX_DIR)
 
-icedtea-debug: stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
+icedtea-debug: stamps/bootstrap-directory-symlink-ecj.stamp stamps/tools.stamp \
+	 stamps/plugs.stamp stamps/extract.stamp \
 	stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
diff -r 19a9c530d8e2 -r c74818f04a5e Makefile.in
--- a/Makefile.in	Wed Sep 12 19:42:05 2007 +0200
+++ b/Makefile.in	Wed Sep 12 19:43:43 2007 +0200
@@ -210,6 +210,7 @@ ICEDTEA_ENDORSED_DIR = \
 	$(abs_top_srcdir)/bootstrap/jdk1.6.0/lib/endorsed
 
 ICEDTEA_ENV = \
+	"BUILD_NUMBER=b19" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
@@ -237,6 +238,7 @@ ICEDTEA_CLS_DIR_ECJ = \
 	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
 
 ICEDTEA_ENV_ECJ = \
+	"BUILD_NUMBER=b19" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
@@ -836,7 +838,8 @@ icedtea: stamps/tools.stamp stamps/plugs
 	  openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
 	@echo "IcedTea is served:" openjdk/control/build/$(LINUX_DIR)
 
-icedtea-debug: stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
+icedtea-debug: stamps/bootstrap-directory-symlink-ecj.stamp stamps/tools.stamp \
+	 stamps/plugs.stamp stamps/extract.stamp \
 	stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
diff -r 19a9c530d8e2 -r c74818f04a5e acinclude.m4
--- a/acinclude.m4	Wed Sep 12 19:42:05 2007 +0200
+++ b/acinclude.m4	Wed Sep 12 19:43:43 2007 +0200
@@ -9,9 +9,13 @@ AC_DEFUN([SET_ARCH_DIRS],
       BUILD_ARCH_DIR=i586
       INSTALL_ARCH_DIR=i386
       ;;
-    powerpc*-*-*)
+    powerpc-*-*)
       BUILD_ARCH_DIR=ppc
       INSTALL_ARCH_DIR=ppc
+      ;;
+    powerpc64-*-*)
+      BUILD_ARCH_DIR=ppc64
+      INSTALL_ARCH_DIR=ppc64
       ;;
     s390*-*-*)
       BUILD_ARCH_DIR=s390