* Makefile.am (AM_MAKEFLAGS): Don't pass JC1FLAGS, CC and CXX, do

	pass GCJFLAGS.
	(FLAGS_TO_PASS): Define.
	* Makefile.in: Regenerated.

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 66d6f5e..99c7546 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-02  Andreas Schwab  <schwab@suse.de>
+
+       * Makefile.am (AM_MAKEFLAGS): Don't pass JC1FLAGS, CC and CXX, do
+       pass GCJFLAGS.
+       (FLAGS_TO_PASS): Define.
+       * Makefile.in: Regenerated.
+
 2002-11-01  Michael Koch  <konqueror@gmx.de>
 
        * java/nio/ByteOrder.java: New file.

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index e55c964..861b5ab 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -2448,7 +2448,7 @@ AM_MAKEFLAGS = \
        "INSTALL_DATA=$(INSTALL_DATA)" \
        "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
        "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
-       "JC1FLAGS=$(JC1FLAGS)" \
+       "GCJFLAGS=$(GCJFLAGS)" \
        "LDFLAGS=$(LDFLAGS)" \
        "LIBCFLAGS=$(LIBCFLAGS)" \
        "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
@@ -2464,8 +2464,6 @@ AM_MAKEFLAGS = \
        "prefix=$(prefix)" \
        "AR=$(AR)" \
        "AS=$(AS)" \
-       "CC=$(CC)" \
-       "CXX=$(CXX)" \
        "LD=$(LD)" \
        "LIBCFLAGS=$(LIBCFLAGS)" \
        "NM=$(NM)" \
@@ -2473,6 +2471,9 @@ AM_MAKEFLAGS = \
        "RANLIB=$(RANLIB)" \
        "DESTDIR=$(DESTDIR)"
 
+# Subdir rules rely on $(FLAGS_TO_PASS)
+FLAGS_TO_PASS = $(AM_MAKEFLAGS)
+
 CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
 
 MAKEOVERRIDES=

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 02093fa..cd06f28 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -2138,7 +2138,7 @@ AM_MAKEFLAGS = \
        "INSTALL_DATA=$(INSTALL_DATA)" \
        "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
        "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
-       "JC1FLAGS=$(JC1FLAGS)" \
+       "GCJFLAGS=$(GCJFLAGS)" \
        "LDFLAGS=$(LDFLAGS)" \
        "LIBCFLAGS=$(LIBCFLAGS)" \
        "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
@@ -2154,8 +2154,6 @@ AM_MAKEFLAGS = \
        "prefix=$(prefix)" \
        "AR=$(AR)" \
        "AS=$(AS)" \
-       "CC=$(CC)" \
-       "CXX=$(CXX)" \
        "LD=$(LD)" \
        "LIBCFLAGS=$(LIBCFLAGS)" \
        "NM=$(NM)" \
@@ -2164,6 +2162,9 @@ AM_MAKEFLAGS = \
        "DESTDIR=$(DESTDIR)"
 
 
+# Subdir rules rely on $(FLAGS_TO_PASS)
+FLAGS_TO_PASS = $(AM_MAKEFLAGS)
+
 CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
 
 MAKEOVERRIDES =