2004-09-16 Frank Ch. Eigler <fche@redhat.com>

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

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 3ce3241..c2b3f6a 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -171,16 +171,16 @@ AM_GCJFLAGS = \
        -Wno-deprecated
 
 if USING_GCC
-AM_CFLAGS = @LIBGCJ_HOST_CFLAGS@ $(WARNINGS)
+AM_CFLAGS = @LIBGCJ_CFLAGS@ $(WARNINGS)
 else
-AM_CFLAGS = @LIBGCJ_HOST_CFLAGS@
+AM_CFLAGS = @LIBGCJ_CFLAGS@
 endif
 
 ## Extra CFLAGS used for JNI C sources shared with GNU Classpath.
 PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long
 
 JCFLAGS = -g
-JC1FLAGS = @LIBGCJ_HOST_JAVAFLAGS@ $(GCJFLAGS)
+JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS)
 
 LIBFFIINCS = @LIBFFIINCS@
 
@@ -457,7 +457,7 @@ propertyo_files = $(property_files:.properties=.properties.lo)
 %.properties.lo: %.properties
        $(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,`echo $@ | sed "s/\.lo$$//"`
 
-if BUILD_CLASS_FILES_AT_ONCE
+if ONESTEP
 
 # Compile all classfiles in one go.
 
@@ -478,7 +478,7 @@ libgcj-@gcc_version@.jar: $(all_java_source_files)
 # is built.
 $(all_java_class_files): libgcj-@gcc_version@.jar
 
-else # ! BUILD_CLASS_FILES_AT_ONCE
+else # !ONESTEP
 
 # Compile each classfile individually.
 
@@ -492,7 +492,7 @@ libgcj-@gcc_version@.jar: $(all_java_class_files)
          sed -e '/\/\./d' -e '/\/xlib/d' | \
          $(ZIP) cfM0E@ $@
 
-endif # !BUILD_CLASS_FILES_AT_ONCE
+endif
 
 # Note: The libtool objects are removed by mostlyclean-local
 # because of command-line-length issues.
@@ -503,7 +503,6 @@ CLEANFILES = libgcj-@gcc_version@.jar
 mostlyclean-local:
 ## Use libtool rm to remove each libtool object
        find . -name '*.lo' -print | xargs $(LIBTOOL) rm -f
-## FIXME: Wouldn't it be better to add the files to delete to some CLEAN variable ?
 
 clean-local:
 ## Remove every .class file that was created.
@@ -512,7 +511,6 @@ clean-local:
 distclean-local:
 ## Remove every .d file that was created.
        find . -name '*.d' -print | xargs rm -f
-## FIXME: Is this really still needed ?
 
 # Just remove the objects from C++ sources, for testing the C++ compiler.
 clean-nat:
@@ -527,7 +525,6 @@ $(filter-out gnu/gcj/runtime/StackTrace.lo, $(javao_files)) $(xlib_javao_files)
 
 $(gtk_awt_peer_sources:.java=.lo): %.lo: %.java
        $(LTGCJCOMPILE) -fjni -o $@ -c $<
-## FIXME: Is this really still needed ?
 
 ## A special case.  The sibcall optimization can change the number of
 ## frames on the stack, and StackTrace makes assumptions about this
@@ -703,7 +700,6 @@ install-data-local:
        -@rm -f tmp-ilist
 ## FIXME: the obvious approach using lib_DATA doesn't work with
 ## automake 1.4.
-## FIXME: Use lib_DATA
        $(mkinstalldirs) $(DESTDIR)$(secdir)
        @for f in classpath.security libgcj.security; do \
          echo " $(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f"; \
@@ -797,8 +793,6 @@ $(srcdir)/gnu/gcj/convert/JIS0212_to_Unicode.cc: ./gen-from-JIS$(EXEEXT)
 $(srcdir)/gnu/gcj/convert/Unicode_to_JIS.cc: ./gen-from-JIS$(EXEEXT)
         ./gen-from-JIS toJIS >$(srcdir)/gnu/gcj/convert/Unicode_to_JIS.cc
 
-## FIXME: Do we really want these rules for external files ?
-
 # The Unicode consortium does not permit re-distributing the file JIS0201.TXT.
 # You can get it from
 # ftp://ftp.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/
@@ -2055,6 +2049,7 @@ javax/transaction/TransactionRequiredException.java \
 javax/transaction/TransactionRolledbackException.java \
 javax/transaction/UserTransaction.java
 
+
 ## Java files which are created by configure and thus are in the build
 ## directory.
 built_java_source_files = java/lang/ConcreteProcess.java \
@@ -2217,7 +2212,6 @@ java/io/StringWriter.java \
 java/io/SyncFailedException.java \
 java/io/UTFDataFormatException.java \
 java/io/UnsupportedEncodingException.java \
-java/io/VMFile.java \
 java/io/VMObjectStreamClass.java \
 java/io/WriteAbortedException.java \
 java/io/Writer.java \
@@ -2965,6 +2959,7 @@ $(awt_java_source_files) \
 $(convert_source_files) \
 $(javax_source_files)
 
+
 java_source_files = $(special_java_source_files) $(ordinary_java_source_files)
 
 ## Math library: C, not C++
@@ -2983,6 +2978,7 @@ math_c_source_files = \
   java/lang/e_sqrt.c      java/lang/s_scalbn.c    java/lang/sf_rint.c     \
   java/lang/k_cos.c       java/lang/s_sin.c       java/lang/sf_fabs.c
 
+
 ## This lists all the C++ source files in subdirectories.
 nat_source_files = \
 gnu/gcj/natCore.cc \
@@ -3110,8 +3106,6 @@ gnu/gcj/xlib/natXUnmapEvent.cc
 
 TexinfoDoclet.class: $(srcdir)/scripts/TexinfoDoclet.java
        javac -d . $(srcdir)/scripts/TexinfoDoclet.java
-## FIXME: AAARGH, we depend on SUN javac here ?
-
 
 texinfo: TexinfoDoclet.class
        langsource=`ls $(srcdir)/java/lang/*.java`; \
@@ -3141,7 +3135,6 @@ texinfo: TexinfoDoclet.class
        javadoc -outfile $(srcdir)/doc/java-util.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/util/*.java
        javadoc -outfile $(srcdir)/doc/java-util-jar.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/util/jar/*.java
        javadoc -outfile $(srcdir)/doc/java-util-zip.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/util/zip/*.java
-## FIXME: Do we really wanna use javadoc ?
 
 ## ################################################################