changeset in /hg/icedtea: 2007-11-29 Matthias Klose <doko at ubun...

[Lillian Angel]

changeset f1ceb74917b7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f1ceb74917b7
description:
	2007-11-29  Matthias Klose  <doko at ubuntu.com>

	        * Makefile.am: Create symlinks to find jni header files.
	        * Makefile.in: Regenerate.

diffstat:

3 files changed, 25 insertions(+)
ChangeLog   |    5 +++++
Makefile.am |   10 ++++++++++
Makefile.in |   10 ++++++++++

diffs (66 lines):

diff -r 4ef5f04f331d -r f1ceb74917b7 ChangeLog
--- a/ChangeLog	Thu Nov 29 05:42:17 2007 -0500
+++ b/ChangeLog	Thu Nov 29 14:27:16 2007 -0500
@@ -1,3 +1,8 @@ 2007-11-29  Gary Benson  <gbenson at redhat
+2007-11-29  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am: Create symlinks to find jni header files.
+	* Makefile.in: Regenerate.
+
 2007-11-29  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/os_cpu/linux_ppc/vm/assembler_ppc.cpp
diff -r 4ef5f04f331d -r f1ceb74917b7 Makefile.am
--- a/Makefile.am	Thu Nov 29 05:42:17 2007 -0500
+++ b/Makefile.am	Thu Nov 29 14:27:16 2007 -0500
@@ -335,6 +335,9 @@ stamps/bootstrap-directory.stamp: stamps
 stamps/bootstrap-directory.stamp: stamps/icedtea-against-ecj.stamp
 	rm -rf bootstrap/icedtea
 	ln -s $(abs_top_srcdir)/openjdk-ecj/control/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
 	mkdir -p stamps
 	touch stamps/bootstrap-directory.stamp
 
@@ -387,6 +390,13 @@ stamps/bootstrap-directory-ecj.stamp:
 	ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
 	mkdir -p bootstrap/ecj/jre/lib
 	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) bootstrap/ecj/jre/lib/
+	mkdir -p bootstrap/ecj/include
+	for i in $(SYSTEM_GCJ_DIR)/include/*; do \
+	  test -r $$i | continue; \
+	  i=`basename $$i`; \
+	  rm -f bootstrap/ecj/include/$$i; \
+	  ln -s $(SYSTEM_GCJ_DIR)/include/$$i bootstrap/ecj/include/$$i; \
+	done
 	if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
 	then \
 		mkdir -p bootstrap/ecj/lib ; \
diff -r 4ef5f04f331d -r f1ceb74917b7 Makefile.in
--- a/Makefile.in	Thu Nov 29 05:42:17 2007 -0500
+++ b/Makefile.in	Thu Nov 29 14:27:16 2007 -0500
@@ -763,6 +763,9 @@ stamps/bootstrap-directory.stamp: stamps
 stamps/bootstrap-directory.stamp: stamps/icedtea-against-ecj.stamp
 	rm -rf bootstrap/icedtea
 	ln -s $(abs_top_srcdir)/openjdk-ecj/control/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
 	mkdir -p stamps
 	touch stamps/bootstrap-directory.stamp
 
@@ -807,6 +810,13 @@ stamps/bootstrap-directory-ecj.stamp:
 	ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
 	mkdir -p bootstrap/ecj/jre/lib
 	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) bootstrap/ecj/jre/lib/
+	mkdir -p bootstrap/ecj/include
+	for i in $(SYSTEM_GCJ_DIR)/include/*; do \
+	  test -r $$i | continue; \
+	  i=`basename $$i`; \
+	  rm -f bootstrap/ecj/include/$$i; \
+	  ln -s $(SYSTEM_GCJ_DIR)/include/$$i bootstrap/ecj/include/$$i; \
+	done
 	if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
 	then \
 		mkdir -p bootstrap/ecj/lib ; \