diff options
| author | Bryce McKinlay <bryce@waitaki.otago.ac.nz> | 2002-03-17 00:35:21 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2002-03-17 00:35:21 +0000 |
| commit | ce3b24a73a8411d262bab9c8ea81a3e1fc6fe110 (patch) | |
| tree | 4a1b8a8dce551af5a22e374180cfc27a991b3dfc /zlib/Makefile.am | |
| parent | cfb773f9109b45c452c5a33602b3c2b141737caa (diff) | |
Makefile.am: Make target library a convenience library.
zlib:
* Makefile.am: Make target library a convenience library.
* Makefile.in: Rebuilt.
libffi:
* Makefile.am: libfficonvenience -> libffi_convenience.
* Makefile.in: Rebuilt.
boehm-gc:
* Makefile.am: Make a convenience library.
* Makefile.in: Rebuilt.
libjava:
Build a single libgcj.so, without separate gc and zlib libraries.
* configure.in: Use convenience libraries for boehm-gc and zlib. Set
SYS_ZLIBS if system zlib is used.
* configure: Rebuilt.
* Makefile.am: Use boehm-gc and zlib convenience libraries.
* Makefile.in: Rebuilt.
* libtool-version: Increment .so version number.
From-SVN: r50900
Diffstat (limited to 'zlib/Makefile.am')
| -rw-r--r-- | zlib/Makefile.am | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/zlib/Makefile.am b/zlib/Makefile.am index 80de4ef763f..ee8288f9678 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -25,12 +25,8 @@ inffixed.h inflate.c inftrees.c inftrees.h infutil.c infutil.h trees.c \ trees.h uncompr.c zconf.h zlib.h zutil.c zutil.h if TARGET_LIBRARY -## We don't use `libz.la' because we don't want to conflict with a -## system library of that name. -toolexeclib_LTLIBRARIES = @target_all@ -EXTRA_LTLIBRARIES = libzgcj.la -libzgcj_la_SOURCES = $(ZLIB_SOURCES) -libzgcj_la_LDFLAGS = -version-info 0:0:0 -rpath $(toolexeclibdir) +noinst_LTLIBRARIES = libzgcj_convenience.la +libzgcj_convenience_la_SOURCES = $(ZLIB_SOURCES) else toolexeclib_LIBRARIES = libz.a libz_a_SOURCES = $(ZLIB_SOURCES) |