/[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.8 by gnu_andrew, Fri May 20 18:20:58 2005 UTC revision 1.63.2.9 by gnu_andrew, Fri May 27 00:01:45 2005 UTC
# Line 15  if FOUND_ECJ Line 15  if FOUND_ECJ
15  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
16  else  else
17  if FOUND_GCJ  if FOUND_GCJ
18  JAVAC = $(GCJ) --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.standard \  ## Like GCJ but include some common flags.
19  && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.awt \  GCJF = $(GCJ) -Wno-deprecated --encoding=UTF-8 \
20  && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.xml \      --bootclasspath '' --classpath $(compile_classpath)
21  && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.standardx  JAVAC = $(GCJF) -C -d . @classes.standard \
22    && $(GCJF) -C -d . @classes.awt \
23    && $(GCJF) -C -d . @classes.xml \
24    && $(GCJF) -C -d . @classes.standardx
25  else  else
26  if FOUND_JIKES  if FOUND_JIKES
27  JAVAC = $(JIKES) +Pno-shadow +F -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(compile_classpath) -d . @classes  JAVAC = $(JIKES) +Pno-shadow +Pno-switchcheck +F -encoding UTF-8 -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(compile_classpath) -d . @classes
28  else  else
29  if FOUND_KJC  if FOUND_KJC
30    ## FIXME: from what I can tell, kjc does not support a -encoding option.
31  JAVAC = $(KJC) -classpath .:$(USER_CLASSLIB) -d . @classes  JAVAC = $(KJC) -classpath .:$(USER_CLASSLIB) -d . @classes
32  else  else
33  if FOUND_GCJX  if FOUND_GCJX
34  JAVAC = $(GCJX) -classpath .:$(USER_CLASSLIB) -d . @classes  JAVAC = $(GCJX) -encoding UTF-8 -classpath .:$(USER_CLASSLIB) -d . @classes
35  else  else
36  if FOUND_ECJ  if FOUND_ECJ
37  JAVAC = $(ECJ) -warn:-deprecation,serial -proceedOnError -bootclasspath '' -classpath $(compile_classpath) -d . @classes  JAVAC = $(ECJ) -encoding UTF-8 -warn:-deprecation,serial -proceedOnError -bootclasspath '' -classpath $(compile_classpath) -d . @classes
38  endif # FOUND_ECJ  endif # FOUND_ECJ
39  endif # FOUND_GCJX  endif # FOUND_GCJX
40  endif # FOUND_KJC  endif # FOUND_KJC
# Line 56  install-data-local: genclasses compile-c Line 60  install-data-local: genclasses compile-c
60          cp -R java $(DESTDIR)$(pkgdatadir)          cp -R java $(DESTDIR)$(pkgdatadir)
61          cp -R javax $(DESTDIR)$(pkgdatadir)          cp -R javax $(DESTDIR)$(pkgdatadir)
62          cp -R org $(DESTDIR)$(pkgdatadir)          cp -R org $(DESTDIR)$(pkgdatadir)
63            cp -R META-INF $(DESTDIR)$(pkgdatadir)
64    
65  # FIXME - should mimic doc/api/Makefile.am instead...  # FIXME - should mimic doc/api/Makefile.am instead...
66  uninstall-local:  uninstall-local:
# Line 63  uninstall-local: Line 68  uninstall-local:
68          rm -rf $(DESTDIR)$(pkgdatadir)/java          rm -rf $(DESTDIR)$(pkgdatadir)/java
69          rm -rf $(DESTDIR)$(pkgdatadir)/javax          rm -rf $(DESTDIR)$(pkgdatadir)/javax
70          rm -rf $(DESTDIR)$(pkgdatadir)/org          rm -rf $(DESTDIR)$(pkgdatadir)/org
71            rm -rf $(DESTDIR)$(pkgdatadir)/META-INF
72    
73  endif # INSTALL_CLASS_FILES  endif # INSTALL_CLASS_FILES
74    
75  .PHONY: genclasses  .PHONY: genclasses
76    
77  glibj.zip: classes compile-classes resources  glibj.zip: classes compile-classes resources
78          if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org > /dev/null; fi          if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org META-INF > /dev/null; fi
79    
80  resources:  resources:
81          if ! [ -e gnu ]; then mkdir gnu; fi          if ! [ -e gnu ]; then mkdir gnu; fi
# Line 81  resources: Line 87  resources:
87          @list='$(propertyfiles)'; for p in $$list; do \          @list='$(propertyfiles)'; for p in $$list; do \
88            cp $(top_srcdir)/resource/$$p $$p; \            cp $(top_srcdir)/resource/$$p $$p; \
89          done          done
90            if [ -e META-INF ]; then rm -rf META-INF; fi
91            cp -r $(top_srcdir)/resource/META-INF .
92          touch resources          touch resources
93    
94  classes: genclasses  classes: genclasses
# Line 125  clean-local: Line 133  clean-local:
133          -rm -rf java          -rm -rf java
134          -rm -rf javax          -rm -rf javax
135          -rm -rf org          -rm -rf org
136            -rm -rf META-INF
137    
138  dist-hook:  dist-hook:
139          mkdir -p $(distdir)          mkdir -p $(distdir)

Legend:
Removed from v.1.63.2.8  
changed lines
  Added in v.1.63.2.9

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