From 0498eaeaab1d3894416baf4558697ba51e044cc7 Mon Sep 17 00:00:00 2001 From: Christian Iseli Date: Tue, 31 Jul 2001 23:46:12 +0200 Subject: [PATCH] Makefile.in: Rebuilt. 2001-07-30 Christian Iseli * Makefile.in: Rebuilt. * Makefile.am (GCJLINK): Added --tag=GCJ. (LIBLINK): Likewise. From-SVN: r44520 --- libjava/ChangeLog | 6 ++++++ libjava/Makefile.am | 4 ++-- libjava/Makefile.in | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f7687478373..d808528953e 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2001-07-30 Christian Iseli + + * Makefile.in: Rebuilt. + * Makefile.am (GCJLINK): Added --tag=GCJ. + (LIBLINK): Likewise. + 2001-07-30 Tom Tromey * java/util/Date.java: Re-merged with Classpath. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 98f9c58b200..628203d8ea3 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -67,8 +67,8 @@ endif # CANADIAN GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 GCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ_WITH_FLAGS) -fassume-compiled -fclasspath=$(here) -L$(here) $(JC1FLAGS) -MD -MT $@ -MF $(@:.lo=.d) -c -GCJLINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ -LIBLINK = $(LIBTOOL) --mode=link $(CC) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ +GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ +LIBLINK = $(LIBTOOL) --tag=CC --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, diff --git a/libjava/Makefile.in b/libjava/Makefile.in index a0007af4dd5..d90bb6e6e82 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -159,8 +159,8 @@ bin_SCRIPTS = addr2name.awk GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 GCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ_WITH_FLAGS) -fassume-compiled -fclasspath=$(here) -L$(here) $(JC1FLAGS) -MD -MT $@ -MF $(@:.lo=.d) -c -GCJLINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ -LIBLINK = $(LIBTOOL) --mode=link $(CC) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ +GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ +LIBLINK = $(LIBTOOL) --tag=CC --mode=link $(CC) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -- 2.30.2