changeset in /hg/icedtea: Remove references to control/build.
gnu_andrew at member.fsf.org
gnu_andrew at member.fsf.org
Thu May 29 14:13:52 PDT 2008
changeset e5aa799367d0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e5aa799367d0
description:
Remove references to control/build.
diffstat:
3 files changed, 36 insertions(+), 29 deletions(-)
ChangeLog | 7 +++++++
Makefile.am | 30 +++++++++++++++---------------
Makefile.in | 28 ++++++++++++++--------------
diffs (226 lines):
diff -r 5699fc17853f -r e5aa799367d0 ChangeLog
--- a/ChangeLog Mon May 26 01:46:08 2008 +0100
+++ b/ChangeLog Mon May 26 04:26:03 2008 +0100
@@ -1,3 +1,10 @@ 2008-05-25 Andrew John Hughes <gnu_and
+2008-05-26 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am:
+ Remove references to control/build as
+ this no longer exists.
+ * Makefile.in: Regenerated.
+
2008-05-25 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
diff -r 5699fc17853f -r e5aa799367d0 Makefile.am
--- a/Makefile.am Mon May 26 01:46:08 2008 +0100
+++ b/Makefile.am Mon May 26 04:26:03 2008 +0100
@@ -46,7 +46,7 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC
# OpenJDK build environment.
LINUX_DIR = linux-$(BUILD_ARCH_DIR)
-BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)
+BUILD_OUTPUT_DIR = openjdk/build/$(LINUX_DIR)
ICEDTEA_BUILD_DIR = \
$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
ICEDTEA_RT = \
@@ -121,9 +121,9 @@ env:
# OpenJDK ecj build environment.
ICEDTEA_BUILD_DIR_ECJ = \
- $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/
+ $(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/
ICEDTEA_CLS_DIR_ECJ = \
- $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
+ $(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/classes
ICEDTEA_ENV_ECJ = \
"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" \
@@ -481,7 +481,7 @@ clean-patch-ecj:
# bootstrap/icedtea.
stamps/bootstrap-directory.stamp: stamps/icedtea-against-ecj.stamp
rm -rf bootstrap/icedtea
- ln -s $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
+ ln -s $(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
if ! test -d bootstrap/icedtea/include; then \
ln -sf $(ICEDTEA_BUILD_DIR_ECJ)/include bootstrap/icedtea/include; \
fi
@@ -617,7 +617,7 @@ icedtea: stamps/bootstrap-directory-syml
gcjwebplugin.so extra-lib/about.jar
$(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/control/make/ \
+ -C openjdk/ \
$(ICEDTEA_BUILD_TARGET)
if test "$(ENABLE_PLUGIN)" == "yes" ; \
then \
@@ -640,7 +640,7 @@ icedtea-debug: stamps/bootstrap-director
gcjwebplugin.so extra-lib/about.jar
$(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/control/make \
+ -C openjdk/ \
$(ICEDTEA_DEBUG_BUILD_TARGET)
if test "$(ENABLE_PLUGIN)" == "yes" ; \
then \
@@ -661,7 +661,7 @@ clean-icedtea: stamps/clone.stamp
clean-icedtea: stamps/clone.stamp
$(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/control/make clobber
+ -C openjdk/ clobber
icedtea-against-icedtea: \
stamps/bootstrap-directory-symlink.stamp \
@@ -674,10 +674,10 @@ stamps/icedtea-ecj.stamp: stamps/hotspot
stamps/ports-ecj.stamp stamps/patch-ecj.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/control/make \
+ -C openjdk-ecj \
$(ICEDTEA_BUILD_TARGET)
@echo "ecj-poured IcedTea is served:" \
- openjdk-ecj/control/build/$(LINUX_DIR)
+ openjdk-ecj/build/$(LINUX_DIR)
mkdir -p stamps
touch stamps/icedtea-ecj.stamp
@@ -686,22 +686,22 @@ hotspot:
rm -f stamps/icedtea-ecj.stamp
rm -f stamps/icedtea-against-ecj.stamp
$(MAKE) hotspot-helper
- cp openjdk-ecj/control/build/$(LINUX_DIR)/hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/core/libjvm.so \
- openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/core
- @echo "Hotspot is served:" openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image
+ cp openjdk-ecj/build/$(LINUX_DIR)/hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/core/libjvm.so \
+ openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/core
+ @echo "Hotspot is served:" openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image
hotspot-helper: stamps/bootstrap-directory-symlink-ecj.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports-ecj.stamp stamps/patch-ecj.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/control/make hotspot
+ -C openjdk-ecj hotspot
clean-icedtea-ecj: stamps/clone-ecj.stamp
rm -f stamps/icedtea-ecj.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/control/make clobber
+ -C openjdk-ecj clobber
stamps/icedtea-against-ecj.stamp: \
stamps/bootstrap-directory-symlink-ecj.stamp \
@@ -916,7 +916,7 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
# extras -- used to create about.jar for javaws.
extra-source-files.txt:
- find extra -name '*.java' | sort > $@
+ find $(abs_top_srcdir)/extra -name '*.java' | sort > $@
stamps/extra-class-files.stamp: extra-source-files.txt \
bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
diff -r 5699fc17853f -r e5aa799367d0 Makefile.in
--- a/Makefile.in Mon May 26 01:46:08 2008 +0100
+++ b/Makefile.in Mon May 26 04:26:03 2008 +0100
@@ -263,7 +263,7 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC
# OpenJDK build environment.
LINUX_DIR = linux-$(BUILD_ARCH_DIR)
-BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)
+BUILD_OUTPUT_DIR = openjdk/build/$(LINUX_DIR)
ICEDTEA_BUILD_DIR = \
$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
@@ -312,10 +312,10 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE
# OpenJDK ecj build environment.
ICEDTEA_BUILD_DIR_ECJ = \
- $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/
+ $(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/
ICEDTEA_CLS_DIR_ECJ = \
- $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
+ $(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/classes
ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
@@ -985,7 +985,7 @@ clean-patch-ecj:
# bootstrap/icedtea.
stamps/bootstrap-directory.stamp: stamps/icedtea-against-ecj.stamp
rm -rf bootstrap/icedtea
- ln -s $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
+ ln -s $(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
if ! test -d bootstrap/icedtea/include; then \
ln -sf $(ICEDTEA_BUILD_DIR_ECJ)/include bootstrap/icedtea/include; \
fi
@@ -1086,7 +1086,7 @@ icedtea: stamps/bootstrap-directory-syml
gcjwebplugin.so extra-lib/about.jar
$(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/control/make/ \
+ -C openjdk/ \
$(ICEDTEA_BUILD_TARGET)
if test "$(ENABLE_PLUGIN)" == "yes" ; \
then \
@@ -1109,7 +1109,7 @@ icedtea-debug: stamps/bootstrap-director
gcjwebplugin.so extra-lib/about.jar
$(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/control/make \
+ -C openjdk/ \
$(ICEDTEA_DEBUG_BUILD_TARGET)
if test "$(ENABLE_PLUGIN)" == "yes" ; \
then \
@@ -1130,7 +1130,7 @@ clean-icedtea: stamps/clone.stamp
clean-icedtea: stamps/clone.stamp
$(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/control/make clobber
+ -C openjdk/ clobber
icedtea-against-icedtea: \
stamps/bootstrap-directory-symlink.stamp \
@@ -1143,10 +1143,10 @@ stamps/icedtea-ecj.stamp: stamps/hotspot
stamps/ports-ecj.stamp stamps/patch-ecj.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/control/make \
+ -C openjdk-ecj \
$(ICEDTEA_BUILD_TARGET)
@echo "ecj-poured IcedTea is served:" \
- openjdk-ecj/control/build/$(LINUX_DIR)
+ openjdk-ecj/build/$(LINUX_DIR)
mkdir -p stamps
touch stamps/icedtea-ecj.stamp
@@ -1155,22 +1155,22 @@ hotspot:
rm -f stamps/icedtea-ecj.stamp
rm -f stamps/icedtea-against-ecj.stamp
$(MAKE) hotspot-helper
- cp openjdk-ecj/control/build/$(LINUX_DIR)/hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/core/libjvm.so \
- openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/core
- @echo "Hotspot is served:" openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image
+ cp openjdk-ecj/build/$(LINUX_DIR)/hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/core/libjvm.so \
+ openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/core
+ @echo "Hotspot is served:" openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image
hotspot-helper: stamps/bootstrap-directory-symlink-ecj.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports-ecj.stamp stamps/patch-ecj.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/control/make hotspot
+ -C openjdk-ecj hotspot
clean-icedtea-ecj: stamps/clone-ecj.stamp
rm -f stamps/icedtea-ecj.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/control/make clobber
+ -C openjdk-ecj clobber
stamps/icedtea-against-ecj.stamp: \
stamps/bootstrap-directory-symlink-ecj.stamp \
More information about the distro-pkg-dev
mailing list