libjava/ChangeLog:

[pf3gnuchains/gcc-fork.git] / libjava / classpath / lib / Makefile.am

diff --git a/libjava/classpath/lib/Makefile.am b/libjava/classpath/lib/Makefile.am
index 74ddaf8..5491a99 100644 (file)
--- a/libjava/classpath/lib/Makefile.am
+++ b/libjava/classpath/lib/Makefile.am
@@ -8,20 +8,26 @@ sinclude $(JAVA_DEPEND)
 compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:$(top_srcdir)/external/jsr166:.:$(PATH_TO_GLIBJ_ZIP):$(PATH_TO_ESCHER)
 
 # handling source to bytecode compiler programs like gcj, jikes  and kjc
-## GCJ LOCAL: use srcdir, don't pass $(JAVACFLAGS) $(JAVAC_MEM_OPT) -source 1.5 -target 1.5
-JCOMPILER = $(JAVAC) -g -w --encoding=UTF-8 -bootclasspath '' --classpath $(compile_classpath) -d $(srcdir) @classes
+if GCJ_JAVAC
+## GCJ LOCAL: use srcdir
+JCOMPILER = $(JAVAC) $(JAVACFLAGS) -fsource=1.5 -ftarget=1.5 --bootclasspath='' --classpath=$(compile_classpath) -d $(srcdir) @classes
+else
+JCOMPILER = $(JAVAC) $(JAVACFLAGS) $(JAVAC_MEM_OPT) -source 1.5 -target 1.5 -bootclasspath '' -classpath $(compile_classpath) -d . @classes
+endif
 
 if CREATE_COLLECTIONS
 COLLECTIONS = collections.jar
 
+if WITH_JAR
+CREATE_COLLECTIONS_JAR=$(JAR) cf $@ $(COLLECTIONS_PREFIX)
+else
+CREATE_COLLECTIONS_JAR=$(ZIP) -r -D $@ $(COLLECTIONS_PREFIX) > /dev/null
+endif
+
 collections.jar: mkcollections.pl
        ./mkcollections.pl $(top_srcdir)
        $(JCOMPILER) `$(FIND) $(COLLECTIONS_PREFIX) -name '*.java' -type f -print`
-       if test "$(FASTJAR)" != ""; then \
-         "$(FASTJAR)" cf $@ $(COLLECTIONS_PREFIX); \
-       else \
-         echo "fastjar not found" > collections.jar; \
-       fi
+       $(CREATE_COLLECTIONS_JAR)
 endif # CREATE_COLLECTIONS
 
 if INSTALL_GLIBJ_ZIP
@@ -67,27 +73,31 @@ glibj.zip:
 
 else
 
-glibj.zip: classes compile-classes resources
-       if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org sun META-INF > /dev/null; fi
-       if test "$(FASTJAR)" != ""; then "$(FASTJAR)" cf glibj.zip gnu java javax org sun META-INF; fi
+if WITH_JAR
+CREATE_GLIBJ_ZIP=$(JAR) cf glibj.zip gnu java javax org sun META-INF
+else
+CREATE_GLIBJ_ZIP=$(ZIP) -r -D glibj.zip gnu java javax org sun META-INF > /dev/null
+endif
 
+glibj.zip: classes compile-classes resources
+       $(CREATE_GLIBJ_ZIP)
 endif # USE_PREBUILT_GLIBJ_ZIP
 
 resources: copy-vmresources.sh
        @list=`cd $(top_srcdir)/resource && $(FIND) gnu java javax org -name \*\.properties -print -o -name \*\.css -print`; for p in $$list; do \
           dirname=`dirname $$p`; \
-          if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \
+          if ! test -d "$$dirname"; then @mkdir_p@ "$$dirname"; fi; \
          cp $(top_srcdir)/resource/$$p $$p; \
        done
        @list=`cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -name .svn -prune -o -name \*\.in -prune -o -type f -print`; for p in $$list; do \
           dirname=`dirname $$p`; \
-          if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \
+          if ! test -d "$$dirname"; then @mkdir_p@ "$$dirname"; fi; \
          cp $(top_srcdir)/resource/$$p $$p; \
        done
        @$(SHELL) ./copy-vmresources.sh
        @list=`cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print`; for p in $$list; do \
           dirname=`dirname $$p`; \
-          if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \
+          if ! test -d "$$dirname"; then @mkdir_p@ "$$dirname"; fi; \
          cp $(top_srcdir)/$$p $$p; \
        done
        touch resources
@@ -95,7 +105,7 @@ resources: copy-vmresources.sh
 classes: genclasses
 
 $(top_builddir)/gnu/java/locale/LocaleData.java: $(top_srcdir)/scripts/generate-locale-list.sh 
-       mkdir -p $(top_builddir)/gnu/java/locale
+       @mkdir_p@ $(top_builddir)/gnu/java/locale
        $(top_srcdir)/scripts/generate-locale-list.sh > $(top_builddir)/gnu/java/locale/LocaleData.java
 
 genclasses: gen-classlist.sh standard.omit $(top_builddir)/gnu/java/locale/LocaleData.java gen-xpath-parser
@@ -155,7 +165,7 @@ clean-local:
        -rm -rf lists
 
 dist-hook:
-       mkdir -p $(distdir)
+       @mkdir_p@ $(distdir)
        cp -pdfR $(top_srcdir)/gnu $(top_srcdir)/java $(top_srcdir)/javax $(top_srcdir)/org $(top_srcdir)/sun $(top_srcdir)/vm $(top_srcdir)/resource $(distdir)/..
 # Delete not wanted files.
        $(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../sun $(distdir)/../vm $(distdir)/../resource -name CVS -print | xargs rm -fr