head	1.25;
access;
symbols
	RELENG_8_4:1.25.0.2
	RELENG_9_1_0_RELEASE:1.22.2.3.2.2
	RELENG_9_1:1.22.2.3.0.2
	RELENG_9_1_BP:1.22.2.3
	RELENG_8_3_0_RELEASE:1.17.22.3.2.1
	RELENG_8_3:1.17.22.3.0.2
	RELENG_8_3_BP:1.17.22.3
	RELENG_9_0_0_RELEASE:1.22.2.1.2.1
	RELENG_9_0:1.22.2.1.0.2
	RELENG_9_0_BP:1.22.2.1
	RELENG_9:1.22.0.2
	RELENG_9_BP:1.22
	RELENG_7_4_0_RELEASE:1.17.26.1
	RELENG_8_2_0_RELEASE:1.17.22.2.4.1
	RELENG_7_4:1.17.0.26
	RELENG_7_4_BP:1.17
	RELENG_8_2:1.17.22.2.0.4
	RELENG_8_2_BP:1.17.22.2
	RELENG_8_1_0_RELEASE:1.17.22.2.2.1
	RELENG_8_1:1.17.22.2.0.2
	RELENG_8_1_BP:1.17.22.2
	RELENG_7_3_0_RELEASE:1.17.24.1
	RELENG_7_3:1.17.0.24
	RELENG_7_3_BP:1.17
	RELENG_8_0_0_RELEASE:1.17.22.1.2.1
	RELENG_8_0:1.17.22.1.0.2
	RELENG_8_0_BP:1.17.22.1
	RELENG_8:1.17.0.22
	RELENG_8_BP:1.17
	RELENG_7_2_0_RELEASE:1.17.20.1
	RELENG_7_2:1.17.0.20
	RELENG_7_2_BP:1.17
	RELENG_7_1_0_RELEASE:1.17.18.1
	RELENG_6_4_0_RELEASE:1.17.16.1
	RELENG_7_1:1.17.0.18
	RELENG_7_1_BP:1.17
	RELENG_6_4:1.17.0.16
	RELENG_6_4_BP:1.17
	RELENG_7_0_0_RELEASE:1.17
	RELENG_6_3_0_RELEASE:1.17
	RELENG_7_0:1.17.0.14
	RELENG_7_0_BP:1.17
	RELENG_6_3:1.17.0.12
	RELENG_6_3_BP:1.17
	RELENG_7:1.17.0.10
	RELENG_7_BP:1.17
	RELENG_6_2_0_RELEASE:1.17
	RELENG_6_2:1.17.0.8
	RELENG_6_2_BP:1.17
	RELENG_5_5_0_RELEASE:1.16.2.1
	RELENG_5_5:1.16.2.1.0.2
	RELENG_5_5_BP:1.16.2.1
	RELENG_6_1_0_RELEASE:1.17
	RELENG_6_1:1.17.0.6
	RELENG_6_1_BP:1.17
	RELENG_6_0_0_RELEASE:1.17
	RELENG_6_0:1.17.0.4
	RELENG_6_0_BP:1.17
	RELENG_6:1.17.0.2
	RELENG_6_BP:1.17
	RELENG_5_4_0_RELEASE:1.16
	RELENG_5_4:1.16.0.6
	RELENG_5_4_BP:1.16
	RELENG_4_11_0_RELEASE:1.11.2.4
	RELENG_4_11:1.11.2.4.0.8
	RELENG_4_11_BP:1.11.2.4
	RELENG_5_3_0_RELEASE:1.16
	RELENG_5_3:1.16.0.4
	RELENG_5_3_BP:1.16
	RELENG_5:1.16.0.2
	RELENG_5_BP:1.16
	RELENG_4_10_0_RELEASE:1.11.2.4
	RELENG_4_10:1.11.2.4.0.6
	RELENG_4_10_BP:1.11.2.4
	RELENG_5_2_1_RELEASE:1.15
	RELENG_5_2_0_RELEASE:1.15
	RELENG_5_2:1.15.0.2
	RELENG_5_2_BP:1.15
	RELENG_4_9_0_RELEASE:1.11.2.4
	RELENG_4_9:1.11.2.4.0.4
	RELENG_4_9_BP:1.11.2.4
	RELENG_5_1_0_RELEASE:1.14
	RELENG_5_1:1.14.0.4
	RELENG_5_1_BP:1.14
	RELENG_4_8_0_RELEASE:1.11.2.4
	RELENG_4_8:1.11.2.4.0.2
	RELENG_4_8_BP:1.11.2.4
	RELENG_5_0_0_RELEASE:1.14
	RELENG_5_0:1.14.0.2
	RELENG_5_0_BP:1.14
	RELENG_4_7_0_RELEASE:1.11.2.3
	RELENG_4_7:1.11.2.3.0.6
	RELENG_4_7_BP:1.11.2.3
	RELENG_4_6_2_RELEASE:1.11.2.3
	RELENG_4_6_1_RELEASE:1.11.2.3
	RELENG_4_6_0_RELEASE:1.11.2.3
	RELENG_4_6:1.11.2.3.0.4
	RELENG_4_6_BP:1.11.2.3
	RELENG_4_5_0_RELEASE:1.11.2.3
	RELENG_4_5:1.11.2.3.0.2
	RELENG_4_5_BP:1.11.2.3
	RELENG_4_4_0_RELEASE:1.11.2.2
	RELENG_4_4:1.11.2.2.0.2
	RELENG_4_4_BP:1.11.2.2
	RELENG_4_3_0_RELEASE:1.11.2.1
	RELENG_4_3:1.11.2.1.0.2
	RELENG_4_3_BP:1.11.2.1
	RELENG_4_2_0_RELEASE:1.11
	RELENG_4_1_1_RELEASE:1.11
	PRE_SMPNG:1.11
	RELENG_4_1_0_RELEASE:1.11
	RELENG_3_5_0_RELEASE:1.9.2.1
	RELENG_4_0_0_RELEASE:1.11
	RELENG_4:1.11.0.2
	RELENG_4_BP:1.11
	RELENG_3_4_0_RELEASE:1.9.2.1
	RELENG_3_3_0_RELEASE:1.9.2.1
	RELENG_3_2_PAO:1.9.0.4
	RELENG_3_2_PAO_BP:1.9
	RELENG_3_2_0_RELEASE:1.9
	RELENG_3_1_0_RELEASE:1.9
	RELENG_3:1.9.0.2
	RELENG_3_BP:1.9
	RELENG_2_2_8_RELEASE:1.3.2.3
	RELENG_3_0_0_RELEASE:1.9
	RELENG_2_2_7_RELEASE:1.3.2.3
	RELENG_2_2_6_RELEASE:1.3.2.2
	v1_1_1:1.1.1.1
	ZLIB:1.1.1
	RELENG_2_2_5_RELEASE:1.3
	RELENG_2_2_2_RELEASE:1.3
	RELENG_2_2_1_RELEASE:1.3
	RELENG_2_2_0_RELEASE:1.3
	RELENG_2_1_7_RELEASE:1.3
	RELENG_2_1_6_1_RELEASE:1.3
	RELENG_2_1_6_RELEASE:1.3
	RELENG_2_1_0:1.3.0.4
	RELENG_2_1_0_BP:1.3
	RELENG_2_2:1.3.0.2
	RELENG_2_2_BP:1.3;
