diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-05-11 12:33:49 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-05-11 12:33:49 +0000 |
| commit | 7344b1eb985b8e2a7b05ccc8e2575da25b473dc2 (patch) | |
| tree | 9548e1c20c3c314e98a5fb7253d4297f76cd0cf1 | |
| parent | b152bc6646ee0d6a4fdcff97684eadf64f0fe28d (diff) | |
| download | ppe42-gcc-7344b1eb985b8e2a7b05ccc8e2575da25b473dc2.tar.gz ppe42-gcc-7344b1eb985b8e2a7b05ccc8e2575da25b473dc2.zip | |
* Makefile.in: Rebuilt.
* Makefile.am (jv_convert_LDADD): Removed `-L.'; it is not needed
and it causes problems with libtool.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26886 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/Makefile.am | 5 | ||||
| -rw-r--r-- | libjava/Makefile.in | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ca5ac59746c..66130339c31 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,9 @@ 1999-05-11 Tom Tromey <tromey@cygnus.com> + * Makefile.in: Rebuilt. + * Makefile.am (jv_convert_LDADD): Removed `-L.'; it is not needed + and it causes problems with libtool. + * Makefile.in, configure: Rebuilt. * Makefile.am (jv_convert_LDFLAGS): Removed -nodefaultlibs. (jv_convert_LDADD): Added ZLIBS. Removed -lm, -lc, -lgcc. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index e852807a6f0..616f375aaaa 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -267,10 +267,9 @@ jv_convert_LINK = $(LIBTOOL) --mode=link $(GCJ) $(JC1FLAGS) $(LDFLAGS) \ -o jv-convert ## We explicitly link in the libraries we need. This way we don't ## need -nodefaultlibs, so we can still rely on gcj picking up the -## system libraries we need (via the specs file). The -L. finds the -## specs file for us. +## system libraries we need (via the specs file). jv_convert_LDADD = $(convert_source_files:.java=.lo) libgcj.la \ - $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L. + $(GCLIBS) $(THREADLIBS) $(ZLIBS) jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \ $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 41c91075b41..09aabc5dcc9 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -199,7 +199,7 @@ jv_convert_LINK = $(LIBTOOL) --mode=link $(GCJ) $(JC1FLAGS) $(LDFLAGS) \ -o jv-convert jv_convert_LDADD = $(convert_source_files:.java=.lo) libgcj.la \ - $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L. + $(GCLIBS) $(THREADLIBS) $(ZLIBS) jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \ $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la |
