diff options
| author | Christian Iseli <chris@ludwig-alpha.unil.ch> | 2001-07-31 23:46:12 +0200 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2001-07-31 21:46:12 +0000 |
| commit | 0498eaeaab1d3894416baf4558697ba51e044cc7 (patch) | |
| tree | 9df3555783469628812b54f843a169590e5b5199 /libjava | |
| parent | 67926e5216a7a137d0f316e9b8b158935d2f55d3 (diff) | |
| download | gcc-0498eaeaab1d3894416baf4558697ba51e044cc7.zip gcc-0498eaeaab1d3894416baf4558697ba51e044cc7.tar.gz gcc-0498eaeaab1d3894416baf4558697ba51e044cc7.tar.bz2 | |
Makefile.in: Rebuilt.
2001-07-30 Christian Iseli <chris@ludwig-alpha.unil.ch>
* Makefile.in: Rebuilt.
* Makefile.am (GCJLINK): Added --tag=GCJ.
(LIBLINK): Likewise.
From-SVN: r44520
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/Makefile.am | 4 | ||||
| -rw-r--r-- | libjava/Makefile.in | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f768747..d808528 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2001-07-30 Christian Iseli <chris@ludwig-alpha.unil.ch> + + * Makefile.in: Rebuilt. + * Makefile.am (GCJLINK): Added --tag=GCJ. + (LIBLINK): Likewise. + 2001-07-30 Tom Tromey <tromey@redhat.com> * java/util/Date.java: Re-merged with Classpath. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 98f9c58..628203d 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 a0007af..d90bb6e 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) |