locks; strict;
comment	@# @;


1.25
date	2012.11.17.01.50.05;	author svnexp;	state Exp;
branches
	1.25.2.1;
next	1.24;

1.24
date	2012.06.21.21.47.08;	author delphij;	state Exp;
branches;
next	1.23;

1.23
date	2012.02.28.18.30.18;	author dim;	state Exp;
branches;
next	1.22;

1.22
date	2011.07.18.19.23.50;	author delphij;	state Exp;
branches
	1.22.2.1;
next	1.21;

1.21
date	2011.02.20.19.33.47;	author dim;	state Exp;
branches;
next	1.20;

1.20
date	2011.02.15.22.03.09;	author dim;	state Exp;
branches;
next	1.19;

1.19
date	2010.03.22.21.11.55;	author delphij;	state Exp;
branches;
next	1.18;

1.18
date	2010.01.02.09.58.07;	author ed;	state Exp;
branches;
next	1.17;

1.17
date	2005.06.03.15.25.13;	author imp;	state Exp;
branches
	1.17.2.1
	1.17.10.1
	1.17.16.1
	1.17.18.1
	1.17.20.1
	1.17.22.1
	1.17.24.1
	1.17.26.1;
next	1.16;

1.16
date	2004.06.30.23.58.22;	author tjr;	state Exp;
branches
	1.16.2.1;
next	1.15;

1.15
date	2003.08.17.08.28.45;	author gordon;	state Exp;
branches;
next	1.14;

1.14
date	2001.09.06.09.14.49;	author kris;	state Exp;
branches;
next	1.13;

1.13
date	2001.03.27.17.27.19;	author ru;	state Exp;
branches;
next	1.12;

1.12
date	2000.12.06.01.49.08;	author jedgar;	state Exp;
branches;
next	1.11;

1.11
date	2000.01.14.07.57.47;	author rgrimes;	state Exp;
branches
	1.11.2.1;
next	1.10;

1.10
date	99.08.28.00.06.00;	author peter;	state Exp;
branches;
next	1.9;

1.9
date	98.04.17.08.31.07;	author phk;	state Exp;
branches
	1.9.2.1;
next	1.8;

1.8
date	98.04.17.07.26.51;	author phk;	state Exp;
branches;
next	1.7;

1.7
date	98.02.28.10.41.01;	author ache;	state Exp;
branches;
next	1.6;

1.6
date	98.02.28.06.27.59;	author steve;	state Exp;
branches;
next	1.5;

1.5
date	97.02.22.11.38.21;	author peter;	state Exp;
branches;
next	1.4;

