* Makefile.in: Rebuilt.

	* Makefile.am (LTCXXCOMPILE): New macro.

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c54007d..1a5f145 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-31  Tom Tromey  <tromey@redhat.com>
+
+       * Makefile.in: Rebuilt.
+       * Makefile.am (LTCXXCOMPILE): New macro.
+
 2001-01-26  Andrew Haley  <aph@redhat.com>
 
        (INIT_FPE): Use a direct system call to set the handler.

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index fc5e5ef..d57f06c 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -79,6 +79,12 @@ GCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ_WITH_FLAGS) -fassume-comp
 GCJLINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
 LIBLINK = $(LIBTOOL) --mode=link $(CC) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
 
+## We define this because otherwise libtool can be run with different
+## values of `CXX' and will then get confused and fail to work.  So,
+## we use --tag explicitly.  Someday automake will be changed to do
+## this automatically.
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+
 JAVAC = $(GCJ_WITH_FLAGS) -C
 
 EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index f5117b1..b7de31c 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -164,6 +164,8 @@ GCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ_WITH_FLAGS) -fassume-comp
 GCJLINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
 LIBLINK = $(LIBTOOL) --mode=link $(CC) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
 
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+
 JAVAC = $(GCJ_WITH_FLAGS) -C
 
 EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@
@@ -1197,7 +1199,6 @@ SCRIPTS =  $(bin_SCRIPTS)
 
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
 CFLAGS = @CFLAGS@