From 4673dd2cc142a761e9a5d0df21e1001f52498ec5 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 31 Jan 2001 17:12:25 +0000 Subject: [PATCH] Makefile.in: Rebuilt. * Makefile.in: Rebuilt. * Makefile.am (LTCXXCOMPILE): New macro. From-SVN: r39379 --- libjava/ChangeLog | 5 +++++ libjava/Makefile.am | 6 ++++++ libjava/Makefile.in | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c54007d8f38..1a5f145b6b2 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2001-01-31 Tom Tromey + + * Makefile.in: Rebuilt. + * Makefile.am (LTCXXCOMPILE): New macro. + 2001-01-26 Andrew Haley (INIT_FPE): Use a direct system call to set the handler. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index fc5e5ef2259..d57f06cefbb 100644 --- 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 f5117b13684..b7de31ca92e 100644 --- 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@ -- 2.30.2