1.4
date	97.01.14.06.11.09;	author jkh;	state Exp;
branches;
next	1.3;

1.3
date	96.08.19.01.21.46;	author peter;	state Exp;
branches
	1.3.2.1
	1.3.4.1;
next	1.2;

1.2
date	96.08.18.23.52.20;	author peter;	state Exp;
branches;
next	1.1;

1.1
date	96.08.18.17.59.48;	author peter;	state Exp;
branches
	1.1.1.1;
next	;

1.25.2.1
date	2012.11.17.01.50.05;	author svnexp;	state dead;
branches;
next	1.25.2.2;

1.25.2.2
date	2013.03.28.13.03.23;	author svnexp;	state Exp;
branches;
next	;

1.22.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.22.2.1.2.1;
next	1.22.2.2;

1.22.2.2
date	2012.03.13.18.39.57;	author dim;	state Exp;
branches;
next	1.22.2.3;

1.22.2.3
date	2012.06.28.07.08.48;	author delphij;	state Exp;
branches
	1.22.2.3.2.1;
next	1.22.2.4;

1.22.2.4
date	2012.11.17.11.36.27;	author svnexp;	state Exp;
branches;
next	;

1.22.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.22.2.1.2.2;

1.22.2.1.2.2
date	2012.11.17.08.36.27;	author svnexp;	state Exp;
branches;
next	;

1.22.2.3.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.22.2.3.2.2;

1.22.2.3.2.2
date	2012.11.17.08.47.16;	author svnexp;	state Exp;
branches;
next	;

1.17.2.1
date	2012.11.17.07.40.44;	author svnexp;	state Exp;
branches;
next	;

1.17.10.1
date	2012.11.17.08.03.06;	author svnexp;	state Exp;
branches;
next	;

1.17.16.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.17.18.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.17.20.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.17.22.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.17.22.1.2.1;
next	1.17.22.2;

1.17.22.2
date	2010.04.20.22.57.05;	author delphij;	state Exp;
branches
	1.17.22.2.2.1
	1.17.22.2.4.1;
next	1.17.22.3;

1.17.22.3
date	2011.07.21.00.37.32;	author delphij;	state Exp;
branches
	1.17.22.3.2.1;
next	1.17.22.4;

1.17.22.4
date	2012.11.17.10.36.11;	author svnexp;	state Exp;
branches;
next	;

1.17.22.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.17.22.2.2.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.17.22.2.4.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.17.22.3.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.17.22.3.2.2;

1.17.22.3.2.2
date	2012.11.17.08.24.52;	author svnexp;	state Exp;
branches;
next	;

1.17.24.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.17.26.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.17.26.2;

1.17.26.2
date	2012.11.17.08.16.51;	author svnexp;	state Exp;
branches;
next	;

1.16.2.1
date	2005.06.08.03.38.28;	author kientzle;	state Exp;
branches;
next	;

1.11.2.1
date	2001.03.05.06.31.44;	author kris;	state Exp;
branches;
next	1.11.2.2;

1.11.2.2
date	2001.04.25.10.04.43;	author ru;	state Exp;
branches;
next	1.11.2.3;

1.11.2.3
date	2001.09.30.22.53.01;	author kris;	state Exp;
branches;
next	1.11.2.4;

1.11.2.4
date	2003.02.01.13.33.12;	author sobomax;	state Exp;
branches;
next	1.11.2.5;

1.11.2.5
date	2012.11.17.07.24.03;	author svnexp;	state Exp;
branches;
next	;

1.9.2.1
date	99.08.29.14.58.15;	author peter;	state Exp;
branches;
next	;

1.3.2.1
date	98.02.28.06.18.48;	author steve;	state Exp;
branches;
next	1.3.2.2;

1.3.2.2
date	98.02.28.06.32.14;	author steve;	state Exp;
branches;
next	1.3.2.3;

1.3.2.3
date	98.07.19.06.51.50;	author jkh;	state Exp;
branches;
next	1.3.2.4;

1.3.2.4
date	99.09.05.11.17.11;	author peter;	state Exp;
branches;
next	;

1.3.4.1
date	99.09.05.11.18.42;	author peter;	state Exp;
branches;
next	;

1.1.1.1
date	98.02.28.06.03.02;	author steve;	state Exp;
branches;
next	;


desc
@@


1.25
log
@Switching exporter and resync
@
text
@#
# $FreeBSD: head/lib/libz/Makefile 232263 2012-02-28 18:30:18Z dim $
#

LIB=		z
SHLIBDIR?=	/lib
SHLIB_MAJOR=	6
MAN=		zlib.3

#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
#CFLAGS=-g -DDEBUG
#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
#           -Wstrict-prototypes -Wmissing-prototypes

CFLAGS+=	-DHAS_snprintf -DHAS_vsnprintf -I${.CURDIR}

WARNS?=		3

CLEANFILES+=	example.o example foo.gz minigzip.o minigzip

