2004-08-17 Michael Koch <konqueror@gmx.de>

	* Makefile.am (AM_CXXFLAGS): Reformatted to make it more ease to read.
	* Makefile.in: Regenerated.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@86130 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 70105bb..a5de0d4 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-17  Michael Koch  <konqueror@gmx.de>
+
+       * Makefile.am (AM_CXXFLAGS): Reformatted to make it more ease to read.
+       * Makefile.in: Regenerated.
+
 2004-08-16  Tom Tromey  <tromey@redhat.com>
 
        PR java/8473:

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index c452275..4863265 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -93,17 +93,25 @@ JAVAC = $(GCJ_WITH_FLAGS) -C
 GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@
 
 WARNINGS = -Wextra -Wall
-## We need _GNU_SOURCE defined for some Linux builds.  It doesn't hurt
-## to always define it.
-AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions $(THREADCXXFLAGS) \
-## Some systems don't allow `$' in identifiers by default, so we force it.
+## Some systems don't allow `$' in identifiers by default, so we force
+## it with -fdollars-in-identifiers.  -Wswitch-enum detects bugs in
+## the verifier implementation, and maybe other places.  We need
+## _GNU_SOURCE defined for some Linux builds.  It doesn't hurt to
+## always define it.  Some systems, including Linux, need
+## -D_FILE_OFFSET_BITS=64 to enable > 2GB file support.
+AM_CXXFLAGS = \
+       -fno-rtti \
+       -fnon-call-exceptions \
+       $(THREADCXXFLAGS) \
        -fdollars-in-identifiers \
-## Detect bugs in the verifier implementation, and maybe other places.
        -Wswitch-enum \
-## Some systems, including Linux, need this to enable > 2GB file support.
        -D_FILE_OFFSET_BITS=64 \
-       @LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \
-       -DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\"" \
+       @LIBGCJ_CXXFLAGS@ \
+       @X_CFLAGS@ \
+       $(WARNINGS) \
+       -D_GNU_SOURCE \
+       -DPREFIX="\"$(prefix)\"" \
+       -DLIBDIR="\"$(libdir)\"" \
        -DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\"" \
        -DJAVA_EXT_DIRS="\"$(jardir)/ext\""
 if USING_GCC

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index bb0c3c3..4ca2c39 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -218,12 +218,19 @@ JAVAC = $(GCJ_WITH_FLAGS) -C
 GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@
 
 WARNINGS = -Wextra -Wall
-AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions $(THREADCXXFLAGS) \
+AM_CXXFLAGS = \
+       -fno-rtti \
+       -fnon-call-exceptions \
+       $(THREADCXXFLAGS) \
        -fdollars-in-identifiers \
        -Wswitch-enum \
        -D_FILE_OFFSET_BITS=64 \
-       @LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \
-       -DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\"" \
+       @LIBGCJ_CXXFLAGS@ \
+       @X_CFLAGS@ \
+       $(WARNINGS) \
+       -D_GNU_SOURCE \
+       -DPREFIX="\"$(prefix)\"" \
+       -DLIBDIR="\"$(libdir)\"" \
        -DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\"" \
        -DJAVA_EXT_DIRS="\"$(jardir)/ext\""