diff options
Diffstat (limited to 'lib')
31 files changed, 107 insertions, 153 deletions
diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 757e2fa..c2fe829 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -16,10 +16,65 @@ CLEANFILES+=tags INSTALL_PIC_ARCHIVE= yes PRECIOUSLIB= yes +# Define (empty) variables so that make doesn't give substitution +# errors if the included makefiles don't change these: +MDSRCS= +MISRCS= +MDASM= +MIASM= +NOASM= + # -# Include make rules that are shared with libc_r. +# If there is a machine dependent makefile, use it: # -.include "${.CURDIR}/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc" +.endif + +.include "${.CURDIR}/db/Makefile.inc" +.include "${.CURDIR}/compat-43/Makefile.inc" +.include "${.CURDIR}/gen/Makefile.inc" +.if ${MACHINE_ARCH} != "powerpc" +.include "${.CURDIR}/gmon/Makefile.inc" +.endif +.include "${.CURDIR}/locale/Makefile.inc" +.include "${.CURDIR}/net/Makefile.inc" +.include "${.CURDIR}/nls/Makefile.inc" +.include "${.CURDIR}/posix1e/Makefile.inc" +.if !defined(NO_QUAD) +.include "${.CURDIR}/quad/Makefile.inc" +.endif +.include "${.CURDIR}/regex/Makefile.inc" +.include "${.CURDIR}/stdio/Makefile.inc" +.include "${.CURDIR}/stdlib/Makefile.inc" +.include "${.CURDIR}/stdtime/Makefile.inc" +.include "${.CURDIR}/string/Makefile.inc" +.include "${.CURDIR}/sys/Makefile.inc" +.include "${.CURDIR}/rpc/Makefile.inc" +.include "${.CURDIR}/uuid/Makefile.inc" +.include "${.CURDIR}/xdr/Makefile.inc" +.if !defined(NO_YP_LIBC) +CFLAGS+= -DYP +.include "${.CURDIR}/yp/Makefile.inc" +.endif +.if !defined(NO_HESIOD_LIBC) +CFLAGS+= -DHESIOD +.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. +SRCS+= ${MDSRCS} +.for _src in ${MISRCS} +.if ${MDSRCS:R:M${_src:R}} == "" +SRCS+= ${_src} +.endif +.endfor +.endif KQSRCS= adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \ lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \ diff --git a/lib/libc/Makefile.inc b/lib/libc/Makefile.inc deleted file mode 100644 index be65f3f..0000000 --- a/lib/libc/Makefile.inc +++ /dev/null @@ -1,63 +0,0 @@ -# $FreeBSD$ -# -# 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" -.if ${MACHINE_ARCH} != "powerpc" -.include "${.CURDIR}/../libc/gmon/Makefile.inc" -.endif -.include "${.CURDIR}/../libc/locale/Makefile.inc" -.include "${.CURDIR}/../libc/net/Makefile.inc" -.include "${.CURDIR}/../libc/nls/Makefile.inc" -.include "${.CURDIR}/../libc/posix1e/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" -.include "${.CURDIR}/../libc/stdtime/Makefile.inc" -.include "${.CURDIR}/../libc/string/Makefile.inc" -.include "${.CURDIR}/../libc/sys/Makefile.inc" -.include "${.CURDIR}/../libc/rpc/Makefile.inc" -.include "${.CURDIR}/../libc/uuid/Makefile.inc" -.include "${.CURDIR}/../libc/xdr/Makefile.inc" -.if !defined(NO_YP_LIBC) -CFLAGS+= -DYP -.include "${.CURDIR}/../libc/yp/Makefile.inc" -.endif -.if !defined(NO_HESIOD_LIBC) -CFLAGS+= -DHESIOD -.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. -SRCS+= ${MDSRCS} -.for _src in ${MISRCS} -.if ${MDSRCS:R:M${_src:R}} == "" -SRCS+= ${_src} -.endif -.endfor -.endif diff --git a/lib/libc/alpha/gen/Makefile.inc b/lib/libc/alpha/gen/Makefile.inc index 4e9d287..4d0796c 100644 --- a/lib/libc/alpha/gen/Makefile.inc +++ b/lib/libc/alpha/gen/Makefile.inc @@ -14,34 +14,34 @@ CLEANFILES+= __divqu.S __divq.S __divlu.S __divl.S CLEANFILES+= __remqu.S __remq.S __remlu.S __reml.S -__divqu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__divqu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divqu -DOP=div -DS=false -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__divq.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__divq.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divq -DOP=div -DS=true -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__divlu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__divlu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divlu -DOP=div -DS=false -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} -__divl.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__divl.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divl -DOP=div -DS=true -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} -__remqu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__remqu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__remqu -DOP=rem -DS=false -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__remq.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__remq.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__remq -DOP=rem -DS=true -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__remlu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__remlu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__remlu -DOP=rem -DS=false -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} -__reml.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__reml.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__reml -DOP=rem -DS=true -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} diff --git a/lib/libc/amd64/sys/Makefile.inc b/lib/libc/amd64/sys/Makefile.inc index 4ac7b3d..d928ea9 100644 --- a/lib/libc/amd64/sys/Makefile.inc +++ b/lib/libc/amd64/sys/Makefile.inc @@ -14,11 +14,9 @@ NOASM= break.o exit.o ftruncate.o getdomainname.o getlogin.o \ PSEUDO= _getlogin.o _exit.o -.if ${LIB} == "c" MAN+= i386_get_ioperm.2 i386_get_ldt.2 i386_vm86.2 MAN+= i386_set_watch.3 MLINKS+=i386_get_ioperm.2 i386_set_ioperm.2 MLINKS+=i386_get_ldt.2 i386_set_ldt.2 MLINKS+=i386_set_watch.3 i386_clr_watch.3 -.endif diff --git a/lib/libc/compat-43/Makefile.inc b/lib/libc/compat-43/Makefile.inc index dc930e0..2eca953 100644 --- a/lib/libc/compat-43/Makefile.inc +++ b/lib/libc/compat-43/Makefile.inc @@ -2,12 +2,11 @@ # $FreeBSD$ # compat-43 sources -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/compat-43 ${.CURDIR}/../libc/compat-43 +.PATH: ${.CURDIR}/${MACHINE_ARCH}/compat-43 ${.CURDIR}/compat-43 SRCS+= creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \ setrgid.c setruid.c sigcompat.c -.if ${LIB} == "c" MAN+= creat.2 killpg.2 sigpause.2 sigsetmask.2 sigvec.2 MAN+= gethostid.3 setruid.3 @@ -16,4 +15,3 @@ MLINKS+=setruid.3 setrgid.3 MLINKS+=sigsetmask.2 sigblock.2 MLINKS+=sigsetmask.2 sigmask.2 -.endif diff --git a/lib/libc/db/Makefile.inc b/lib/libc/db/Makefile.inc index 8bd4dd6..72fbb4f 100644 --- a/lib/libc/db/Makefile.inc +++ b/lib/libc/db/Makefile.inc @@ -3,9 +3,9 @@ # CFLAGS+=-D__DBINTERFACE_PRIVATE -.include "${.CURDIR}/../libc/db/btree/Makefile.inc" -.include "${.CURDIR}/../libc/db/db/Makefile.inc" -.include "${.CURDIR}/../libc/db/hash/Makefile.inc" -.include "${.CURDIR}/../libc/db/man/Makefile.inc" -.include "${.CURDIR}/../libc/db/mpool/Makefile.inc" -.include "${.CURDIR}/../libc/db/recno/Makefile.inc" +.include "${.CURDIR}/db/btree/Makefile.inc" +.include "${.CURDIR}/db/db/Makefile.inc" +.include "${.CURDIR}/db/hash/Makefile.inc" +.include "${.CURDIR}/db/man/Makefile.inc" +.include "${.CURDIR}/db/mpool/Makefile.inc" +.include "${.CURDIR}/db/recno/Makefile.inc" diff --git a/lib/libc/db/btree/Makefile.inc b/lib/libc/db/btree/Makefile.inc index 33c630f..76c2238 100644 --- a/lib/libc/db/btree/Makefile.inc +++ b/lib/libc/db/btree/Makefile.inc @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 7/14/94 # $FreeBSD$ -.PATH: ${.CURDIR}/../libc/db/btree +.PATH: ${.CURDIR}/db/btree SRCS+= bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c bt_open.c \ bt_overflow.c bt_page.c bt_put.c bt_search.c bt_seq.c bt_split.c \ diff --git a/lib/libc/db/db/Makefile.inc b/lib/libc/db/db/Makefile.inc index 03cb1a8..2bbac4e 100644 --- a/lib/libc/db/db/Makefile.inc +++ b/lib/libc/db/db/Makefile.inc @@ -1,6 +1,6 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../libc/db/db +.PATH: ${.CURDIR}/db/db SRCS+= db.c diff --git a/lib/libc/db/hash/Makefile.inc b/lib/libc/db/hash/Makefile.inc index 0bc0e42..2ecb817 100644 --- a/lib/libc/db/hash/Makefile.inc +++ b/lib/libc/db/hash/Makefile.inc @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../libc/db/hash +.PATH: ${.CURDIR}/db/hash SRCS+= hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \ hash_page.c ndbm.c diff --git a/lib/libc/db/man/Makefile.inc b/lib/libc/db/man/Makefile.inc index 216b756..349b029 100644 --- a/lib/libc/db/man/Makefile.inc +++ b/lib/libc/db/man/Makefile.inc @@ -1,9 +1,8 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../libc/db/man +.PATH: ${.CURDIR}/db/man -.if ${LIB} == "c" MAN+= btree.3 dbm.3 dbopen.3 hash.3 mpool.3 recno.3 MLINKS+= dbm.3 dbm_clearerr.3 @@ -17,4 +16,3 @@ MLINKS+= dbm.3 dbm_nextkey.3 MLINKS+= dbm.3 dbm_open.3 MLINKS+= dbm.3 dbm_store.3 MLINKS+= dbopen.3 db.3 -.endif diff --git a/lib/libc/db/mpool/Makefile.inc b/lib/libc/db/mpool/Makefile.inc index 461e62a..9fef712 100644 --- a/lib/libc/db/mpool/Makefile.inc +++ b/lib/libc/db/mpool/Makefile.inc @@ -1,6 +1,6 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../libc/db/mpool +.PATH: ${.CURDIR}/db/mpool SRCS+= mpool.c diff --git a/lib/libc/db/recno/Makefile.inc b/lib/libc/db/recno/Makefile.inc index 295332e..6e08e3f 100644 --- a/lib/libc/db/recno/Makefile.inc +++ b/lib/libc/db/recno/Makefile.inc @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../libc/db/recno +.PATH: ${.CURDIR}/db/recno SRCS+= rec_close.c rec_delete.c rec_get.c rec_open.c rec_put.c rec_search.c \ rec_seq.c rec_utils.c diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index d038b81..ba35e04 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -2,7 +2,7 @@ # $FreeBSD$ # machine-independent gen sources -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/gen ${.CURDIR}/../libc/gen +.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen SRCS+= __xuname.c _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \ alarm.c arc4random.c assert.c basename.c check_utility_compat.c \ @@ -32,11 +32,10 @@ SRCS+= __xuname.c _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \ valloc.c vis.c wait.c wait3.c waitpid.c # machine-dependent gen sources -.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/gen/Makefile.inc) -.include "${.CURDIR}/../libc/${MACHINE_ARCH}/gen/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc" .endif -.if ${LIB} == "c" MAN+= alarm.3 arc4random.3 \ basename.3 check_utility_compat.3 clock.3 \ confstr.3 ctermid.3 daemon.3 \ @@ -132,4 +131,3 @@ MLINKS+=ttyname.3 isatty.3 ttyname.3 ttyslot.3 MLINKS+=tzset.3 tzsetwall.3 MLINKS+=unvis.3 strunvis.3 unvis.3 strunvisx.3 MLINKS+=vis.3 strvis.3 vis.3 strvisx.3 -.endif diff --git a/lib/libc/gmon/Makefile.inc b/lib/libc/gmon/Makefile.inc index ca13d5e..36d47e5 100644 --- a/lib/libc/gmon/Makefile.inc +++ b/lib/libc/gmon/Makefile.inc @@ -2,15 +2,13 @@ # $FreeBSD$ # gmon sources -.PATH: ${.CURDIR}/../libc/gmon +.PATH: ${.CURDIR}/gmon SRCS+= gmon.c mcount.c -.if ${LIB} == "c" MAN+= moncontrol.3 MLINKS+=moncontrol.3 monstartup.3 -.endif # mcount cannot be compiled with profiling mcount.po: mcount.o diff --git a/lib/libc/i386/sys/Makefile.inc b/lib/libc/i386/sys/Makefile.inc index 4ac7b3d..d928ea9 100644 --- a/lib/libc/i386/sys/Makefile.inc +++ b/lib/libc/i386/sys/Makefile.inc @@ -14,11 +14,9 @@ NOASM= break.o exit.o ftruncate.o getdomainname.o getlogin.o \ PSEUDO= _getlogin.o _exit.o -.if ${LIB} == "c" MAN+= i386_get_ioperm.2 i386_get_ldt.2 i386_vm86.2 MAN+= i386_set_watch.3 MLINKS+=i386_get_ioperm.2 i386_set_ioperm.2 MLINKS+=i386_get_ldt.2 i386_set_ldt.2 MLINKS+=i386_set_watch.3 i386_clr_watch.3 -.endif diff --git a/lib/libc/locale/Makefile.inc b/lib/libc/locale/Makefile.inc index 08f94ce..844c372 100644 --- a/lib/libc/locale/Makefile.inc +++ b/lib/libc/locale/Makefile.inc @@ -2,7 +2,7 @@ # $FreeBSD$ # locale sources -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/locale ${.CURDIR}/../libc/locale +.PATH: ${.CURDIR}/${MACHINE_ARCH}/locale ${.CURDIR}/locale SRCS+= big5.c btowc.c collate.c collcmp.c euc.c fix_grouping.c frune.c \ isctype.c iswctype.c \ @@ -18,7 +18,6 @@ SRCS+= big5.c btowc.c collate.c collcmp.c euc.c fix_grouping.c frune.c \ wcstoul.c wcstoull.c wcstoumax.c wctob.c wctomb.c wctrans.c wctype.c \ wcwidth.c -.if ${LIB} == "c" MAN+= btowc.3 \ ctype.3 digittoint.3 isalnum.3 isalpha.3 isascii.3 isblank.3 iscntrl.3 \ isdigit.3 isgraph.3 islower.3 isprint.3 ispunct.3 isspace.3 \ @@ -55,4 +54,3 @@ MLINKS+=wcstol.3 wcstoul.3 wcstol.3 wcstoll.3 wcstol.3 wcstoull.3 \ wcstol.3 wcstoimax.3 wcstol.3 wcstoumax.3 MLINKS+=wctrans.3 towctrans.3 MLINKS+=wctype.3 iswctype.3 -.endif diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc index c07241f..c952d51 100644 --- a/lib/libc/net/Makefile.inc +++ b/lib/libc/net/Makefile.inc @@ -2,7 +2,7 @@ # $FreeBSD$ # machine-independent net sources -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/net ${.CURDIR}/../libc/net +.PATH: ${.CURDIR}/${MACHINE_ARCH}/net ${.CURDIR}/net SRCS+= addr2ascii.c ascii2addr.c base64.c ether_addr.c getaddrinfo.c \ gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \ @@ -37,11 +37,10 @@ nslexer.c: nslexer.l nsparser.h sed -e '/YY_BUF_SIZE/s/16384/1024/' >${.TARGET} # machine-dependent net sources -.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/net/Makefile.inc) -.include "${.CURDIR}/../libc/${MACHINE_ARCH}/net/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc" .endif -.if ${LIB} == "c" MAN+= addr2ascii.3 byteorder.3 ethers.3 getaddrinfo.3 gethostbyname.3 \ getifaddrs.3 getipnodebyname.3 \ getnameinfo.3 getnetent.3 getprotoent.3 getservent.3 hesiod.3 \ @@ -100,4 +99,3 @@ MLINKS+=resolver.3 dn_comp.3 resolver.3 dn_expand.3 resolver.3 res_init.3 \ resolver.3 res_search.3 resolver.3 res_send.3 resolver.3 dn_skipname.3 \ resolver.3 ns_get16.3 resolver.3 ns_get32.3 \ resolver.3 ns_put16.3 resolver.3 ns_put32.3 -.endif diff --git a/lib/libc/nls/Makefile.inc b/lib/libc/nls/Makefile.inc index c124d67..9adab3d 100644 --- a/lib/libc/nls/Makefile.inc +++ b/lib/libc/nls/Makefile.inc @@ -1,10 +1,8 @@ # from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $ # $FreeBSD$ -.PATH: ${.CURDIR}/../libc/nls +.PATH: ${.CURDIR}/nls SRCS+= msgcat.c -.if ${LIB} == "c" MAN+= catclose.3 catgets.3 catopen.3 -.endif diff --git a/lib/libc/posix1e/Makefile.inc b/lib/libc/posix1e/Makefile.inc index 8af2297..4e6f98a 100644 --- a/lib/libc/posix1e/Makefile.inc +++ b/lib/libc/posix1e/Makefile.inc @@ -2,7 +2,7 @@ MAINTAINER= rwatson@FreeBSD.org -.PATH: ${.CURDIR}/../libc/posix1e +.PATH: ${.CURDIR}/posix1e SRCS+= acl_calc_mask.c \ acl_copy.c \ @@ -24,8 +24,6 @@ SRCS+= acl_calc_mask.c \ mac_get.c \ mac_set.c -.if ${LIB} == "c" - MAN+= acl.3 \ acl_add_perm.3 \ acl_calc_mask.3 \ @@ -81,5 +79,3 @@ MLINKS+=acl_delete.3 acl_delete_def_file.3 \ mac_set.3 mac_set_proc.3 \ mac_text.3 mac_from_text.3 \ mac_text.3 mac_to_text.3 - -.endif diff --git a/lib/libc/quad/Makefile.inc b/lib/libc/quad/Makefile.inc index 9934328..c2e2255 100644 --- a/lib/libc/quad/Makefile.inc +++ b/lib/libc/quad/Makefile.inc @@ -2,7 +2,7 @@ # $FreeBSD$ # Quad support, if needed -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/quad ${.CURDIR}/../libc/quad +.PATH: ${.CURDIR}/${MACHINE_ARCH}/quad ${.CURDIR}/quad .if ${MACHINE_ARCH} == "i386" diff --git a/lib/libc/regex/Makefile.inc b/lib/libc/regex/Makefile.inc index 5346801..221400d 100644 --- a/lib/libc/regex/Makefile.inc +++ b/lib/libc/regex/Makefile.inc @@ -2,16 +2,14 @@ # $FreeBSD$ # regex sources -.PATH: ${.CURDIR}/../libc/regex +.PATH: ${.CURDIR}/regex CFLAGS+=-DPOSIX_MISTAKE SRCS+= regcomp.c regerror.c regexec.c regfree.c -.if ${LIB} == "c" MAN+= regex.3 MAN+= re_format.7 MLINKS+=regex.3 regcomp.3 regex.3 regexec.3 regex.3 regerror.3 MLINKS+=regexec.3 regfree.3 -.endif diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc index cffda6c..c349d5a 100644 --- a/lib/libc/rpc/Makefile.inc +++ b/lib/libc/rpc/Makefile.inc @@ -1,7 +1,7 @@ # @(#)Makefile 5.11 (Berkeley) 9/6/90 # $FreeBSD$ -.PATH: ${.CURDIR}/../libc/rpc ${.CURDIR}/. +.PATH: ${.CURDIR}/rpc ${.CURDIR}/. SRCS+= auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \ clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \ clnt_vc.c rpc_dtablesize.c getnetconfig.c getnetpath.c getrpcent.c \ diff --git a/lib/libc/sparc64/fpu/Makefile.inc b/lib/libc/sparc64/fpu/Makefile.inc index 5e119b7..1974d8a 100644 --- a/lib/libc/sparc64/fpu/Makefile.inc +++ b/lib/libc/sparc64/fpu/Makefile.inc @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../libc/sparc64/fpu +.PATH: ${.CURDIR}/sparc64/fpu CFLAGS+= -I${.CURDIR}/sparc64/sys diff --git a/lib/libc/stdio/Makefile.inc b/lib/libc/stdio/Makefile.inc index 7ab0337..63b81f3 100644 --- a/lib/libc/stdio/Makefile.inc +++ b/lib/libc/stdio/Makefile.inc @@ -2,7 +2,7 @@ # $FreeBSD$ # stdio sources -.PATH: ${.CURDIR}/../libc/stdio +.PATH: ${.CURDIR}/stdio SRCS+= _flock_stub.c asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c \ fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetwc.c fgetws.c \ @@ -21,7 +21,6 @@ SRCS+= _flock_stub.c asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c \ vswprintf.c vswscanf.c vwprintf.c vwscanf.c wbuf.c wprintf.c wscanf.c \ wsetup.c -.if ${LIB} == "c" MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetws.3 fopen.3 fputs.3 \ fputws.3 fread.3 fseek.3 funopen.3 fwide.3 getc.3 getwc.3 mktemp.3 \ printf.3 putc.3 putwc.3 remove.3 scanf.3 setbuf.3 stdio.3 tmpnam.3 \ @@ -54,4 +53,3 @@ MLINKS+=wprintf.3 fwprintf.3 wprintf.3 swprintf.3 \ wprintf.3 vwprintf.3 wprintf.3 vfwprintf.3 wprintf.3 vswprintf.3 MLINKS+=wscanf.3 fwscanf.3 wscanf.3 swscanf.3 wscanf.3 vwscanf.3 \ wscanf.3 vswscanf.3 wscanf.3 vfwscanf.3 -.endif diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index a21e4c4..e388908 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -2,7 +2,7 @@ # $FreeBSD$ # machine-independent stdlib sources -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/stdlib ${.CURDIR}/../libc/stdlib +.PATH: ${.CURDIR}/${MACHINE_ARCH}/stdlib ${.CURDIR}/stdlib MISRCS+=_Exit.c abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \ bsearch.c calloc.c div.c exit.c getenv.c getopt.c getopt_long.c \ @@ -14,11 +14,10 @@ MISRCS+=_Exit.c abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \ system.c tdelete.c tfind.c tsearch.c twalk.c # machine-dependent stdlib sources -.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/stdlib/Makefile.inc) -.include "${.CURDIR}/../libc/${MACHINE_ARCH}/stdlib/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/stdlib/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/stdlib/Makefile.inc" .endif -.if ${LIB} == "c" MAN+= abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 bsearch.3 \ div.3 exit.3 getenv.3 getopt.3 getopt_long.3 getsubopt.3 hcreate.3 \ imaxabs.3 imaxdiv.3 insque.3 labs.3 ldiv.3 llabs.3 lldiv.3 \ @@ -39,4 +38,3 @@ MLINKS+=strtol.3 strtoll.3 strtol.3 strtoq.3 strtol.3 strtoimax.3 MLINKS+=strtoul.3 strtoull.3 strtoul.3 strtouq.3 strtoul.3 strtoumax.3 MLINKS+=malloc.3 calloc.3 malloc.3 free.3 malloc.3 realloc.3 malloc.3 reallocf.3 MLINKS+=tsearch.3 tdelete.3 tsearch.3 tfind.3 tsearch.3 twalk.3 -.endif diff --git a/lib/libc/stdtime/Makefile.inc b/lib/libc/stdtime/Makefile.inc index f9abc71..003b62b 100644 --- a/lib/libc/stdtime/Makefile.inc +++ b/lib/libc/stdtime/Makefile.inc @@ -1,12 +1,11 @@ # Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp # $FreeBSD$ -.PATH: ${.CURDIR}/../libc/stdtime ${.CURDIR}/../locale +.PATH: ${.CURDIR}/stdtime ${.CURDIR}/../locale SRCS+= asctime.c difftime.c localtime.c strftime.c strptime.c timelocal.c \ time32.c -.if ${LIB} == "c" MAN+= ctime.3 strftime.3 strptime.3 time2posix.3 MAN+= tzfile.5 @@ -15,4 +14,3 @@ MLINKS+=ctime.3 asctime.3 ctime.3 difftime.3 ctime.3 gmtime.3 \ ctime.3 ctime_r.3 ctime.3 localtime_r.3 ctime.3 gmtime_r.3 \ ctime.3 asctime_r.3 MLINKS+=time2posix.3 posix2time.3 -.endif diff --git a/lib/libc/string/Makefile.inc b/lib/libc/string/Makefile.inc index 63c7af0..8621f26 100644 --- a/lib/libc/string/Makefile.inc +++ b/lib/libc/string/Makefile.inc @@ -1,9 +1,9 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/string ${.CURDIR}/../libc/string +.PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string -CFLAGS+= -I${.CURDIR}/../libc/locale +CFLAGS+= -I${.CURDIR}/locale # machine-independent string sources MISRCS+=bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \ @@ -21,11 +21,10 @@ MISRCS+=bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \ # machine-dependent string sources -.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/string/Makefile.inc) -.include "${.CURDIR}/../libc/${MACHINE_ARCH}/string/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc" .endif -.if ${LIB} == "c" MAN+= bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \ memcmp.3 memcpy.3 memmove.3 memset.3 rindex.3 strcasecmp.3 strcat.3 \ strchr.3 strcmp.3 strcoll.3 strcpy.3 strcspn.3 strdup.3 strerror.3 \ @@ -54,4 +53,3 @@ MLINKS+=wmemchr.3 wmemcmp.3 wmemchr.3 wmemcpy.3 \ wmemchr.3 wcsncpy.3 wmemchr.3 wcspbrk.3 \ wmemchr.3 wcsrchr.3 wmemchr.3 wcsspn.3 \ wmemchr.3 wcsstr.3 -.endif diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index 87523a8..4fe3d7e 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -2,7 +2,7 @@ # $FreeBSD$ # sys sources -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys ${.CURDIR}/../libc/sys +.PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys # Include the generated makefile containing the *complete* list # of syscall names in MIASM. @@ -13,8 +13,8 @@ # MDASM names override the default syscall names in MIASM. # NOASM will prevent the default syscall code from being generated. # -.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/sys/Makefile.inc) -.include "${.CURDIR}/../libc/${MACHINE_ARCH}/sys/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/sys/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/sys/Makefile.inc" .endif # Sources common to both syscall interfaces: @@ -53,7 +53,6 @@ ${SPSEUDO}: printf '#include "SYS.h"\nPSEUDO(${.PREFIX:S/_//})\n' \ > ${.TARGET} -.if ${LIB} == "c" MAN+= _exit.2 accept.2 access.2 acct.2 adjtime.2 \ aio_cancel.2 aio_error.2 aio_read.2 aio_return.2 \ aio_suspend.2 aio_waitcomplete.2 aio_write.2 \ @@ -142,4 +141,3 @@ MLINKS+=sched_get_priority_max.2 sched_get_priority_min.2 \ MLINKS+=sched_setparam.2 sched_getparam.2 MLINKS+=sched_setscheduler.2 sched_getscheduler.2 .endif -.endif diff --git a/lib/libc/uuid/Makefile.inc b/lib/libc/uuid/Makefile.inc index d33f80b..022d556 100644 --- a/lib/libc/uuid/Makefile.inc +++ b/lib/libc/uuid/Makefile.inc @@ -2,12 +2,11 @@ # DCE 1.1 UUID implementation sources -.PATH: ${.CURDIR}/../libc/uuid +.PATH: ${.CURDIR}/uuid SRCS+= uuid_compare.c uuid_create.c uuid_create_nil.c uuid_equal.c \ uuid_from_string.c uuid_hash.c uuid_is_nil.c uuid_to_string.c -.if ${LIB} == "c" MAN+= uuid.3 MLINKS+=uuid.3 uuid_compare.3 MLINKS+=uuid.3 uuid_create.3 @@ -17,4 +16,3 @@ MLINKS+=uuid.3 uuid_from_string.3 MLINKS+=uuid.3 uuid_hash.3 MLINKS+=uuid.3 uuid_is_nil.3 MLINKS+=uuid.3 uuid_to_string.3 -.endif diff --git a/lib/libc/xdr/Makefile.inc b/lib/libc/xdr/Makefile.inc index 4a841ff..60bd698 100644 --- a/lib/libc/xdr/Makefile.inc +++ b/lib/libc/xdr/Makefile.inc @@ -1,11 +1,10 @@ # @(#)Makefile 5.11 (Berkeley) 9/6/90 # $FreeBSD$ -.PATH: ${.CURDIR}/../libc/xdr ${.CURDIR}/. +.PATH: ${.CURDIR}/xdr ${.CURDIR}/. SRCS+= xdr.c xdr_array.c xdr_float.c xdr_mem.c \ xdr_rec.c xdr_reference.c xdr_stdio.c -.if ${LIB} == "c" MAN+= xdr.3 MLINKS+= rpc_xdr.3 xdr_accepted_reply.3 \ @@ -47,4 +46,3 @@ MLINKS+= rpc_xdr.3 xdr_accepted_reply.3 \ xdr.3 xdr_vector.3 \ xdr.3 xdr_void.3 \ xdr.3 xdr_wrapstring.3 -.endif diff --git a/lib/libc/yp/Makefile.inc b/lib/libc/yp/Makefile.inc index 2112aeb..0ce6dae 100644 --- a/lib/libc/yp/Makefile.inc +++ b/lib/libc/yp/Makefile.inc @@ -2,7 +2,7 @@ # $FreeBSD$ # yp sources -.PATH: ${.CURDIR}/../libc/yp +.PATH: ${.CURDIR}/yp SRCS+= xdryp.c yp.h yp_xdr.c yplib.c CLEANFILES+= yp.h yp_xdr.c |