SRCS+=		adler32.c
SRCS+=		compress.c
SRCS+=		crc32.c
SRCS+=		deflate.c
SRCS+=		gzclose.c
SRCS+=		gzlib.c
SRCS+=		gzread.c
SRCS+=		gzwrite.c
SRCS+=		infback.c
SRCS+=		inffast.c
SRCS+=		inflate.c
SRCS+=		inftrees.c
SRCS+=		trees.c
SRCS+=		uncompr.c
SRCS+=		zopen.c
SRCS+=		zutil.c

#.if ${MACHINE_ARCH} == "i386" && ${MACHINE_CPU:M*i686*}
#.PATH:		${.CURDIR}/contrib/asm686
#SRCS+=		match.S
#CFLAGS+=	-DASMV -DNO_UNDERLINE
#ACFLAGS+=	-Wa,--noexecstack
#.endif

#.if ${MACHINE_ARCH} == "amd64"
#.PATH:		${.CURDIR}/contrib/gcc_gvmat64
#SRCS+=		gvmat64.S
#CFLAGS+=	-DASMV -DNO_UNDERLINE
#ACFLAGS+=	-Wa,--noexecstack
#.endif

VERSION_DEF=	${.CURDIR}/Versions.def
SYMBOL_MAPS=	${.CURDIR}/Symbol.map
CFLAGS+=	-DSYMBOL_VERSIONING

INCS=		zconf.h zlib.h

minigzip:	all minigzip.o
	$(CC) -o minigzip minigzip.o -L. -lz

example:	all example.o
	$(CC) -o example example.o -L. -lz

test: example minigzip
	(export LD_LIBRARY_PATH=. ; ./example )
	(export LD_LIBRARY_PATH=. ; \
		echo hello world | ./minigzip | ./minigzip -d )

.include <bsd.lib.mk>

## XXX: clang integrated-as doesn't grok .intel_syntax directives yet
#ACFLAGS.gvmat64.S=	${CLANG_NO_IAS}
#ACFLAGS+=		${ACFLAGS.${.IMPSRC:T}}
@


1.25.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:03:23 +0000
@
text
@d1 73
@


1.25.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 46
#
# $FreeBSD: releng/8.4/lib/libz/Makefile 224238 2011-07-21 00:37:32Z delphij $
#

LIB=		z
SHLIBDIR?=	/lib
MAN=		zlib.3

#CFLAGS+=	-DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
#CFLAGS+=	-g -DDEBUG
#CFLAGS+=	-Wall -Wwrite-strings -Wpointer-arith -Wconversion \
#		-Wstrict-prototypes -Wmissing-prototypes

CFLAGS+=	-DHAS_snprintf -DHAS_vsnprintf

CLEANFILES+=	example.o example foo.gz minigzip.o minigzip

SRCS = adler32.c compress.c crc32.c gzio.c uncompr.c deflate.c trees.c \
       zutil.c inflate.c inftrees.c inffast.c zopen.c infback.c
INCS=		zconf.h zlib.h

.if ${MACHINE_ARCH} == "i386" && ${MACHINE_CPU:M*i686*}
.PATH:		${.CURDIR}/contrib/asm686
SRCS+=		match.S
CFLAGS+=	-DASMV -DNO_UNDERLINE
.endif

#.if ${MACHINE_ARCH} == "amd64"
#.PATH:		${.CURDIR}/contrib/gcc_gvmat64
#SRCS+=		gvmat64.S
#CFLAGS+=	-DASMV -DNO_UNDERLINE
#ACFLAGS+=	-Wa,--noexecstack
#.endif

minigzip:	all minigzip.o
	$(CC) -o minigzip minigzip.o -L. -lz

example:	all example.o
	$(CC) -o example example.o -L. -lz

test: example minigzip
	(export LD_LIBRARY_PATH=. ; ./example )
	(export LD_LIBRARY_PATH=. ; \
		echo hello world | ./minigzip | ./minigzip -d )

.include <bsd.lib.mk>
@


1.24
log
@SVN rev 237410 on 2012-06-21 21:47:08Z by delphij

MFV: Update zlib to 1.2.7.

(x86 assembler optimization disabled for now because it
requires the new .cfi_* directives that is not supported
by base system binutils).

MFC after:	1 week
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.23
log
@SVN rev 232263 on 2012-02-28 18:30:18Z by dim

Define several extra macros in bsd.sys.mk and sys/conf/kern.pre.mk, to
get rid of testing explicitly for clang (using ${CC:T:Mclang}) in
individual Makefiles.

Instead, use the following extra macros, for use with clang:
- NO_WERROR.clang       (disables -Werror)
- NO_WCAST_ALIGN.clang  (disables -Wcast-align)
- NO_WFORMAT.clang	(disables -Wformat and friends)
- CLANG_NO_IAS		(disables integrated assembler)
- CLANG_OPT_SMALL	(adds flags for extra small size optimizations)

As a side effect, this enables setting CC/CXX/CPP in src.conf instead of
make.conf!  For clang, use the following:

CC=clang
CXX=clang++
CPP=clang-cpp

