/[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.73 by mkoch, Mon Dec 20 13:47:16 2004 UTC revision 1.74 by mark, Thu Dec 23 18:43:56 2004 UTC
# Line 16  FIND = @FIND@ Line 16  FIND = @FIND@
16  propertydirs :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org -type d ! -name CVS -print)  propertydirs :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org -type d ! -name CVS -print)
17  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)
18    
19    compile_classpath = $(top_srcdir):$(top_srcdir)/vm/reference:.:$(USER_CLASSLIB)
20    
21  # handling source to bytecode compiler programs like gcj, jikes  and kjc  # handling source to bytecode compiler programs like gcj, jikes  and kjc
22  if FOUND_GCJ  if FOUND_GCJ
23  JAVAC = $(GCJ) --bootclasspath '' --classpath $(top_srcdir):$(top_srcdir)/vm/reference:.:$(USER_CLASSLIB) -C -d . @classes.standard \  JAVAC = $(GCJ) --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.standard \
24  && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(top_srcdir):$(top_srcdir)/vm/reference:.:$(USER_CLASSLIB) -C -d . @classes.awt \  && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.awt \
25  && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(top_srcdir):$(top_srcdir)/vm/reference:.:$(USER_CLASSLIB) -C -d . @classes.standardx  && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.locale1 \
26    && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.locale2 \
27    && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.standardx
28  else  else
29  if FOUND_JIKES  if FOUND_JIKES
30  JAVAC = $(JIKES) +Pno-shadow +F -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(top_srcdir):$(top_srcdir)/vm/reference:.:$(USER_CLASSLIB) -d . @classes  JAVAC = $(JIKES) +Pno-shadow +F -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(compile_classpath) -d . @classes
31  else  else
32  if FOUND_KJC  if FOUND_KJC
33  JAVAC = $(KJC) -classpath .:$(USER_CLASSLIB) -d . @classes  JAVAC = $(KJC) -classpath .:$(USER_CLASSLIB) -d . @classes
# Line 78  resources: Line 82  resources:
82    
83  classes: genclasses  classes: genclasses
84    
85  genclasses: gen-classlist.sh standard.omit  $(top_builddir)/java/util/LocaleData.java: $(top_srcdir)/scripts/generate-locale-list.sh
86          mkdir -p java/util          mkdir -p $(top_builddir)/java/util
87          $(top_srcdir)/scripts/generate-locale-list.sh > java/util/LocaleData.java          $(top_srcdir)/scripts/generate-locale-list.sh > $(top_builddir)/java/util/LocaleData.java
88    
89    genclasses: gen-classlist.sh standard.omit $(top_builddir)/java/util/LocaleData.java
90          top_builddir=$(top_builddir) $(SHELL) ./gen-classlist.sh standard          top_builddir=$(top_builddir) $(SHELL) ./gen-classlist.sh standard
91    
92  $(JAVA_DEPEND): genclasses  $(JAVA_DEPEND): genclasses
# Line 91  compile-classes: classes $(JAVA_SRCS) Ma Line 97  compile-classes: classes $(JAVA_SRCS) Ma
97    
98  EXTRA_DIST = standard.omit mkcollections.pl.in  EXTRA_DIST = standard.omit mkcollections.pl.in
99  CLEANFILES = compile-classes resources classes \  CLEANFILES = compile-classes resources classes \
100          classes.standard classes.awt classes.standardx glibj.zip classes.1 \          classes.standard classes.awt classes.standardx \
101            classes.locale1 classes.locale2 glibj.zip classes.1 \
102            $(top_builddir)/java/util/LocaleData.java \
103          $(JAVA_DEPEND)          $(JAVA_DEPEND)
104    
105  clean-local:  clean-local:
# Line 108  dist-hook: Line 116  dist-hook:
116          $(FIND) $(top_distdir)/gnu $(top_distdir)/java $(top_distdir)/javax $(top_distdir)/org $(top_distdir)/vm -name .cvsignore -print | xargs rm -f          $(FIND) $(top_distdir)/gnu $(top_distdir)/java $(top_distdir)/javax $(top_distdir)/org $(top_distdir)/vm -name .cvsignore -print | xargs rm -f
117          $(FIND) $(top_distdir)/gnu $(top_distdir)/java $(top_distdir)/javax $(top_distdir)/org $(top_distdir)/vm -name class-dependencies.conf -print | xargs rm -f          $(FIND) $(top_distdir)/gnu $(top_distdir)/java $(top_distdir)/javax $(top_distdir)/org $(top_distdir)/vm -name class-dependencies.conf -print | xargs rm -f
118          rm -f $(top_distdir)/gnu/classpath/Configuration.java          rm -f $(top_distdir)/gnu/classpath/Configuration.java
119            rm -f $(top_distdir)/java/util/LocaleData.java
120  # Omit files listed in standard.omit.  # Omit files listed in standard.omit.
121          ( cd $(top_distdir)/lib ; cat $(top_builddir)/lib/standard.omit | sed -e 's/\$$//' | sed -e 's/\/\.\*//' | xargs rm -fr )          ( cd $(top_distdir)/lib ; cat $(top_builddir)/lib/standard.omit | sed -e 's/\$$//' | sed -e 's/\/\.\*//' | xargs rm -fr )
122    

Legend:
Removed from v.1.73  
changed lines
  Added in v.1.74

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