/[classpath]/classpath/lib/Makefile.am
ViewVC logotype

Diff of /classpath/lib/Makefile.am

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.63.2.11 by gnu_andrew, Tue Aug 2 20:12:39 2005 UTC revision 1.63.2.12 by gnu_andrew, Tue Aug 16 16:22:38 2005 UTC
# Line 17  if FOUND_ECJ Line 17  if FOUND_ECJ
17  JAVAC = $(ECJ) -1.5 -warn:-deprecation,serial -proceedOnError -bootclasspath '' -classpath $(compile_classpath) -d . @classes  JAVAC = $(ECJ) -1.5 -warn:-deprecation,serial -proceedOnError -bootclasspath '' -classpath $(compile_classpath) -d . @classes
18  else  else
19  if FOUND_GCJ  if FOUND_GCJ
20  # Since we don't feed all classes at once gcj needs to know where to find  ## This should never be used when gcj is the compiler.
21  # the generated classes (in top_builddir).  ## See the compile-classes target.
22  JAVAC = $(srcdir)/split-for-gcj.sh && $(MAKE) -f $(srcdir)/Makefile.gcj \  JAVAC = exit 1
     GCJ='$(GCJ)' compile_classpath='$(top_builddir):$(compile_classpath)'  
23  else  else
24  if FOUND_JIKES  if FOUND_JIKES
25  JAVAC = $(JIKES) +Pno-shadow +Pno-switchcheck +F $(JIKESENCODING) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(compile_classpath) -d . @classes  JAVAC = $(JIKES) +Pno-shadow +Pno-switchcheck +F $(JIKESENCODING) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(compile_classpath) -d . @classes
# Line 123  endif # REGEN_PARSER Line 122  endif # REGEN_PARSER
122    
123  $(JAVA_DEPEND): genclasses  $(JAVA_DEPEND): genclasses
124    
125    if FOUND_GCJ
126    ## When building with gcj, we do a recursive make.  We split this rule
127    ## out specially, rather than simply defining JAVAC, so that GNU make
128    ## will see the recursive make invocation and still allow parallel
129    ## builds.
130    compile-classes: classes $(JAVA_SRCS) Makefile
131            $(MAKE) -f $(srcdir)/Makefile.gcj \
132              GCJ='$(GCJ)' compile_classpath='$(top_builddir):$(compile_classpath)'
133    else
134  compile-classes: classes $(JAVA_SRCS) Makefile  compile-classes: classes $(JAVA_SRCS) Makefile
135          $(JAVAC)          $(JAVAC)
136          touch compile-classes          touch compile-classes
137    endif
138    
139  EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh  EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh
140  CLEANFILES = compile-classes resources classes \  CLEANFILES = compile-classes resources classes \
         classes.standard classes.awt classes.standardx classes.xml \  
141          glibj.zip classes.1 \          glibj.zip classes.1 \
142          $(top_builddir)/java/util/LocaleData.java \          $(top_builddir)/java/util/LocaleData.java \
143          $(JAVA_DEPEND)          $(JAVA_DEPEND)

Legend:
Removed from v.1.63.2.11  
changed lines
  Added in v.1.63.2.12

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26