Move -DDYNAMIC_CRC_TABLE into the main libz Makefile

3 files changed, 8 insertions, 6 deletions

diff --git a/sys/arch/hppa/stand/libz/Makefile b/sys/arch/hppa/stand/libz/Makefile
index 191c38e994e..cb246dceb5e 100644
--- a/sys/arch/hppa/stand/libz/Makefile
+++ b/sys/arch/hppa/stand/libz/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 1998/06/23 18:46:42 mickey Exp $
+#	$OpenBSD: Makefile,v 1.2 2003/12/18 02:27:13 millert Exp $
 
 S=${.CURDIR}/../../../..
 ZDST=${.OBJDIR}
@@ -7,4 +7,4 @@ SADIR=${.CURDIR}/..
 .PATH: ${S}/lib/libz
 
 .include "${S}/lib/libz/Makefile"
-CFLAGS+=${SACFLAGS} -I${S}/lib/libsa -DDYNAMIC_CRC_TABLE
+CFLAGS+=${SACFLAGS} -I${S}/lib/libsa
diff --git a/sys/arch/i386/stand/libz/Makefile b/sys/arch/i386/stand/libz/Makefile
index 48d8d5d4cbe..525c7141bf2 100644
--- a/sys/arch/i386/stand/libz/Makefile
+++ b/sys/arch/i386/stand/libz/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.10 1999/02/14 19:38:45 mickey Exp $
+#	$OpenBSD: Makefile,v 1.11 2003/12/18 02:27:13 millert Exp $
 #	$NetBSD: Makefile,v 1.2 1997/01/22 01:36:30 cgd Exp $
 
 S=${.CURDIR}/../../../..
@@ -8,4 +8,4 @@ SADIR=${.CURDIR}/..
 .PATH: ${S}/lib/libz
 
 .include "${S}/lib/libz/Makefile"
-CFLAGS+=${SACFLAGS} -I${S}/lib/libsa -DDYNAMIC_CRC_TABLE ${DEBUGFLAGS}
+CFLAGS+=${SACFLAGS} -I${S}/lib/libsa ${DEBUGFLAGS}
diff --git a/sys/lib/libz/Makefile b/sys/lib/libz/Makefile
index 37462157af3..93f04fefd5c 100644
--- a/sys/lib/libz/Makefile
+++ b/sys/lib/libz/Makefile
@@ -1,11 +1,13 @@
-#	$OpenBSD: Makefile,v 1.7 2003/12/17 00:30:11 millert Exp $
+#	$OpenBSD: Makefile,v 1.8 2003/12/18 02:27:13 millert Exp $
 #	$NetBSD: Makefile,v 1.2 1997/01/22 01:36:30 cgd Exp $
 
 LIB=	z
 NOPIC=
 NOPROFILE=
 
-CPPFLAGS+=	-I. ${ZCPPFLAGS} -DSLOW -DSMALL -DNOBYFOUR -DNO_GZIP
+# Tweak knobs to generate small libz code
+CPPFLAGS+=	-DSLOW -DSMALL -DNOBYFOUR -DNO_GZIP -DDYNAMIC_CRC_TABLE
+CPPFLAGS+=	-I. ${ZCPPFLAGS}
 
 # files to be copied down from libz.
 LIBZSRCS= adler32.c crc32.c inflate.c inftrees.c