[kaffe] CVS kaffe (doogie): No longer sed the Makefile, looking for our vars. Instead, the makefile

[Kaffe CVS]

PatchSet 5577 
Date: 2004/12/08 22:58:25
Author: doogie
Branch: HEAD
Tag: (none) 
Log:
No longer sed the Makefile, looking for our vars.  Instead, the makefile
now exports what we need.  This allows --with-jikes="jikes +Pno-shadow
+Pno-switchcheck" to be used, and the classes compiled accordingly.

Members: 
	ChangeLog:1.3123->1.3124 
	libraries/javalib/Makefile.am:1.271->1.272 
	libraries/javalib/Makefile.in:1.352->1.353 
	libraries/javalib/rebuildLib.in:1.42->1.43 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3123 kaffe/ChangeLog:1.3124
--- kaffe/ChangeLog:1.3123	Wed Dec  8 22:39:47 2004
+++ kaffe/ChangeLog	Wed Dec  8 22:58:25 2004
@@ -1,5 +1,15 @@
 2004-12-08  Adam Heath  <doogie at brainfood.com>
 
+	* libraries/javalib/Makefile.am,
+	  libraries/javalib/Makefile.in,
+	  libraries/javalib/rebuildLib.in:
+ 	  No longer sed the Makefile, looking for our vars.  Instead,
+	  the makefile now exports what we need.  This allows
+	  --with-jikes="jikes +Pno-shadow +Pno-switchcheck" to be used,
+	  and the classes compiled accordingly.
+
+2004-12-08  Adam Heath  <doogie at brainfood.com>
+
 	* test/regression/SoTimeout.java: No longer use buffered
 	  anything, nor any encoder/decoder stuff.  It's not specified
 	  what should happen to buffered data when an IOException
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.271 kaffe/libraries/javalib/Makefile.am:1.272
--- kaffe/libraries/javalib/Makefile.am:1.271	Wed Dec  8 20:38:39 2004
+++ kaffe/libraries/javalib/Makefile.am	Wed Dec  8 22:58:23 2004
@@ -4678,3 +4678,4 @@
 build-classes Klasses: rt.jar
 
 all-am: rebuildLib
+export JIKES top_builddir LIBDIR srcdir
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.352 kaffe/libraries/javalib/Makefile.in:1.353
--- kaffe/libraries/javalib/Makefile.in:1.352	Wed Dec  8 20:38:40 2004
+++ kaffe/libraries/javalib/Makefile.in	Wed Dec  8 22:58:24 2004
@@ -5625,6 +5625,7 @@
 build-classes Klasses: rt.jar
 
 all-am: rebuildLib
+export JIKES top_builddir LIBDIR srcdir
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: kaffe/libraries/javalib/rebuildLib.in
diff -u kaffe/libraries/javalib/rebuildLib.in:1.42 kaffe/libraries/javalib/rebuildLib.in:1.43
--- kaffe/libraries/javalib/rebuildLib.in:1.42	Thu Sep  9 20:33:18 2004
+++ kaffe/libraries/javalib/rebuildLib.in	Wed Dec  8 22:58:25 2004
@@ -13,28 +13,20 @@
     exit 0
 fi
 
-SRCDIR=${srcdir-`sed -n '/^srcdir *= */ s///p' < Makefile`}
-LIBDIR=${LIBDIR-`sed -n '/^LIBDIR *= */ s///p' < Makefile`}
-LIBDIR=${LIBDIR-lib}
-TOPBLD=${top_builddir-`sed -n '/^top_builddir *= */ s///p' < Makefile`}
-
 # We now rebuild the class library using kjc and Klasses.jar.bootstrap 
-JIKES="@JIKES@"
-: ${JAVAC_FLAGS=@JAVAC_FLAGS@}
 # JIKES=
 
 LIBDIR=`CDPATH=: && cd $LIBDIR && pwd`
 VERBOSE=
 
-ISSRCDIR=`echo $SRCDIR | egrep '^/.*'`
-if [ -z "${ISSRCDIR:-}" ]; then
-	SRCDIR="`pwd`/$SRCDIR"
+issrcdir=`echo $srcdir | egrep '^/.*'`
+if [ -z "${issrcdir:-}" ]; then
+	srcdir="`pwd`/$srcdir"
 fi
 
 if [ -z "${JIKES:-}" ] ; then
 	if [ -z "${JAVA:-}" ]; then
-		test -f ${TOPBLD}/BUILD_ENVIRONMENT &&
-		. ${TOPBLD}/BUILD_ENVIRONMENT
+		test -f ${top_builddir}/BUILD_ENVIRONMENT && . ${top_builddir}/BUILD_ENVIRONMENT
 		BOOTCLASSPATH=${BOOTCLASSPATH}:${CLASSPATH}:${LIBDIR}; export BOOTCLASSPATH
 		JAVA="$JAVA -verbosegc"
 	fi
@@ -45,16 +37,16 @@
 		JAVAC="$JAVA -ss 500k -mx 512M at.dms.kjc.Main"
 		VERBOSE=-v
 	fi
-	BOOTCLASSPATH=${SRCDIR}/Klasses.jar.bootstrap:$BOOTCLASSPATH; export BOOTCLASSPATH
+	BOOTCLASSPATH=${srcdir}/Klasses.jar.bootstrap:$BOOTCLASSPATH; export BOOTCLASSPATH
 else
-	test -f ${TOPBLD}/BUILD_ENVIRONMENT && . ${TOPBLD}/BUILD_ENVIRONMENT
+	test -f ${top_builddir}/BUILD_ENVIRONMENT && . ${top_builddir}/BUILD_ENVIRONMENT
 	CLASSPATH=${CLASSPATH}:${LIBDIR}
 	JAVAC="$JIKES"
 	CPATH="${CPATH+-classpath $CLASSPATH:$BOOTCLASSPATH}"
 #	VERBOSE=${VERBOSE-"-verbose"}
 fi
 
-cd $SRCDIR
+cd $srcdir
 
 echo "Compiling classes from " ${1+"$@"} " using " $JAVAC $JAVAC_FLAGS
 $JAVAC $VERBOSE $JAVAC_FLAGS -d $LIBDIR $CPATH ${1+"$@"}