changeset in /hg/icedtea: Fixed make dist
Lillian Angel
langel at redhat.com
Fri May 30 08:10:02 PDT 2008
changeset f1c821e52996 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f1c821e52996
description:
Fixed make dist
diffstat:
3 files changed, 33 insertions(+), 27 deletions(-)
ChangeLog | 6 ++++++
Makefile.am | 26 +++++++++++++-------------
Makefile.in | 28 ++++++++++++++--------------
diffs (168 lines):
diff -r 7975ee6908a5 -r f1c821e52996 ChangeLog
--- a/ChangeLog Fri May 30 15:52:51 2008 +0100
+++ b/ChangeLog Fri May 30 11:09:57 2008 -0400
@@ -1,3 +1,9 @@ 2008-05-30 Mark Wielaard <mark at klomp.o
+2008-05-30 Lillian Angel <langel at redhat.com>
+
+ * Makefile.am: Fixed dist to not include full path to ports, and
+ ICEDTEA_ECJ_PATCH. This fixes the problem with "make dist".
+ * Makefile.in: Regenerated.
+
2008-05-30 Mark Wielaard <mark at klomp.org>
* patches/icedtea-ecj.patch: Use `cat file-list` not gjar -@ stdin.
diff -r 7975ee6908a5 -r f1c821e52996 Makefile.am
--- a/Makefile.am Fri May 30 15:52:51 2008 +0100
+++ b/Makefile.am Fri May 30 11:09:57 2008 -0400
@@ -37,11 +37,11 @@ install:
hotspot hotspot-helper clean-extra clean-jtreg clean-jtreg-reports
EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
- gcjwebplugin.cc tools-copy contrib ${abs_top_srcdir}/ports \
+ gcjwebplugin.cc tools-copy contrib ports \
patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \
patches/icedtea-cacao.patch $(OPENJDK_PATCHES) \
javaws.png javaws.desktop patches/icedtea-netx-plugin.patch \
- overlays extra jconsole.desktop policytool.desktop
+ overlays extra jconsole.desktop policytool.desktop \
test/jtreg
# The Binary plugs directory is called jdk1.7.0 for historical reasons. The
@@ -248,18 +248,18 @@ clean-clone:
# Link ports sources into tree
stamps/ports.stamp: stamps/clone.stamp
- for target in ${abs_top_srcdir}/ports/hotspot/build/*/makefiles/* \
- ${abs_top_srcdir}/ports/hotspot/src/*/*; do \
+ for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+ $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
ln -sf $$target $$link; \
done
- ln -sf ${abs_top_builddir}/platform_zero openjdk/hotspot/build/linux
+ ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
- ln -sf ${abs_top_builddir}/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+ ln -sf $(abs_top_builddir)/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
fi
if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
- ln -sf ${abs_top_builddir}/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+ ln -sf $(abs_top_builddir)/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
fi
mkdir -p stamps
touch stamps/ports.stamp
@@ -438,24 +438,24 @@ clean-clone-ecj:
# Link ports sources into tree
stamps/ports-ecj.stamp: stamps/clone-ecj.stamp
- for target in ${abs_top_srcdir}/ports/hotspot/build/*/makefiles/* \
- ${abs_top_srcdir}/ports/hotspot/src/*/*; do \
+ for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+ $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
ln -sf $$target $$link; \
done
- ln -sf ${abs_top_builddir}/platform_zero openjdk-ecj/hotspot/build/linux
+ ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/build/linux
if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
- ln -sf ${abs_top_builddir}/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+ ln -sf $(abs_top_builddir)/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
fi
if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
- ln -sf ${abs_top_builddir}/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+ ln -sf $(abs_top_builddir)/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
fi
mkdir -p stamps
touch stamps/ports-ecj.stamp
# Patch OpenJDK for plug replacements and ecj.
-ICEDTEA_ECJ_PATCH = $(abs_top_srcdir)/patches/icedtea-ecj.patch
+ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
stamps/patch-ecj.stamp: stamps/clone-ecj.stamp
echo Checking $(ICEDTEA_ECJ_PATCH) ; \
diff -r 7975ee6908a5 -r f1c821e52996 Makefile.in
--- a/Makefile.in Fri May 30 15:52:51 2008 +0100
+++ b/Makefile.in Fri May 30 11:09:57 2008 -0400
@@ -254,11 +254,12 @@ OPENJDK_VERSION = b26
@NETX_PLUGIN_FALSE at NETX_PATCH =
@NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch
EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
- gcjwebplugin.cc tools-copy contrib ${abs_top_srcdir}/ports \
+ gcjwebplugin.cc tools-copy contrib ports \
patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \
patches/icedtea-cacao.patch $(OPENJDK_PATCHES) \
javaws.png javaws.desktop patches/icedtea-netx-plugin.patch \
- overlays extra jconsole.desktop policytool.desktop
+ overlays extra jconsole.desktop policytool.desktop \
+ test/jtreg
# The Binary plugs directory is called jdk1.7.0 for historical reasons. The
@@ -425,7 +426,7 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
$(am__append_7)
# Patch OpenJDK for plug replacements and ecj.
-ICEDTEA_ECJ_PATCH = $(abs_top_srcdir)/patches/icedtea-ecj.patch
+ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
@WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
@WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP =
@WITH_OPENJDK_TRUE at BOOTSTRAP_DIRECTORY_STAMP =
@@ -785,7 +786,6 @@ install:
clean-tools-jar clean-shared-objects \
clean-copy clean-hotspot-tools clean-rt clean-gcjwebplugin \
hotspot hotspot-helper clean-extra clean-jtreg clean-jtreg-reports
- test/jtreg
env:
@echo 'unset JAVA_HOME'
@@ -843,18 +843,18 @@ clean-clone:
# Link ports sources into tree
stamps/ports.stamp: stamps/clone.stamp
- for target in ${abs_top_srcdir}/ports/hotspot/build/*/makefiles/* \
- ${abs_top_srcdir}/ports/hotspot/src/*/*; do \
+ for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+ $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
ln -sf $$target $$link; \
done
- ln -sf ${abs_top_builddir}/platform_zero openjdk/hotspot/build/linux
+ ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
- ln -sf ${abs_top_builddir}/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+ ln -sf $(abs_top_builddir)/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
fi
if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
- ln -sf ${abs_top_builddir}/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+ ln -sf $(abs_top_builddir)/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
fi
mkdir -p stamps
touch stamps/ports.stamp
@@ -946,18 +946,18 @@ clean-clone-ecj:
# Link ports sources into tree
stamps/ports-ecj.stamp: stamps/clone-ecj.stamp
- for target in ${abs_top_srcdir}/ports/hotspot/build/*/makefiles/* \
- ${abs_top_srcdir}/ports/hotspot/src/*/*; do \
+ for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+ $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
ln -sf $$target $$link; \
done
- ln -sf ${abs_top_builddir}/platform_zero openjdk-ecj/hotspot/build/linux
+ ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/build/linux
if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
- ln -sf ${abs_top_builddir}/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+ ln -sf $(abs_top_builddir)/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
fi
if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
- ln -sf ${abs_top_builddir}/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+ ln -sf $(abs_top_builddir)/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
fi
mkdir -p stamps
touch stamps/ports-ecj.stamp
More information about the distro-pkg-dev
mailing list