MFC after:	2 weeks
@
text
@d38 6
a43 6
.if ${MACHINE_ARCH} == "i386" && ${MACHINE_CPU:M*i686*}
.PATH:		${.CURDIR}/contrib/asm686
SRCS+=		match.S
CFLAGS+=	-DASMV -DNO_UNDERLINE
ACFLAGS+=	-Wa,--noexecstack
.endif
@


1.22
log
@SVN rev 224196 on 2011-07-18 19:23:50Z by delphij

Disable gvmat64.S, the assembler version of longest_match for now.

PR:		kern/154073
MFC after:	3 days
Approved by:	re (kib)
@
text
@a49 4
#.if ${CC:T:Mclang} == "clang"
## XXX: clang integrated-as doesn't grok .intel_syntax directives yet
#ACFLAGS+=	${.IMPSRC:T:Mgvmat64.S:C/^.+$/-no-integrated-as/}
#.endif
d70 4
@


1.22.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.22.2.2
log
@SVN rev 232930 on 2012-03-13 18:39:57Z by dim

MFC r232263:

Define several extra macros in bsd.sys.mk and sys/conf/kern.pre.mk, to
get rid of testing explicitly for clang (using ${CC:T:Mclang}) in
individual Makefiles.

Instead, use the following extra macros, for use with clang:
- NO_WERROR.clang       (disables -Werror)
- NO_WCAST_ALIGN.clang  (disables -Wcast-align)
- NO_WFORMAT.clang	(disables -Wformat and friends)
- CLANG_NO_IAS		(disables integrated assembler)
- CLANG_OPT_SMALL	(adds flags for extra small size optimizations)

As a side effect, this enables setting CC/CXX/CPP in src.conf instead of
make.conf!  For clang, use the following:

CC=clang
CXX=clang++
CPP=clang-cpp
@
text
@d50 4
a73 4

## XXX: clang integrated-as doesn't grok .intel_syntax directives yet
#ACFLAGS.gvmat64.S=	${CLANG_NO_IAS}
#ACFLAGS+=		${ACFLAGS.${.IMPSRC:T}}
@


1.22.2.3
log
@SVN rev 237691 on 2012-06-28 07:08:48Z by delphij

MFC r237410: zlib 1.2.7.
@
text
@d38 6
a43 6
#.if ${MACHINE_ARCH} == "i386" && ${MACHINE_CPU:M*i686*}
#.PATH:		${.CURDIR}/contrib/asm686
#SRCS+=		match.S
#CFLAGS+=	-DASMV -DNO_UNDERLINE
#ACFLAGS+=	-Wa,--noexecstack
#.endif
@


1.22.2.4
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/9/lib/libz/Makefile 232930 2012-03-13 18:39:57Z dim $
@


1.22.2.3.2.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.22.2.3.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/9/lib/libz/Makefile 232930 2012-03-13 18:39:57Z dim $
@


1.22.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.22.2.1.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.0/lib/libz/Makefile 224196 2011-07-18 19:23:50Z delphij $
@


1.21
log
@SVN rev 218893 on 2011-02-20 19:33:47Z by dim

Upgrade our copy of llvm/clang to r126079, from upstream's trunk.

This contains many improvements, primarily better C++ support, an
integrated assembler for x86 and support for -pg.
@
text
@d45 10
a54 10
.if ${MACHINE_ARCH} == "amd64"
.PATH:		${.CURDIR}/contrib/gcc_gvmat64
SRCS+=		gvmat64.S
CFLAGS+=	-DASMV -DNO_UNDERLINE
ACFLAGS+=	-Wa,--noexecstack
.if ${CC:T:Mclang} == "clang"
# XXX: clang integrated-as doesn't grok .intel_syntax directives yet
ACFLAGS+=	${.IMPSRC:T:Mgvmat64.S:C/^.+$/-no-integrated-as/}
.endif
.endif
@


1.20
log
@SVN rev 218723 on 2011-02-15 22:03:09Z by dim

Fix some leftover binaries and shared libraries in the system that still
have an executable stack, due to linking in hand-assembled .S or .s
files, that have no .GNU-stack sections:

RWX --- ---  /lib/libcrypto.so.6
RWX --- ---  /lib/libmd.so.5
RWX --- ---  /lib/libz.so.6
RWX --- ---  /lib/libzpool.so.2
RWX --- ---  /usr/lib/liblzma.so.5

These were found using scanelf, from the sysutils/pax-utils port.

Reviewed by:	kib
@
text
@d50 4
@


1.19
log
@SVN rev 205471 on 2010-03-22 21:11:55Z by delphij

Update to zlib 1.2.4 and add versioned symbols to the
library.

Sponsored by:	iXsystems, Inc.
@
text
@d42 1
d49 1
@


1.18
log
@SVN rev 201381 on 2010-01-02 09:58:07Z by ed

Build lib/ with WARNS=6 by default.

Similar to libexec/, do the same with lib/. Make WARNS=6 the norm and
lower it when needed.

