summaryrefslogtreecommitdiff
path: root/zlib
diff options
context:
space:
mode:
authorkent@kent-amd64.(none) <>2007-04-11 01:48:43 +0200
committerkent@kent-amd64.(none) <>2007-04-11 01:48:43 +0200
commit473b1f31d5f39546ede13f2feffcac06449b0845 (patch)
tree3bea17038bb3f93d0c5c69f0d3030fbb6da61718 /zlib
parentd77ab7a009c44ae10627b2c62188199ed2c2db80 (diff)
parent8bcdaa86cf3655151ab6f1f9007e30c06ba16515 (diff)
downloadmariadb-git-473b1f31d5f39546ede13f2feffcac06449b0845.tar.gz
Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
into mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
Diffstat (limited to 'zlib')
-rw-r--r--zlib/Makefile.am17
1 files changed, 9 insertions, 8 deletions
diff --git a/zlib/Makefile.am b/zlib/Makefile.am
index f5741a782fb..edcbd5f4a75 100644
--- a/zlib/Makefile.am
+++ b/zlib/Makefile.am
@@ -19,17 +19,18 @@ INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include
LIBS= $(NON_THREADED_LIBS)
-pkglib_LTLIBRARIES=libz.la
+pkglib_LTLIBRARIES = libz.la
+noinst_LTLIBRARIES = libzlt.la
-# We are never interested in a shared version
-libz_la_LDFLAGS= -static
+libz_la_LDFLAGS = -static
-noinst_HEADERS= crc32.h deflate.h inffast.h inffixed.h inflate.h \
- inftrees.h trees.h zconf.h zlib.h zutil.h
+noinst_HEADERS = crc32.h deflate.h inffast.h inffixed.h inflate.h \
+ inftrees.h trees.h zconf.h zlib.h zutil.h
-libz_la_SOURCES= adler32.c compress.c crc32.c deflate.c gzio.c \
- infback.c inffast.c inflate.c inftrees.c trees.c \
- uncompr.c zutil.c
+libz_la_SOURCES = adler32.c compress.c crc32.c deflate.c gzio.c \
+ infback.c inffast.c inflate.c inftrees.c trees.c \
+ uncompr.c zutil.c
+libzlt_la_SOURCES = $(libz_la_SOURCES)
EXTRA_DIST= README FAQ INDEX ChangeLog algorithm.txt zlib.3 CMakeLists.txt