diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-05-11 12:11:09 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-05-11 12:11:09 +0000 |
| commit | b152bc6646ee0d6a4fdcff97684eadf64f0fe28d (patch) | |
| tree | 741b20a51ca89c071c8fa2ab28990e1c8eae5bc6 /libjava/Makefile.am | |
| parent | b5be146b414914aee38ff826e7dc67ecc3cf5834 (diff) | |
| download | ppe42-gcc-b152bc6646ee0d6a4fdcff97684eadf64f0fe28d.tar.gz ppe42-gcc-b152bc6646ee0d6a4fdcff97684eadf64f0fe28d.zip | |
* Makefile.in, configure: Rebuilt.
* Makefile.am (jv_convert_LDFLAGS): Removed -nodefaultlibs.
(jv_convert_LDADD): Added ZLIBS. Removed -lm, -lc, -lgcc.
(jv_convert_DEPENDENCIES): Added ZDEPS.
* configure.in (GCSPEC): Added `-L' to point to boehm-gc build
directory.
(THREADSPEC): Added `-L' to point to qthreads build directory.
(ZLIBS): New subst.
(ZDEPS): New subst.
* configure, Makefile.in: Rebuilt.
* Makefile.am (toolexeclib_DATA): New macro.
* configure.in: Create libgcj.spec. Look for -lsocket and -lnsl.
Recognize --with-system-zlib.
(GCSPEC): New subst.
(THREADSPEC): New subst.
(SYSTEMSPEC): New subst.
(ZLIBSPEC): New subst.
* libgcj.spec.in: New file.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26885 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 260baa15716..e852807a6f0 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -16,6 +16,7 @@ toolexecdir = $(exec_prefix)/$(target_alias) toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR) toolexeclib_LTLIBRARIES = libgcj.la +toolexeclib_DATA = libgcj.spec data_DATA = libgcj.zip ## For now, only on native systems. @@ -260,14 +261,18 @@ EXTRA_jv_convert_SOURCES = $(convert_source_files) ## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'. We ## need this because we are explicitly using libtool to link using the ## `.la' file. -jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert -nodefaultlibs \ +jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \ -rpath $(toolexeclibdir) 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. jv_convert_LDADD = $(convert_source_files:.java=.lo) libgcj.la \ - $(GCLIBS) $(THREADLIBS) -lm -lgcc -lc -lgcc + $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L. jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \ - $(GCDEPS) $(THREADDEPS) libgcj.la + $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la # The Unicode consortium does not permit re-distributing the file JIS0201.TXT. # You can get it from ftp://ftp.unicode.org/Public/MAPPINGS/EASTASIA/JIS/. |
