diff options
| author |   millert <millert@openbsd.org> | 2003-12-17 04:23:37 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2003-12-17 04:23:37 +0000 |
| commit | b1e3a98a738b0000e3e15053f4fb6e29bb627a22 (patch) | |
| tree | f667f99c12e7579b4b3e7f9d0fe38d3dd82b0d60 | |
| parent | bad me, left commented code in here... (diff) | |
| download | wireguard-openbsd-b1e3a98a738b0000e3e15053f4fb6e29bb627a22.tar.xz wireguard-openbsd-b1e3a98a738b0000e3e15053f4fb6e29bb627a22.zip | |
Simply include the main libz Makefile instead of trying to roll our own.
| -rw-r--r-- | sys/arch/hp300/stand/libz/Makefile | 23 | ||||
| -rw-r--r-- | sys/arch/sparc/stand/libz/Makefile | 23 | ||||
| -rw-r--r-- | sys/arch/sparc64/stand/libz/Makefile | 30 |
3 files changed, 21 insertions, 55 deletions
diff --git a/sys/arch/hp300/stand/libz/Makefile b/sys/arch/hp300/stand/libz/Makefile index 07228eb7e2d..7ef558d9076 100644 --- a/sys/arch/hp300/stand/libz/Makefile +++ b/sys/arch/hp300/stand/libz/Makefile @@ -1,19 +1,10 @@ -# $OpenBSD: Makefile,v 1.1 1997/07/14 08:14:51 downsj Exp $ +# $OpenBSD: Makefile,v 1.2 2003/12/17 04:28:48 millert Exp $ -LIB= z +S=${.CURDIR}/../../../.. +ZDST=${.OBJDIR} +SADIR=${.CURDIR}/.. -.PATH: ${.CURDIR}/../../../../lib/libz +.PATH: ${S}/lib/libz -CFLAGS= -O2 -msoft-float -D_ZLIB_PRIVATE -I${.CURDIR}/../../../../lib/libz - -SRCS= adler32.c crc32.c infblock.c infcodes.c inffast.c \ - inflate.c inftrees.c infutil.c - -${OBJS}: ${.CURDIR}/../Makefile.inc - -install: - -NOPIC= -NOPROFILE= - -.include <bsd.lib.mk> +.include "${S}/lib/libz/Makefile" +CFLAGS+=-msoft-float ${SACFLAGS} -I${S}/lib/libsa ${DEBUGFLAGS} diff --git a/sys/arch/sparc/stand/libz/Makefile b/sys/arch/sparc/stand/libz/Makefile index ee5281bfc06..a2ca28b4c78 100644 --- a/sys/arch/sparc/stand/libz/Makefile +++ b/sys/arch/sparc/stand/libz/Makefile @@ -1,19 +1,10 @@ -# $OpenBSD: Makefile,v 1.1 1997/09/17 10:46:24 downsj Exp $ +# $OpenBSD: Makefile,v 1.2 2003/12/17 04:25:40 millert Exp $ -LIB= z +S=${.CURDIR}/../../../.. +ZDST=${.OBJDIR} +SADIR=${.CURDIR}/.. -.PATH: ${.CURDIR}/../../../../lib/libz +.PATH: ${S}/lib/libz -CFLAGS= -O2 -D_ZLIB_PRIVATE -I${.CURDIR}/../../../../lib/libz - -SRCS= adler32.c crc32.c infblock.c infcodes.c inffast.c \ - inflate.c inftrees.c infutil.c - -${OBJS}: ${.CURDIR}/../Makefile.inc - -install: - -NOPIC= -NOPROFILE= - -.include <bsd.lib.mk> +.include "${S}/lib/libz/Makefile" +CFLAGS+=${SACFLAGS} -I${S}/lib/libsa ${DEBUGFLAGS} diff --git a/sys/arch/sparc64/stand/libz/Makefile b/sys/arch/sparc64/stand/libz/Makefile index 3e7bd011676..96ba4870e7d 100644 --- a/sys/arch/sparc64/stand/libz/Makefile +++ b/sys/arch/sparc64/stand/libz/Makefile @@ -1,26 +1,10 @@ -# $OpenBSD: Makefile,v 1.3 2001/09/06 19:12:34 jason Exp $ +# $OpenBSD: Makefile,v 1.4 2003/12/17 04:23:37 millert Exp $ -LIB= z +S=${.CURDIR}/../../../.. +ZDST=${.OBJDIR} +SADIR=${.CURDIR}/.. -.PATH: ${.CURDIR}/../../../../lib/libz +.PATH: ${S}/lib/libz -CLEANFILES+= machine - -CFLAGS= -nostdinc ${CEXTRAFLAGS} ${AFLAGS} -O2 -D_ZLIB_PRIVATE -I${.CURDIR}/../../../.. -I${.CURDIR}/../../../../lib/libz -I${.CURDIR}/. - -SRCS= adler32.c crc32.c infblock.c infcodes.c inffast.c \ - inflate.c inftrees.c infutil.c - -${OBJS}: ${.CURDIR}/../Makefile.inc - -.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(kernlibdir) && !make(obj) -.BEGIN: - @([ -h machine ] || ln -s ${.CURDIR}/../../include machine) -.endif - -install: - -NOPIC= -NOPROFILE= - -.include <bsd.lib.mk> +.include "${S}/lib/libz/Makefile" +CFLAGS+=${CEXTRAFLAGS} ${AFLAGS} ${SACFLAGS} -I${S}/lib/libsa ${DEBUGFLAGS} |