I'm setting WARNS?=0 for secure/. It seems secure/ includes the
Makefile.inc provided by lib/. I'm not going to touch that directory.
Most of the code there is contributed anyway.
@
text
@d7 1
d10 4
a13 4
#CFLAGS+=	-DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
#CFLAGS+=	-g -DDEBUG
#CFLAGS+=	-Wall -Wwrite-strings -Wpointer-arith -Wconversion \
#		-Wstrict-prototypes -Wmissing-prototypes
d15 1
a15 1
CFLAGS+=	-DHAS_snprintf -DHAS_vsnprintf
d21 33
a53 2
SRCS = adler32.c compress.c crc32.c gzio.c uncompr.c deflate.c trees.c \
       zutil.c inflate.c inftrees.c inffast.c zopen.c infback.c
@


1.17
log
@Remove libz and pppd redundancy
@
text
@d16 2
@


1.17.10.1
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/7/lib/libz/Makefile 146933 2005-06-03 15:25:13Z imp $
@


1.17.2.1
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/6/lib/libz/Makefile 146933 2005-06-03 15:25:13Z imp $
@


1.17.26.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.17.26.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/7.4/lib/libz/Makefile 146933 2005-06-03 15:25:13Z imp $
@


1.17.24.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.17.22.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.17.22.2
log
@SVN rev 206952 on 2010-04-20 22:57:05Z by delphij

MFC assembler version of match functions for amd64 and i386(*).

This gives approximately 15% improvement on compression case.

(*) i386 assembler version is enabled ONLY when MACHINE_CPU have
'i686' which is not default on FreeBSD/i386.  One can specify
for instance CPUTYPE=pentium4 in /etc/make.conf to get this
feature.
@
text
@a21 12
.if ${MACHINE_ARCH} == "i386" && ${MACHINE_CPU:M*i686*}
.PATH:		${.CURDIR}/contrib/asm686
SRCS+=		match.S
CFLAGS+=	-DASMV -DNO_UNDERLINE
.endif

.if ${MACHINE_ARCH} == "amd64"
.PATH:		${.CURDIR}/contrib/gcc_gvmat64
SRCS+=		gvmat64.S
CFLAGS+=	-DASMV -DNO_UNDERLINE
.endif

@


1.17.22.3
log
@SVN rev 224238 on 2011-07-21 00:37:32Z by delphij

MFC r224196:

Disable gvmat64.S, the assembler version of longest_match for now.

PR:		kern/154073
@
text
@d28 5
a32 6
#.if ${MACHINE_ARCH} == "amd64"
#.PATH:		${.CURDIR}/contrib/gcc_gvmat64
#SRCS+=		gvmat64.S
#CFLAGS+=	-DASMV -DNO_UNDERLINE
#ACFLAGS+=	-Wa,--noexecstack
#.endif
@


1.17.22.4
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/8/lib/libz/Makefile 224238 2011-07-21 00:37:32Z delphij $
@


1.17.22.3.2.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.17.22.3.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/8.3/lib/libz/Makefile 224238 2011-07-21 00:37:32Z delphij $
@


1.17.22.2.4.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.17.22.2.2.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.17.22.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.17.20.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.17.18.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.17.16.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.16
log
@Update makefile for zlib 1.2.1.
@
text
@a4 2
MAINTAINER=peter@@FreeBSD.org

@


1.16.2.1
log
@MFC: ZLib 1.2.2  (Part 1: files with FreeBSD-local changes)
@
text
@d5 2
@


1.15
log
@Stage 3 of dynamic root support. Make all the libraries needed to run
binaries in /bin and /sbin installed in /lib. Only the versioned files
reside in /lib, the .so symlink continues to live /usr/lib so the
toolchain doesn't need to be modified.
@
text
@d21 1
a21 2
       zutil.c inflate.c infblock.c inftrees.c infcodes.c infutil.c \
       inffast.c zopen.c
@


1.14
log
@Add zopen(), a stdio wrapper for gzipped data streams.

Obtained from:	NetBSD
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libz/Makefile,v 1.13 2001/03/27 17:27:19 ru Exp $
d8 1
@


1.13
log
@MAN[1-9] -> MAN.
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libz/Makefile,v 1.12 2000/12/06 01:49:08 jedgar Exp $
d20 2
a21 1
       zutil.c inflate.c infblock.c inftrees.c infcodes.c infutil.c inffast.c
@


1.12
log
@Add appropriate defines to use snprintf/vsnprintf instead of
sprintf/vsprintf.

Approved by:	peter
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libz/Makefile,v 1.11 2000/01/14 07:57:47 rgrimes Exp $
d8 1
a8 1
MAN3=           zlib.3
@


1.11
log
@Replace beforeinstall target with new variables used by .mk system.

Reviewed by:	marcel, and make world
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libz/Makefile,v 1.10 1999/08/28 00:06:00 peter Exp $
d14 2
@


1.11.2.1
log
@MFC: r1.12: use *snprintf() instead of *sprintf()
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libz/Makefile,v 1.11 2000/01/14 07:57:47 rgrimes Exp $
a13 2

