diff options
Diffstat (limited to 'libjava/classpath/lib/Makefile.am')
| -rw-r--r-- | libjava/classpath/lib/Makefile.am | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/libjava/classpath/lib/Makefile.am b/libjava/classpath/lib/Makefile.am index 983622d..ada3b2b 100644 --- a/libjava/classpath/lib/Makefile.am +++ b/libjava/classpath/lib/Makefile.am @@ -7,17 +7,16 @@ sinclude $(JAVA_DEPEND) propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org META-INF -type d ! -name CVS -print) propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org -name \*\.properties -print) -metafiles := $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -path \*/CVS -prune -o -type f -print) +metafiles := $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -type f -print) iconfiles := $(shell cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print) compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:.:$(USER_CLASSLIB) # handling source to bytecode compiler programs like gcj, jikes and kjc if FOUND_GCJ -# Since we don't feed all classes at once gcj needs to know where to find -# the generated classes (in top_builddir). -JAVAC = $(srcdir)/split-for-gcj.sh && $(MAKE) -f $(srcdir)/Makefile.gcj \ - GCJ='$(GCJ)' compile_classpath='$(top_builddir):$(compile_classpath)' +## This should never be used when gcj is the compiler. +## See the compile-classes target. +JAVAC = exit 1 else if FOUND_JIKES JAVAC = $(JIKES) +Pno-shadow +Pno-switchcheck +F $(JIKESENCODING) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(compile_classpath) -d . @classes @@ -30,7 +29,7 @@ if FOUND_GCJX JAVAC = $(GCJX) -encoding UTF-8 -classpath .:$(USER_CLASSLIB) -d . @classes else if FOUND_ECJ -JAVAC = $(ECJ) -encoding UTF-8 -warn:-deprecation,serial -proceedOnError -bootclasspath '' -classpath $(compile_classpath) -d . @classes +JAVAC = $(ECJ) -encoding UTF-8 -warn:none -proceedOnError -bootclasspath '' -classpath $(compile_classpath) -d . @classes endif # FOUND_ECJ endif # FOUND_GCJX endif # FOUND_KJC @@ -119,13 +118,24 @@ endif # REGEN_PARSER $(JAVA_DEPEND): genclasses +if FOUND_GCJ +## When building with gcj, we do a recursive make. We split this rule +## out specially, rather than simply defining JAVAC, so that GNU make +## will see the recursive make invocation and still allow parallel +## builds. +compile-classes: classes $(JAVA_SRCS) Makefile + $(MAKE) -f $(srcdir)/Makefile.gcj \ + GCJ='$(GCJ)' \ + compile_classpath='$(top_builddir):$(compile_classpath)' \ + top_srcdir=$(top_srcdir) +else compile-classes: classes $(JAVA_SRCS) Makefile $(JAVAC) touch compile-classes +endif EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh CLEANFILES = compile-classes resources classes \ - classes.standard classes.awt classes.standardx classes.xml \ glibj.zip classes.1 \ $(top_builddir)/java/util/LocaleData.java \ $(JAVA_DEPEND) @@ -148,5 +158,3 @@ dist-hook: $(FIND) $(top_distdir)/gnu $(top_distdir)/java $(top_distdir)/javax $(top_distdir)/org $(top_distdir)/vm -name class-dependencies.conf -print | xargs rm -f rm -f $(top_distdir)/gnu/classpath/Configuration.java rm -f $(top_distdir)/java/util/LocaleData.java -# Omit files listed in standard.omit. - ( cd $(top_distdir)/lib ; cat $(top_builddir)/lib/standard.omit | sed -e 's/\$$//' | sed -e 's/\/\.\*//' | xargs rm -fr ) |