diff options
author | jb <jb@FreeBSD.org> | 1998-03-09 06:21:41 +0000 |
---|---|---|
committer | jb <jb@FreeBSD.org> | 1998-03-09 06:21:41 +0000 |
commit | 7bcfb2b05fe1896c4138734088a54aaf650026d4 (patch) | |
tree | 77efc50473740482c95edd31805ed753f0a951dc | |
parent | 19acd1aa26ec9b9ad899f1960284e6cc097e222b (diff) | |
download | FreeBSD-src-7bcfb2b05fe1896c4138734088a54aaf650026d4.zip FreeBSD-src-7bcfb2b05fe1896c4138734088a54aaf650026d4.tar.gz |
Define empty variables in case no names are added to them. This avoids
substitution errors for variables that don't exist.
If a machine architecture dependent makefile exists, include it
to discover if libc or libc_r is being built with NetBSD syscalls
instead of FreeBSD ones.
Put a NO_QUAD thingy around the quad makefile so that 64-bit
architectures can ignore that sh*t.
In the test for MDSRCS being empty, add all MISRCS to SRCS, rather
than just ignoring them.
-rw-r--r-- | lib/libc/Makefile.inc | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/lib/libc/Makefile.inc b/lib/libc/Makefile.inc index 6e29f43..b1a2e98 100644 --- a/lib/libc/Makefile.inc +++ b/lib/libc/Makefile.inc @@ -1,7 +1,22 @@ -# $Id: Makefile.inc,v 1.2 1997/10/15 16:29:08 bde Exp $ +# $Id: Makefile.inc,v 1.3 1997/10/16 13:46:42 bde Exp $ # # This file contains make rules that are shared by libc and libc_r. # +# Define (empty) variables so that make doesn't give substitution +# errors if the included makefiles don't change these: +MDSRCS= +MISRCS= +MDASM= +MIASM= +NOASM= + +# +# If there is a machine dependent makefile, use it: +# +.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/Makefile.inc) +.include "${.CURDIR}/../libc/${MACHINE_ARCH}/Makefile.inc" +.endif + .include "${.CURDIR}/../libc/db/Makefile.inc" .include "${.CURDIR}/../libc/compat-43/Makefile.inc" .include "${.CURDIR}/../libc/gen/Makefile.inc" @@ -9,7 +24,9 @@ .include "${.CURDIR}/../libc/locale/Makefile.inc" .include "${.CURDIR}/../libc/net/Makefile.inc" .include "${.CURDIR}/../libc/nls/Makefile.inc" +.if !defined(NO_QUAD) .include "${.CURDIR}/../libc/quad/Makefile.inc" +.endif .include "${.CURDIR}/../libc/regex/Makefile.inc" .include "${.CURDIR}/../libc/stdio/Makefile.inc" .include "${.CURDIR}/../libc/stdlib/Makefile.inc" @@ -23,9 +40,13 @@ CFLAGS+= -DYP .include "${.CURDIR}/../libc/yp/Makefile.inc" .endif +# If there are no machine dependent sources, append all the +# machine-independent sources: +.if empty(MDSRCS) +SRCS+= ${MISRCS} +.else # Append machine-dependent sources, then append machine-independent sources # for which there is no machine-dependent variant. -.if !empty(MDSRCS) SRCS+= ${MDSRCS} .for _src in ${MISRCS} .if ${MDSRCS:R:M${_src:R}} == "" |