CFLAGS+=	-DHAS_snprintf -DHAS_vsnprintf
@


1.11.2.2
log
@MFC: MAN[1-9] -> MAN.
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libz/Makefile,v 1.11.2.1 2001/03/05 06:31:44 kris Exp $
d8 1
a8 1
MAN=		zlib.3
@


1.11.2.3
log
@MFC: Add zopen(), a stdio wrapper for gzipped data streams.
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libz/Makefile,v 1.11.2.2 2001/04/25 10:04:43 ru Exp $
d20 1
a20 2
       zutil.c inflate.c infblock.c inftrees.c infcodes.c infutil.c \
       inffast.c zopen.c
@


1.11.2.4
log
@MFC: zlib 1.1.4. It was sitting in the -current for too long (10 months).
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.11.2.5
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/4/lib/libz/Makefile 110191 2003-02-01 13:33:12Z sobomax $
@


1.10
log
@$Id$ -> $FreeBSD$
@
text
@d2 1
a2 1
# $FreeBSD$
d19 1
a19 6

beforeinstall:
.for hdr in zconf.h zlib.h
	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/${hdr} \
		${DESTDIR}/usr/include
.endfor
@


1.9
log
@Backup out the last commit, it was already there.

Noticed by:	bde
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.8 1998/04/17 07:26:51 phk Exp $
@


1.9.2.1
log
@$Id$ -> $FreeBSD$
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.8
log
@Manpages not installed
PR:		6327
Reviewed by:	phk
Submitted by:	Chia-liang Kao <clkao@@cirx.org>
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.7 1998/02/28 10:41:01 ache Exp $
a18 2

MAN3 = zlib.3
@


1.7
log
@Install manpage too
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.6 1998/02/28 06:27:59 steve Exp $
d19 2
@


1.6
log
@foo.gz is created by 'make test' so add it to CLEANFILES.
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.5 1997/02/22 11:38:21 peter Exp $
d8 1
@


1.5
log
@Back out an easy $FreeBSD$
@
text
@d2 1
a2 1
# $Id$
d14 1
a14 1
CLEANFILES+=	example.o example minigzip.o minigzip
@


1.4
log
@Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.3
log
@Clean up the beforeinstall target a bit more, bde pointed out that the old
one was a mess.  (I was in a 'talk' session at the time, can you tell? :-)
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.2 1996/08/18 23:52:20 peter Exp $
@


1.3.4.1
log
@$Id$ -> $FreeBSD$
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.3.2.1
log
@MFC: update to zlib-1.1.1
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.5 1997/02/22 11:38:21 peter Exp $
@


1.3.2.2
log
@MFC: CLEANFILES+= foo.gz
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.3.2.1 1998/02/28 06:18:48 steve Exp $
d14 1
a14 1
CLEANFILES+=	example.o example foo.gz minigzip.o minigzip
@


1.3.2.3
log
@MFC: doc fixes, casts, cosmetic.
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.3.2.2 1998/02/28 06:32:14 steve Exp $
a7 1
MAN3=           zlib.3
@


1.3.2.4
log
@$Id$ -> $FreeBSD$
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.2
log
@oops.. attempted to install header files from wrong directory..
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.1 1996/08/18 17:59:48 peter Exp $
d20 4
a23 2
	${INSTALL} -c -m 644 -o ${BINOWN} -g ${BINGRP} ${.CURDIR}/zlib.h \
		${.CURDIR}/zconf.h ${DESTDIR}/usr/include
a34 1

@


1.1
log
@Add a bmakefile for zlib.
@
text
@d2 1
a2 1
# $Id$
d20 2
a21 2
	${INSTALL} -c -m 644 -o ${BINOWN} -g ${BINGRP} zlib.h zconf.h \
		${DESTDIR}/usr/include
@


1.1.1.1
log
@Initial import of zlib-1.1.1

PR:		5869
Reviewed by:	jdp
@
text
@d1 35
a35 158
# Makefile for zlib
# Copyright (C) 1995-1998 Jean-loup Gailly.
# For conditions of distribution and use, see copyright notice in zlib.h 

# To compile and test, type:
#   ./configure; make test
# The call of configure is optional if you don't have special requirements
# If you wish to build zlib as a shared library, use: ./configure -s

# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
#    make install
# To install in $HOME instead of /usr/local, use:
#    make install prefix=$HOME

CC=cc

CFLAGS=-O
#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
LDSHARED=$(CC)

VER=1.1.1
LIBS=libz.a
SHAREDLIB=libz.so

AR=ar rc
RANLIB=ranlib
TAR=tar
SHELL=/bin/sh

prefix=/usr/local
exec_prefix = $(prefix)

OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
       zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o

TEST_OBJS = example.o minigzip.o

