/[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.17 by mark, Wed Nov 2 20:30:10 2005 UTC revision 1.63.2.18 by gnu_andrew, Wed Nov 2 22:05:20 2005 UTC
# Line 15  compile_classpath = $(vm_classes):$(top_ Line 15  compile_classpath = $(vm_classes):$(top_
15  # handling source to bytecode compiler programs like gcj, jikes  and kjc  # handling source to bytecode compiler programs like gcj, jikes  and kjc
16  if FOUND_ECJ  if FOUND_ECJ
17  JAVAC = $(ECJ) -1.5 -warn:-deprecation,serial,typeHiding,unchecked,unused,varargsCast -proceedOnError -bootclasspath '' -classpath $(compile_classpath) -d . @classes  JAVAC = $(ECJ) -1.5 -warn:-deprecation,serial,typeHiding,unchecked,unused,varargsCast -proceedOnError -bootclasspath '' -classpath $(compile_classpath) -d . @classes
18  else  #else
19  if FOUND_GCJ  #if FOUND_GCJ
20  ## This should never be used when gcj is the compiler.  ## This should never be used when gcj is the compiler.
21  ## See the compile-classes target.  ## See the compile-classes target.
22  JAVAC = exit 1  #JAVAC = exit 1
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
26  else  #else
27  if FOUND_KJC  #if FOUND_KJC
28  ## FIXME: from what I can tell, kjc does not support a -encoding option.  ### FIXME: from what I can tell, kjc does not support a -encoding option.
29  JAVAC = $(KJC) -classpath .:$(USER_CLASSLIB) -d . @classes  #JAVAC = $(KJC) -classpath .:$(USER_CLASSLIB) -d . @classes
30  else  else
31  if FOUND_GCJX  if FOUND_GCJX
32  JAVAC = $(GCJX) -encoding UTF-8 -classpath .:$(USER_CLASSLIB) -d . @classes  JAVAC = $(GCJX) -encoding UTF-8 -classpath .:$(USER_CLASSLIB) -d . @classes
 else  
 if FOUND_ECJ  
 JAVAC = $(ECJ) -source 1.4 -encoding UTF-8 -warn:none -proceedOnError -bootclasspath '' -classpath $(compile_classpath) -d . @classes  
 endif # FOUND_ECJ  
33  endif # FOUND_GCJX  endif # FOUND_GCJX
34  endif # FOUND_KJC  #endif # FOUND_KJC
35  endif # FOUND_GCJ  #endif # FOUND_GCJ
36  endif # FOUND_JIKES  #endif # FOUND_JIKES
37  endif # FOUND_ECJ  endif # FOUND_ECJ
38    
39  JAVAH = $(USER_JAVAH) -jni -classpath .:$(USER_CLASSLIB)  JAVAH = $(USER_JAVAH) -jni -classpath .:$(USER_CLASSLIB)
# Line 123  endif # REGEN_PARSER Line 119  endif # REGEN_PARSER
119    
120  $(JAVA_DEPEND): genclasses  $(JAVA_DEPEND): genclasses
121    
122  if FOUND_GCJ  #if FOUND_GCJ
123  ## When building with gcj, we do a recursive make.  We split this rule  ## When building with gcj, we do a recursive make.  We split this rule
124  ## out specially, rather than simply defining JAVAC, so that GNU make  ## out specially, rather than simply defining JAVAC, so that GNU make
125  ## will see the recursive make invocation and still allow parallel  ## will see the recursive make invocation and still allow parallel
126  ## builds.  ## builds.
127  compile-classes: classes $(JAVA_SRCS) Makefile  #compile-classes: classes $(JAVA_SRCS) Makefile
128          $(MAKE) -f $(srcdir)/Makefile.gcj \  #       $(MAKE) -f $(srcdir)/Makefile.gcj \
129            GCJ='$(GCJ)' \  #         GCJ='$(GCJ)' \
130            compile_classpath='$(top_builddir):$(compile_classpath)' \  #         compile_classpath='$(top_builddir):$(compile_classpath)' \
131            top_srcdir=$(top_srcdir)  #         top_srcdir=$(top_srcdir)
132  else  #else
133  compile-classes: classes $(JAVA_SRCS) Makefile  compile-classes: classes $(JAVA_SRCS) Makefile
134          $(JAVAC)          $(JAVAC)
135          touch compile-classes          touch compile-classes
136  endif  #endif
137    
138  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
139  CLEANFILES = compile-classes resources classes \  CLEANFILES = compile-classes resources classes \

Legend:
Removed from v.1.63.2.17  
changed lines
  Added in v.1.63.2.18

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