summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/cvs/zlib
diff options
context:
space:
mode:
authorThorsten Lockert <tholo@cvs.openbsd.org>1997-02-21 06:39:24 +0000
committerThorsten Lockert <tholo@cvs.openbsd.org>1997-02-21 06:39:24 +0000
commit218ba0ab2169d4d414775d876d690982039c7223 (patch)
treeeeac937135b8c2293148d51dac7d6060cd5eaa66 /gnu/usr.bin/cvs/zlib
parentf812272e2063b0b666438f2bffb0b5fa49f19144 (diff)
New release from Cyclic Software
Diffstat (limited to 'gnu/usr.bin/cvs/zlib')
-rw-r--r--gnu/usr.bin/cvs/zlib/ChangeLog8
-rw-r--r--gnu/usr.bin/cvs/zlib/Makefile.in12
2 files changed, 14 insertions, 6 deletions
diff --git a/gnu/usr.bin/cvs/zlib/ChangeLog b/gnu/usr.bin/cvs/zlib/ChangeLog
index 0db0b1a8f09..7ffad45dceb 100644
--- a/gnu/usr.bin/cvs/zlib/ChangeLog
+++ b/gnu/usr.bin/cvs/zlib/ChangeLog
@@ -1,3 +1,11 @@
+1997-01-01 Fred Fish <fnf@ninemoons.com>
+
+ * Makefile.in (CC): Use @CC@ rather than hard coded "cc".
+ (CFLAGS): Use @CFLAGS@ rather than hard coded "-O".
+ (LDFLAGS): Use @LDFLAGS@ rather than hard coded "-L. -lz".
+ (prefix): Use @prefix@ rather than hard coded "/usr/local".
+ (example, minigzip): Use $(LIBS) when linking.
+
Wed Sep 11 00:59:44 1996 Jim Kingdon <kingdon@harvey.cyclic.com>
* build_zlib.com: Add infblock.c and infcodes.c.
diff --git a/gnu/usr.bin/cvs/zlib/Makefile.in b/gnu/usr.bin/cvs/zlib/Makefile.in
index 7b585adad35..0296a9c4fec 100644
--- a/gnu/usr.bin/cvs/zlib/Makefile.in
+++ b/gnu/usr.bin/cvs/zlib/Makefile.in
@@ -15,15 +15,15 @@ VPATH = @srcdir@
# To install in $HOME instead of /usr/local, use:
# make install prefix=$HOME
-CC=cc
+CC=@CC@
-CFLAGS=-O
+CFLAGS=@CFLAGS@
#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
#CFLAGS=-g -DDEBUG
#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
# -Wstrict-prototypes -Wmissing-prototypes
-LDFLAGS=-L. -lz
+LDFLAGS=@LDFLAGS@
LDSHARED=$(CC)
VER=1.0.4
@@ -34,7 +34,7 @@ AR=ar
RANLIB=ranlib
TAR=tar
-prefix=/usr/local
+prefix=@prefix@
exec_prefix = $(prefix)
OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
@@ -64,10 +64,10 @@ libz.so.$(VER): $(OBJS)
rm -f libz.so; ln -s $@ libz.so
example: example.o $(LIBS)
- $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
+ $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) $(LIBS)
minigzip: minigzip.o $(LIBS)
- $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
+ $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) $(LIBS)
# For CVS, remove the install and uninstall targets.
install: