- use CPPFLAGS instead of CFLAGS

- use ${COMPILE.C} ... instead of ${CC} ${CFLAGS} -c ...
This commit is contained in:
lukem 1997-10-22 23:14:04 +00:00
parent 6dfcd7b38d
commit d0e23d974a
6 changed files with 42 additions and 45 deletions

View File

@ -1,21 +1,22 @@
# $NetBSD: Makefile,v 1.70 1997/10/09 14:36:18 lukem Exp $
# $NetBSD: Makefile,v 1.71 1997/10/22 23:14:04 lukem Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#
# All library objects contain sccsid strings by default; they may be
# excluded as a space-saving measure. To produce a library that does
# not contain these strings, delete -DLIBC_SCCS and -DSYSLIBC_SCCS
# from CFLAGS below. To remove these strings from just the system call
# stubs, remove just -DSYSLIBC_SCCS from CFLAGS.
# from CPPFLAGS below. To remove these strings from just the system call
# stubs, remove just -DSYSLIBC_SCCS from CPPFLAGS.
#
# The NLS (message catalog) functions are always in libc. To choose that
# strerror(), perror(), strsignal(), psignal(), etc. actually call the NLS
# functions, put -DNLS on the CFLAGS line below.
# functions, put -DNLS on the CPPFLAGS line below.
#
# The YP functions are always in libc. To choose that getpwent() and friends
# actually call the YP functions, put -DYP on the CFLAGS line below.
# actually call the YP functions, put -DYP on the CPPFLAGS line below.
LIB=c
CFLAGS+=-DNLS -DYP -DLIBC_SCCS -DSYSLIBC_SCCS -D_REENTRANT -I${.CURDIR}/include
CPPFLAGS+=-DNLS -DYP -DLIBC_SCCS -DSYSLIBC_SCCS -D_REENTRANT
CPPFLAGS+=-I${.CURDIR}/include
AINC= -I${.CURDIR}/arch/${MACHINE_ARCH}
.if defined(DESTDIR)
AINC+= -nostdinc -idirafter ${DESTDIR}/usr/include

View File

@ -1,7 +1,7 @@
# $NetBSD: Makefile.inc,v 1.5 1995/02/27 13:19:23 cgd Exp $
# $NetBSD: Makefile.inc,v 1.6 1997/10/22 23:14:11 lukem Exp $
# @(#)Makefile.inc 8.2 (Berkeley) 2/21/94
#
CFLAGS+=-D__DBINTERFACE_PRIVATE
CPPFLAGS+=-D__DBINTERFACE_PRIVATE
.include "${.CURDIR}/db/btree/Makefile.inc"
.include "${.CURDIR}/db/db/Makefile.inc"

View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile.inc,v 1.5 1995/02/27 13:28:19 cgd Exp $
# $NetBSD: Makefile.inc,v 1.6 1997/10/22 23:14:17 lukem Exp $
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
# regex sources
.PATH: ${.CURDIR}/regex
CFLAGS+=-DPOSIX_MISTAKE
CPPFLAGS+=-DPOSIX_MISTAKE
SRCS+= regcomp.c regerror.c regexec.c regfree.c

View File

@ -1,10 +1,10 @@
# from: @(#)Makefile.inc 5.7 (Berkeley) 6/27/91
# $NetBSD: Makefile.inc,v 1.11 1997/04/02 12:50:23 kleink Exp $
# $NetBSD: Makefile.inc,v 1.12 1997/10/22 23:14:22 lukem Exp $
# stdio sources
.PATH: ${.CURDIR}/stdio
CFLAGS+=-DFLOATING_POINT
CPPFLAGS+=-DFLOATING_POINT
SRCS+= clrerr.c fclose.c fdopen.c feof.c ferror.c fflush.c fgetc.c \
fgetln.c fgetpos.c fgets.c fileno.c findfp.c flags.c fopen.c \

View File

