Index: lib/standard.omit =================================================================== RCS file: /cvs/classpath/lib/standard.omit,v retrieving revision 1.29 diff -u -r1.29 standard.omit --- lib/standard.omit 2001/10/26 15:24:15 1.29 +++ lib/standard.omit 2001/10/27 12:44:13 @@ -1,3 +1,4 @@ +../gnu/classpath/Configuration.java$ ../gnu/test/.*$ ../gnu/java/awt/peer/gtk/TestAWT.java$ ../gnu/java/awt/peer/gtk/Test.java$ --- lib/Makefile.am Sat Oct 27 14:44:39 2001 +++ mark/lib/Makefile.am Sat Oct 27 14:41:49 2001 @@ -52,7 +52,7 @@ JAVAC = $(JIKES) -nowarn +F $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -d . @classes else if FOUND_GCJ -JAVAC = $(GCJ) -C $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -d . $(JAVA_SRCS) +JAVAC = $(GCJ) -C -d . @classes else if FOUND_KJC JAVAC = $(USER_JABBA) $(ARG_CLASSPATH_VM) $(KJC_CLASSPATH):$(USER_CLASSLIB) $(KJC_MAIN) $(ARG_CLASSPATH_JAVAC) .:$(USER_CLASSLIB) -d . @classes --- lib/gen-classlist.sh.in Sat Oct 27 14:44:39 2001 +++ mark/lib/gen-classlist.sh.in Sat Oct 27 14:41:49 2001 @@ -1,4 +1,6 @@ #! @SH@ # @configure_input@ address@hidden@ @top_srcdir@/com @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu ${top_builddir}/java ${top_builddir}/javax ${top_builddir}/gnu ${top_builddir}/vm/current -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes address@hidden@ @srcdir@/../java @srcdir@/../javax @srcdir@/../gnu ${top_builddir}/vm/current -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes for filexp in `cat @top_srcdir@/lib/$1.omit` ; do { grep -v ${filexp} < ${top_builddir}/lib/classes > ${top_builddir}/lib/classes.new ; mv ${top_builddir}/lib/classes.new ${top_builddir}/lib/classes ; } ; done +# Explicitly add generated java file +echo ${top_builddir}/gnu/classpath/Configuration.java >> ${top_builddir}/lib/classes