[src/trunk]: src/gnu/usr.bin/gzip No need for ${CPP}; just compile the .S if ...

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d8d81fbd7ab3
branches:  trunk
changeset: 517503:d8d81fbd7ab3
user:      tv <tv%NetBSD.org@localhost>
date:      Tue Nov 13 17:26:52 2001 +0000

description:
No need for ${CPP}; just compile the .S if m68k || i386.

Formatting cleanup.

diffstat:

 gnu/usr.bin/gzip/Makefile |  60 +++++++++++++++++++---------------------------
 1 files changed, 25 insertions(+), 35 deletions(-)

diffs (78 lines):

diff -r bf7b9246f60c -r d8d81fbd7ab3 gnu/usr.bin/gzip/Makefile
--- a/gnu/usr.bin/gzip/Makefile Tue Nov 13 17:14:27 2001 +0000
+++ b/gnu/usr.bin/gzip/Makefile Tue Nov 13 17:26:52 2001 +0000
@@ -1,49 +1,39 @@
-#      $NetBSD: Makefile,v 1.29 2001/03/04 16:12:36 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.30 2001/11/13 17:26:52 tv Exp $
 
 .include <bsd.own.mk>
 
-PROG=  gzip
-SRCS=  gzip.c zip.c deflate.c trees.c bits.c unzip.c inflate.c util.c \
-       crypt.c lzw.c unbzip2.c unlzw.c unlzh.c unpack.c getopt.c
-MAN=   gzexe.1 gzip.1 zdiff.1 zforce.1 zgrep.1 zmore.1 znew.1
-CPPFLAGS+=-DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DDIRENT=1 -Dunix
+PROG=          gzip
+SRCS=          gzip.c zip.c deflate.c trees.c bits.c unzip.c inflate.c util.c \
+               crypt.c lzw.c unbzip2.c unlzw.c unlzh.c unpack.c getopt.c
+MAN=           gzexe.1 gzip.1 zdiff.1 zforce.1 zgrep.1 zmore.1 znew.1
+CPPFLAGS+=     -DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DDIRENT=1 -Dunix
 
 .if (${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "i386")
-SRCS+= match.S
-CPPFLAGS+=-DASMV
-MATCHCPPFLAGS=-traditional -D__NetBSD__
+SRCS+=         match.S
+CPPFLAGS+=     -DASMV
 
 .if (${OBJECT_FMT} == "ELF")
-MATCHCPPFLAGS+=-DNO_UNDERLINE
+AFLAGS+=       -DNO_UNDERLINE
 .endif
-
 .endif # m68k || i386
 
-LDSTATIC?= -static
-LDADD+=        -lbz2
-DPADD+=        ${LIBBZ2}
+LDSTATIC?=     -static
+DPADD+=                ${LIBBZ2}
+LDADD+=                -lbz2
 
-MLINKS+= gzip.1 gunzip.1 gzip.1 gzcat.1 gzip.1 zcat.1
-MLINKS+= zdiff.1 zcmp.1
-#MLINKS+= gzip.1 uncompress.1
-MLINKS+= zgrep.1 zegrep.1 zgrep.1 zfgrep.1
-LINKS+= ${BINDIR}/gzip ${BINDIR}/gunzip
-LINKS+= ${BINDIR}/gzip ${BINDIR}/gzcat
-LINKS+= ${BINDIR}/gzip ${BINDIR}/zcat
-LINKS+=        ${BINDIR}/zdiff ${BINDIR}/zcmp
-#LINKS+= ${BINDIR}/gzip ${BINDIR}/uncompress
-LINKS+=        ${BINDIR}/zgrep ${BINDIR}/zegrep
-LINKS+=        ${BINDIR}/zgrep ${BINDIR}/zfgrep
+MLINKS+=       gzip.1 gunzip.1 gzip.1 gzcat.1 gzip.1 zcat.1 \
+               zdiff.1 zcmp.1 \
+               zgrep.1 zegrep.1 zgrep.1 zfgrep.1
+#MLINKS+=      gzip.1 uncompress.1
+LINKS+=                ${BINDIR}/gzip ${BINDIR}/gunzip \
+               ${BINDIR}/gzip ${BINDIR}/gzcat \
+               ${BINDIR}/gzip ${BINDIR}/zcat \
+               ${BINDIR}/zdiff ${BINDIR}/zcmp \
+               ${BINDIR}/zgrep ${BINDIR}/zegrep \
+               ${BINDIR}/zgrep ${BINDIR}/zfgrep \
+#LINKS+=       ${BINDIR}/gzip ${BINDIR}/uncompress
 
-FILES=zforce gzexe znew zmore zdiff zgrep 
-FILESMODE=${BINMODE}
-
-.if (${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "i386")
-match.o: ${.CURDIR}/match.S
-       $(CPP) ${MATCHCPPFLAGS} ${.CURDIR}/match.S >_match.s
-       $(CC) -c _match.s
-       mv _match.o match.o
-       rm -f _match.s
-.endif
+FILES=         zforce gzexe znew zmore zdiff zgrep 
+FILESMODE=     ${BINMODE}
 
 .include <bsd.prog.mk>