@ -1,5 +1,5 @@
# from: @(#)Makefile.inc 5.6 (Berkeley) 3/5/91
# $NetBSD: Makefile.inc,v 1.40 1997/10/09 10:08:16 lukem Exp $
# $NetBSD: Makefile.inc,v 1.41 1997/10/22 23:14:27 lukem Exp $
# string sources
.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/string ${.CURDIR}/string
@ -28,22 +28,21 @@ SRCS+= memccpy.c
.if empty(SRCS:Mmemmove.S)
OBJS+= memmove.o
memmove.o: bcopy.c
${CC} -DMEMMOVE ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} -o ${.TARGET}
${COMPILE.c} -DMEMMOVE ${.ALLSRC} -o ${.TARGET}
@${LD} -x -r ${.TARGET}
@mv a.out ${.TARGET}
memmove.po: bcopy.c
${CC} -DMEMMOVE ${CFLAGS} ${CPPFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
${COMPILE.c} -DMEMMOVE -p ${.ALLSRC} -o ${.TARGET}
@${LD} -X -r ${.TARGET}
@mv a.out ${.TARGET}
memmove.so: bcopy.c
${CC} ${PICFLAG} -DPIC -DMEMMOVE ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} \
-o ${.TARGET}
${COMPILE.c} ${PICFLAG} -DPIC -DMEMMOVE ${.ALLSRC} -o ${.TARGET}
LOBJS+= memmove.ln
memmove.ln: bcopy.c
${LINT} -DMEMMOVE ${LINTFLAGS} ${CFLAGS:M-[IDU]*} -i -o ${.TARGET} \
${LINT} -DMEMMOVE ${LINTFLAGS} ${CPPFLAGS:M-[IDU]*} -i -o ${.TARGET} \
${.ALLSRC}
.endif
@ -54,22 +53,21 @@ memmove.ln: bcopy.c
.if empty(SRCS:Mmemmove.S)
OBJS+= memcpy.o
memcpy.o: bcopy.c
${CC} -DMEMCOPY ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} -o ${.TARGET}
${COMPILE.c} -DMEMCOPY ${.ALLSRC} -o ${.TARGET}
@${LD} -x -r ${.TARGET}
@mv a.out ${.TARGET}
memcpy.po: bcopy.c
${CC} -DMEMCOPY ${CFLAGS} ${CPPFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
${COMPILE.c} -DMEMCOPY -p ${.ALLSRC} -o ${.TARGET}
@${LD} -X -r ${.TARGET}
@mv a.out ${.TARGET}
memcpy.so: bcopy.c
${CC} ${PICFLAG} -DPIC -DMEMCOPY ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} \
-o ${.TARGET}
${COMPILE.c} ${PICFLAG} -DPIC -DMEMCOPY ${.ALLSRC} -o ${.TARGET}
LOBJS+= memcpy.ln
memcpy.ln: bcopy.c
${LINT} -DMEMCOPY ${LINTFLAGS} ${CFLAGS:M-[IDU]*} -i -o ${.TARGET} \
${LINT} -DMEMCOPY ${LINTFLAGS} ${CPPFLAGS:M-[IDU]*} -i -o ${.TARGET} \
${.ALLSRC}
.endif
.endif
@ -78,22 +76,21 @@ memcpy.ln: bcopy.c
.if empty(SRCS:Mstrchr.S)
OBJS+= strchr.o
strchr.o: index.c
${CC} -DSTRCHR ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} -o ${.TARGET}
${COMPILE.c} -DSTRCHR ${.ALLSRC} -o ${.TARGET}
@${LD} -x -r ${.TARGET}
@mv a.out ${.TARGET}
strchr.po: index.c
${CC} -DSTRCHR ${CFLAGS} ${CPPFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
${COMPILE.c} -DSTRCHR -p ${.ALLSRC} -o ${.TARGET}
@${LD} -X -r ${.TARGET}
@mv a.out ${.TARGET}
strchr.so: index.c
${CC} ${PICFLAG} -DPIC -DSTRCHR ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} \
-o ${.TARGET}
${COMPILE.c} ${PICFLAG} -DPIC -DSTRCHR ${.ALLSRC} -o ${.TARGET}
LOBJS+= strchr.ln
strchr.ln: index.c
${LINT} -DSTRCHR ${LINTFLAGS} ${CFLAGS:M-[IDU]*} -i -o ${.TARGET} \
${LINT} -DSTRCHR ${LINTFLAGS} ${CPPFLAGS:M-[IDU]*} -i -o ${.TARGET} \
${.ALLSRC}
.endif
@ -101,22 +98,21 @@ strchr.ln: index.c
.if empty(SRCS:Mstrrchr.S)
OBJS+= strrchr.o
strrchr.o: rindex.c
${CC} -DSTRRCHR ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} -o ${.TARGET}
${COMPILE.c} -DSTRRCHR ${.ALLSRC} -o ${.TARGET}
@${LD} -x -r ${.TARGET}
@mv a.out ${.TARGET}
strrchr.po: rindex.c
${CC} -DSTRRCHR ${CFLAGS} ${CPPFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
${COMPILE.c} -DSTRRCHR -p ${.ALLSRC} -o ${.TARGET}
@${LD} -X -r ${.TARGET}
@mv a.out ${.TARGET}
strrchr.so: rindex.c
${CC} ${PICFLAG} -DPIC -DSTRRCHR ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} \
-o ${.TARGET}
${COMPILE.c} ${PICFLAG} -DPIC -DSTRRCHR ${.ALLSRC} -o ${.TARGET}
LOBJS+= strrchr.ln
strrchr.ln: rindex.c
${LINT} -DSTRRCHR ${LINTFLAGS} ${CFLAGS:M-[IDU]*} -i -o ${.TARGET} \
${LINT} -DSTRRCHR ${LINTFLAGS} ${CPPFLAGS:M-[IDU]*} -i -o ${.TARGET} \
${.ALLSRC}
.endif

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.72 1997/10/21 18:56:44 thorpej Exp $
# $NetBSD: Makefile.inc,v 1.73 1997/10/22 23:14:33 lukem Exp $
# @(#)Makefile.inc 8.1 (Berkeley) 6/17/93
# sys sources
@ -72,7 +72,7 @@ ${PASM}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h \
${DESTDIR}/usr/include/sys/syscall.h
@echo creating ${.TARGET}
@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o
${CPP} -DPROF ${CPPFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o
@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
@rm -f ${.TARGET}.o
@ -80,14 +80,14 @@ ${SASM}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h \
${DESTDIR}/usr/include/sys/syscall.h
@echo creating ${.TARGET}
@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
${CPP} ${CPPPICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} | \
${CPP} ${CPPPICFLAGS} ${CPPFLAGS:M-[ID]*} ${AINC} | \
${AS} ${APICFLAGS} -o ${.TARGET}
${ASM}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h \
${DESTDIR}/usr/include/sys/syscall.h
@echo creating ${.TARGET}
@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o
${CPP} ${CPPFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o
@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
@rm -f ${.TARGET}.o
@ -95,13 +95,13 @@ ${LASM} ${LNOERR}: ${DESTDIR}/usr/include/sys/syscall.h \
${.CURDIR}/sys/makelintstub
@echo creating ${.TARGET}
@sh ${.CURDIR}/sys/makelintstub ${.PREFIX} | \
${LINT} -z ${LINTFLAGS} ${CFLAGS:M-[IDU]*} -i -o ${.TARGET} -
${LINT} -z ${LINTFLAGS} ${CPPFLAGS:M-[IDU]*} -i -o ${.TARGET} -
${PNOERR}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h \
${DESTDIR}/usr/include/sys/syscall.h
@echo creating ${.TARGET}
@printf '#include "SYS.h"\nRSYSCALL_NOERROR(${.PREFIX})\n' | \
${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o
${CPP} -DPROF ${CPPFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o
@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
@rm -f ${.TARGET}.o
@ -109,14 +109,14 @@ ${SNOERR}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h \
${DESTDIR}/usr/include/sys/syscall.h
@echo creating ${.TARGET}
@printf '#include "SYS.h"\nRSYSCALL_NOERROR(${.PREFIX})\n' | \
${CPP} ${CPPPICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} | \
${CPP} ${CPPPICFLAGS} ${CPPFLAGS:M-[ID]*} ${AINC} | \
${AS} ${APICFLAGS} -o ${.TARGET}
${NOERR}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h \
${DESTDIR}/usr/include/sys/syscall.h
@echo creating ${.TARGET}
@printf '#include "SYS.h"\nRSYSCALL_NOERROR(${.PREFIX})\n' | \
${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o
${CPP} ${CPPFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o
@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
@rm -f ${.TARGET}.o
@ -125,7 +125,7 @@ ${PPSEUDONOERR}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h \
@echo creating ${.TARGET}
@printf '#include "SYS.h"\n \
PSEUDO_NOERROR(${.PREFIX},${.PREFIX:S/_//})\n' | \
${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o
${CPP} -DPROF ${CPPFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o
@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
@rm -f ${.TARGET}.o
@ -134,7 +134,7 @@ ${SPSEUDONOERR}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h \
@echo creating ${.TARGET}
@printf '#include "SYS.h"\n \
PSEUDO_NOERROR(${.PREFIX},${.PREFIX:S/_//})\n' | \
${CPP} ${CPPPICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} | \
${CPP} ${CPPPICFLAGS} ${CPPFLAGS:M-[ID]*} ${AINC} | \
${AS} ${APICFLAGS} -o ${.TARGET}
@ -143,7 +143,7 @@ ${PSEUDONOERR}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h \
@echo creating ${.TARGET}
@printf '#include "SYS.h"\n \
PSEUDO_NOERROR(${.PREFIX},${.PREFIX:S/_//})\n' | \
${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o
${CPP} ${CPPFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o
@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
@rm -f ${.TARGET}.o
@ -151,7 +151,7 @@ ${LPSEUDONOERR}: ${DESTDIR}/usr/include/sys/syscall.h \
${.CURDIR}/sys/makelintstub
@echo creating ${.TARGET}
@${.CURDIR}/sys/makelintstub ${.PREFIX:S/_//} ${.PREFIX} | \
${LINT} -z ${LINTFLAGS} ${CFLAGS:M-[IDU]*} -i -o ${.TARGET} -
${LINT} -z ${LINTFLAGS} ${CPPFLAGS:M-[IDU]*} -i -o ${.TARGET} -
MAN+= accept.2 access.2 acct.2 adjtime.2 bind.2 brk.2 chdir.2 chflags.2 \
chmod.2 chown.2 chroot.2 close.2 connect.2 dup.2 execve.2 _exit.2 \