DISTFILES = README INDEX ChangeLog configure Make*[a-z0-9] *.[ch] descrip.mms \
  algorithm.txt zlib.3 msdos/Make*[a-z0-9] msdos/zlib.def msdos/zlib.rc \
  nt/Makefile.nt nt/zlib.dnt  contrib/README.contrib contrib/*.txt \
  contrib/asm386/*.asm contrib/asm386/*.c \
  contrib/asm386/*.bat contrib/asm386/zlibvc.d?? contrib/iostream/*.cpp \
  contrib/iostream/*.h  contrib/iostream2/*.h contrib/iostream2/*.cpp \
  contrib/untgz/Makefile contrib/untgz/*.c contrib/untgz/*.w32

all: example minigzip

test: all
	@@LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
	echo hello world | ./minigzip | ./minigzip -d || \
	  echo '		*** minigzip test FAILED ***' ; \
	if ./example; then \
	  echo '		*** zlib test OK ***'; \
	else \
	  echo '		*** zlib test FAILED ***'; \
	fi

libz.a: $(OBJS)
	$(AR) $@@ $(OBJS)
	-@@ ($(RANLIB) $@@ || true) >/dev/null 2>&1

$(SHAREDLIB).$(VER): $(OBJS)
	$(LDSHARED) -o $@@ $(OBJS)
	rm -f $(SHAREDLIB) $(SHAREDLIB).1
	ln -s $@@ $(SHAREDLIB)
	ln -s $@@ $(SHAREDLIB).1

example: example.o $(LIBS)
	$(CC) $(CFLAGS) -o $@@ example.o $(LDFLAGS)

minigzip: minigzip.o $(LIBS)
	$(CC) $(CFLAGS) -o $@@ minigzip.o $(LDFLAGS)

install: $(LIBS)
	-@@if [ ! -d $(prefix)/include  ]; then mkdir $(prefix)/include; fi
	-@@if [ ! -d $(exec_prefix)/lib ]; then mkdir $(exec_prefix)/lib; fi
	cp zlib.h zconf.h $(prefix)/include
	chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
	cp $(LIBS) $(exec_prefix)/lib
	cd $(exec_prefix)/lib; chmod 755 $(LIBS)
	-@@(cd $(exec_prefix)/lib; $(RANLIB) libz.a || true) >/dev/null 2>&1
	cd $(exec_prefix)/lib; if test -f $(SHAREDLIB).$(VER); then \
	  rm -f $(SHAREDLIB) $(SHAREDLIB).1; \
	  ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB); \
	  ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB).1; \
	  (ldconfig || true)  >/dev/null 2>&1; \
	fi
# The ranlib in install is needed on NeXTSTEP which checks file times
# ldconfig is for Linux

uninstall:
	cd $(prefix)/include; \
	v=$(VER); \
	if test -f zlib.h; then \
	  v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`; \
          rm -f zlib.h zconf.h; \
	fi; \
	cd $(exec_prefix)/lib; rm -f libz.a; \
	if test -f $(SHAREDLIB).$$v; then \
	  rm -f $(SHAREDLIB).$$v $(SHAREDLIB) $(SHAREDLIB).1; \
	fi

clean:
	rm -f *.o *~ example minigzip libz.a libz.so* foo.gz

distclean:	clean

zip:
	mv Makefile Makefile~; cp -p Makefile.in Makefile
	rm -f test.c ztest*.c
	v=`sed -n -e 's/\.//g' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
	zip -ul9 zlib$$v $(DISTFILES)
	mv Makefile~ Makefile

dist:
	mv Makefile Makefile~; cp -p Makefile.in Makefile
	rm -f test.c ztest*.c
	d=zlib-`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
	rm -f $$d.tar.gz; \
	if test ! -d ../$$d; then rm -f ../$$d; ln -s `pwd` ../$$d; fi; \
	files=""; \
	for f in $(DISTFILES); do files="$$files $$d/$$f"; done; \
	cd ..; \
	GZIP=-9 $(TAR) chofz $$d/$$d.tar.gz $$files; \
	if test ! -d $$d; then rm -f $$d; fi
	mv Makefile~ Makefile

tags:	
	etags *.[ch]

depend:
	makedepend -- $(CFLAGS) -- *.[ch]

# DO NOT DELETE THIS LINE -- make depend depends on it.

adler32.o: zlib.h zconf.h
compress.o: zlib.h zconf.h
crc32.o: zlib.h zconf.h
deflate.o: deflate.h zutil.h zlib.h zconf.h
example.o: zlib.h zconf.h
gzio.o: zutil.h zlib.h zconf.h
infblock.o: infblock.h inftrees.h infcodes.h infutil.h zutil.h zlib.h zconf.h
infcodes.o: zutil.h zlib.h zconf.h
infcodes.o: inftrees.h infblock.h infcodes.h infutil.h inffast.h
inffast.o: zutil.h zlib.h zconf.h inftrees.h
inffast.o: infblock.h infcodes.h infutil.h inffast.h
inflate.o: zutil.h zlib.h zconf.h infblock.h
inftrees.o: zutil.h zlib.h zconf.h inftrees.h
infutil.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
minigzip.o:  zlib.h zconf.h 
trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
uncompr.o: zlib.h zconf.h
zutil.o: zutil.h zlib.h zconf.h  
@
