/[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.12 by gnu_andrew, Tue Aug 16 16:22:38 2005 UTC revision 1.63.2.13 by gnu_andrew, Sat Sep 10 15:31:58 2005 UTC
# Line 7  sinclude $(JAVA_DEPEND) Line 7  sinclude $(JAVA_DEPEND)
7    
8  propertydirs :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org META-INF -type d ! -name CVS -print)  propertydirs :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org META-INF -type d ! -name CVS -print)
9  propertyfiles :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org -name \*\.properties -print)  propertyfiles :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org -name \*\.properties -print)
10  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)
11  iconfiles :=  $(shell cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print)  iconfiles :=  $(shell cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print)
12    
13  compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:.:$(USER_CLASSLIB)  compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:.:$(USER_CLASSLIB)
# Line 32  if FOUND_GCJX Line 32  if FOUND_GCJX
32  JAVAC = $(GCJX) -encoding UTF-8 -classpath .:$(USER_CLASSLIB) -d . @classes  JAVAC = $(GCJX) -encoding UTF-8 -classpath .:$(USER_CLASSLIB) -d . @classes
33  else  else
34  if FOUND_ECJ  if FOUND_ECJ
35  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
36  endif # FOUND_ECJ  endif # FOUND_ECJ
37  endif # FOUND_GCJX  endif # FOUND_GCJX
38  endif # FOUND_KJC  endif # FOUND_KJC
# Line 129  if FOUND_GCJ Line 129  if FOUND_GCJ
129  ## builds.  ## builds.
130  compile-classes: classes $(JAVA_SRCS) Makefile  compile-classes: classes $(JAVA_SRCS) Makefile
131          $(MAKE) -f $(srcdir)/Makefile.gcj \          $(MAKE) -f $(srcdir)/Makefile.gcj \
132            GCJ='$(GCJ)' compile_classpath='$(top_builddir):$(compile_classpath)'            GCJ='$(GCJ)' \
133              compile_classpath='$(top_builddir):$(compile_classpath)' \
134              top_srcdir=$(top_srcdir)
135  else  else
136  compile-classes: classes $(JAVA_SRCS) Makefile  compile-classes: classes $(JAVA_SRCS) Makefile
137          $(JAVAC)          $(JAVAC)

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

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