Author: marcel
Date: Tue Mar 4 02:19:39 2014
New Revision: 262722
URL: http://svnweb.freebsd.org/changeset/base/262722
Log:
Replace use of ${.CURDIR} by ${LIBC_SRCTOP} and define ${LIBC_SRCTOP}
if not already defined. This allows building libc from outside of
lib/libc using a reach-over makefile.
A typical use-case is to build a standard ILP32 version and a COMPAT32
version in a single iteration by building the COMPAT32 version using a
reach-over makefile.
Obtained from: Juniper Networks, Inc.
Modified:
head/lib/libc/Makefile
head/lib/libc/amd64/Makefile.inc
head/lib/libc/arm/Makefile.inc
head/lib/libc/arm/aeabi/Makefile.inc
head/lib/libc/capability/Makefile.inc
head/lib/libc/compat-43/Makefile.inc
head/lib/libc/db/Makefile.inc
head/lib/libc/db/btree/Makefile.inc
head/lib/libc/db/db/Makefile.inc
head/lib/libc/db/hash/Makefile.inc
head/lib/libc/db/man/Makefile.inc
head/lib/libc/db/mpool/Makefile.inc
head/lib/libc/db/recno/Makefile.inc
head/lib/libc/gdtoa/Makefile.inc
head/lib/libc/gen/Makefile.inc
head/lib/libc/gmon/Makefile.inc
head/lib/libc/i386/Makefile.inc
head/lib/libc/ia64/Makefile.inc
head/lib/libc/iconv/Makefile.inc
head/lib/libc/inet/Makefile.inc
head/lib/libc/isc/Makefile.inc
head/lib/libc/locale/Makefile.inc
head/lib/libc/mips/Makefile.inc
head/lib/libc/nameser/Makefile.inc
head/lib/libc/net/Makefile.inc
head/lib/libc/nls/Makefile.inc
head/lib/libc/posix1e/Makefile.inc
head/lib/libc/powerpc/Makefile.inc
head/lib/libc/powerpc64/Makefile.inc
head/lib/libc/quad/Makefile.inc
head/lib/libc/regex/Makefile.inc
head/lib/libc/resolv/Makefile.inc
head/lib/libc/rpc/Makefile.inc
head/lib/libc/softfloat/Makefile.inc
head/lib/libc/sparc64/Makefile.inc
head/lib/libc/sparc64/fpu/Makefile.inc
head/lib/libc/sparc64/sys/Makefile.inc
head/lib/libc/stdio/Makefile.inc
head/lib/libc/stdlib/Makefile.inc
head/lib/libc/stdlib/jemalloc/Makefile.inc
head/lib/libc/stdtime/Makefile.inc
head/lib/libc/string/Makefile.inc
head/lib/libc/sys/Makefile.inc
head/lib/libc/uuid/Makefile.inc
head/lib/libc/xdr/Makefile.inc
head/lib/libc/yp/Makefile.inc
Modified: head/lib/libc/Makefile
==============================================================================
--- head/lib/libc/Makefile Tue Mar 4 01:14:37 2014 (r262721)
+++ head/lib/libc/Makefile Tue Mar 4 02:19:39 2014 (r262722)
@@ -5,11 +5,13 @@ SHLIBDIR?= /lib
.include <bsd.own.mk>
+LIBC_SRCTOP?= ${.CURDIR}
+
# Pick the current architecture directory for libc. In general, this is
# named MACHINE_CPUARCH, but some ABIs are different enough to require
# their own libc, so allow a directory named MACHINE_ARCH to override this.
-.if exists(${.CURDIR}/${MACHINE_ARCH})
+.if exists(${LIBC_SRCTOP}/${MACHINE_ARCH})
LIBC_ARCH=${MACHINE_ARCH}
.else
LIBC_ARCH=${MACHINE_CPUARCH}
@@ -25,8 +27,8 @@ LIB=c
SHLIB_MAJOR= 7
SHLIB_LDSCRIPT=libc.ldscript
WARNS?= 2
-CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include
-CFLAGS+=-I${.CURDIR}/${LIBC_ARCH}
+CFLAGS+=-I${LIBC_SRCTOP}/include -I${LIBC_SRCTOP}/../../include
+CFLAGS+=-I${LIBC_SRCTOP}/${LIBC_ARCH}
.if ${MK_NLS} != "no"
CFLAGS+=-DNLS
.endif
@@ -61,49 +63,49 @@ MDASM=
MIASM=
NOASM=
-.include "${.CURDIR}/${LIBC_ARCH}/Makefile.inc"
-.include "${.CURDIR}/db/Makefile.inc"
-.include "${.CURDIR}/compat-43/Makefile.inc"
-.include "${.CURDIR}/gdtoa/Makefile.inc"
-.include "${.CURDIR}/gen/Makefile.inc"
-.include "${.CURDIR}/gmon/Makefile.inc"
+.include "${LIBC_SRCTOP}/${LIBC_ARCH}/Makefile.inc"
+.include "${LIBC_SRCTOP}/db/Makefile.inc"
+.include "${LIBC_SRCTOP}/compat-43/Makefile.inc"
+.include "${LIBC_SRCTOP}/gdtoa/Makefile.inc"
+.include "${LIBC_SRCTOP}/gen/Makefile.inc"
+.include "${LIBC_SRCTOP}/gmon/Makefile.inc"
.if ${MK_ICONV} != "no"
-.include "${.CURDIR}/iconv/Makefile.inc"
+.include "${LIBC_SRCTOP}/iconv/Makefile.inc"
.endif
-.include "${.CURDIR}/inet/Makefile.inc"
-.include "${.CURDIR}/isc/Makefile.inc"
-.include "${.CURDIR}/locale/Makefile.inc"
-.include "${.CURDIR}/nameser/Makefile.inc"
-.include "${.CURDIR}/net/Makefile.inc"
-.include "${.CURDIR}/nls/Makefile.inc"
-.include "${.CURDIR}/posix1e/Makefile.inc"
+.include "${LIBC_SRCTOP}/inet/Makefile.inc"
+.include "${LIBC_SRCTOP}/isc/Makefile.inc"
+.include "${LIBC_SRCTOP}/locale/Makefile.inc"
+.include "${LIBC_SRCTOP}/nameser/Makefile.inc"
+.include "${LIBC_SRCTOP}/net/Makefile.inc"
+.include "${LIBC_SRCTOP}/nls/Makefile.inc"
+.include "${LIBC_SRCTOP}/posix1e/Makefile.inc"
.if ${LIBC_ARCH} != "amd64" && \
${LIBC_ARCH} != "ia64" && \
${LIBC_ARCH} != "powerpc64" && \
${LIBC_ARCH} != "sparc64" && \
${MACHINE_ARCH:Mmipsn32*} == "" && \
${MACHINE_ARCH:Mmips64*} == ""
-.include "${.CURDIR}/quad/Makefile.inc"
+.include "${LIBC_SRCTOP}/quad/Makefile.inc"
.endif
-.include "${.CURDIR}/regex/Makefile.inc"
-.include "${.CURDIR}/resolv/Makefile.inc"
-.include "${.CURDIR}/stdio/Makefile.inc"
-.include "${.CURDIR}/stdlib/Makefile.inc"
-.include "${.CURDIR}/stdlib/jemalloc/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"
+.include "${LIBC_SRCTOP}/regex/Makefile.inc"
+.include "${LIBC_SRCTOP}/resolv/Makefile.inc"
+.include "${LIBC_SRCTOP}/stdio/Makefile.inc"
+.include "${LIBC_SRCTOP}/stdlib/Makefile.inc"
+.include "${LIBC_SRCTOP}/stdlib/jemalloc/Makefile.inc"
+.include "${LIBC_SRCTOP}/stdtime/Makefile.inc"
+.include "${LIBC_SRCTOP}/string/Makefile.inc"
+.include "${LIBC_SRCTOP}/sys/Makefile.inc"
+.include "${LIBC_SRCTOP}/rpc/Makefile.inc"
+.include "${LIBC_SRCTOP}/uuid/Makefile.inc"
+.include "${LIBC_SRCTOP}/xdr/Makefile.inc"
.if ${LIBC_ARCH} == "arm" || ${LIBC_ARCH} == "mips"
-.include "${.CURDIR}/softfloat/Makefile.inc"
+.include "${LIBC_SRCTOP}/softfloat/Makefile.inc"
.endif
.if ${MK_NIS} != "no"
CFLAGS+= -DYP
-.include "${.CURDIR}/yp/Makefile.inc"
+.include "${LIBC_SRCTOP}/yp/Makefile.inc"
.endif
-.include "${.CURDIR}/capability/Makefile.inc"
+.include "${LIBC_SRCTOP}/capability/Makefile.inc"
.if ${MK_HESIOD} != "no"
CFLAGS+= -DHESIOD
.endif
@@ -119,7 +121,7 @@ CFLAGS+=-D_FREEFALL_CONFIG
STATICOBJS+=${LIBC_NONSHARED_SRCS:S/.c$/.o/}
-VERSION_DEF=${.CURDIR}/Versions.def
+VERSION_DEF=${LIBC_SRCTOP}/Versions.def
SYMBOL_MAPS=${SYM_MAPS}
CFLAGS+= -DSYMBOL_VERSIONING
@@ -147,7 +149,7 @@ KSRCS= bcmp.c ffs.c ffsl.c fls.c flsl.c
libkern: libkern.gen libkern.${LIBC_ARCH}
libkern.gen: ${KQSRCS} ${KSRCS}
- cp -p ${.CURDIR}/quad/quad.h ${.ALLSRC} ${DESTDIR}/sys/libkern
+ cp -p ${LIBC_SRCTOP}/quad/quad.h ${.ALLSRC} ${DESTDIR}/sys/libkern
libkern.${LIBC_ARCH}:: ${KMSRCS}
.if defined(KMSRCS) && !empty(KMSRCS)
Modified: head/lib/libc/amd64/Makefile.inc
==============================================================================
--- head/lib/libc/amd64/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/amd64/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -6,4 +6,4 @@
# Long double is 80 bits
GDTOASRCS+=strtorx.c
MDSRCS+=machdep_ldisx.c
-SYM_MAPS+=${.CURDIR}/amd64/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/amd64/Symbol.map
Modified: head/lib/libc/arm/Makefile.inc
==============================================================================
--- head/lib/libc/arm/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/arm/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -7,12 +7,12 @@ SOFTFLOAT_BITS=32
# Long double is just double precision.
MDSRCS+=machdep_ldisd.c
-SYM_MAPS+=${.CURDIR}/arm/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/arm/Symbol.map
.if ${MK_ARM_EABI} == "no"
# This contains the symbols that were removed when moving to the ARM EABI
-SYM_MAPS+=${.CURDIR}/arm/Symbol_oabi.map
+SYM_MAPS+=${LIBC_SRCTOP}/arm/Symbol_oabi.map
.else
-.include "${.CURDIR}/arm/aeabi/Makefile.inc"
+.include "${LIBC_SRCTOP}/arm/aeabi/Makefile.inc"
.endif
Modified: head/lib/libc/arm/aeabi/Makefile.inc
==============================================================================
--- head/lib/libc/arm/aeabi/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/arm/aeabi/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/arm/aeabi
+.PATH: ${LIBC_SRCTOP}/arm/aeabi
SRCS+= aeabi_atexit.c \
aeabi_double.c \
@@ -11,7 +11,7 @@ SRCS+= aeabi_atexit.c \
# libc. This causes issues when other parts of libc call these functions.
# We work around this by including these functions in libc but mark them as
# hidden so users of libc will not pick up these versions.
-.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/arm
+.PATH: ${LIBC_SRCTOP}/../../contrib/compiler-rt/lib/arm
SRCS+= aeabi_memcmp.S \
aeabi_memcpy.S \
@@ -26,5 +26,5 @@ CFLAGS.aeabi_memset.S= -DVISIBILITY_HIDD
CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
-SYM_MAPS+=${.CURDIR}/arm/aeabi/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/arm/aeabi/Symbol.map
Modified: head/lib/libc/capability/Makefile.inc
==============================================================================
--- head/lib/libc/capability/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/capability/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,11 +1,11 @@
# $FreeBSD$
# capability sources
-.PATH: ${.CURDIR}/../../sys/kern ${.CURDIR}/capability
+.PATH: ${LIBC_SRCTOP}/../../sys/kern ${LIBC_SRCTOP}/capability
SRCS+= subr_capability.c
-SYM_MAPS+= ${.CURDIR}/capability/Symbol.map
+SYM_MAPS+= ${LIBC_SRCTOP}/capability/Symbol.map
MAN+= cap_rights_init.3
Modified: head/lib/libc/compat-43/Makefile.inc
==============================================================================
--- head/lib/libc/compat-43/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/compat-43/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -2,12 +2,12 @@
# $FreeBSD$
# compat-43 sources
-.PATH: ${.CURDIR}/${LIBC_ARCH}/compat-43 ${.CURDIR}/compat-43
+.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/compat-43 ${LIBC_SRCTOP}/compat-43
SRCS+= creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \
setrgid.c setruid.c sigcompat.c
-SYM_MAPS+=${.CURDIR}/compat-43/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/compat-43/Symbol.map
MAN+= creat.2 killpg.2 sigpause.2 sigsetmask.2 sigvec.2
MAN+= gethostid.3 setruid.3
Modified: head/lib/libc/db/Makefile.inc
==============================================================================
--- head/lib/libc/db/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/db/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -3,11 +3,11 @@
#
CFLAGS+=-D__DBINTERFACE_PRIVATE
-.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"
+.include "${LIBC_SRCTOP}/db/btree/Makefile.inc"
+.include "${LIBC_SRCTOP}/db/db/Makefile.inc"
+.include "${LIBC_SRCTOP}/db/hash/Makefile.inc"
+.include "${LIBC_SRCTOP}/db/man/Makefile.inc"
+.include "${LIBC_SRCTOP}/db/mpool/Makefile.inc"
+.include "${LIBC_SRCTOP}/db/recno/Makefile.inc"
-SYM_MAPS+=${.CURDIR}/db/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/db/Symbol.map
Modified: head/lib/libc/db/btree/Makefile.inc
==============================================================================
--- head/lib/libc/db/btree/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/db/btree/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,7 +1,7 @@
# from @(#)Makefile.inc 8.2 (Berkeley) 7/14/94
# $FreeBSD$
-.PATH: ${.CURDIR}/db/btree
+.PATH: ${LIBC_SRCTOP}/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 \
Modified: head/lib/libc/db/db/Makefile.inc
==============================================================================
--- head/lib/libc/db/db/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/db/db/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,6 +1,6 @@
# from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
# $FreeBSD$
-.PATH: ${.CURDIR}/db/db
+.PATH: ${LIBC_SRCTOP}/db/db
SRCS+= db.c
Modified: head/lib/libc/db/hash/Makefile.inc
==============================================================================
--- head/lib/libc/db/hash/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/db/hash/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,7 +1,7 @@
# from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
# $FreeBSD$
-.PATH: ${.CURDIR}/db/hash
+.PATH: ${LIBC_SRCTOP}/db/hash
SRCS+= hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \
hash_page.c ndbm.c
Modified: head/lib/libc/db/man/Makefile.inc
==============================================================================
--- head/lib/libc/db/man/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/db/man/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,7 +1,7 @@
# from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
# $FreeBSD$
-.PATH: ${.CURDIR}/db/man
+.PATH: ${LIBC_SRCTOP}/db/man
MAN+= btree.3 dbm.3 dbopen.3 hash.3 mpool.3 recno.3
Modified: head/lib/libc/db/mpool/Makefile.inc
==============================================================================
--- head/lib/libc/db/mpool/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/db/mpool/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,6 +1,6 @@
# from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
# $FreeBSD$
-.PATH: ${.CURDIR}/db/mpool
+.PATH: ${LIBC_SRCTOP}/db/mpool
SRCS+= mpool.c mpool-compat.c
Modified: head/lib/libc/db/recno/Makefile.inc
==============================================================================
--- head/lib/libc/db/recno/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/db/recno/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,7 +1,7 @@
# from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
# $FreeBSD$
-.PATH: ${.CURDIR}/db/recno
+.PATH: ${LIBC_SRCTOP}/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
Modified: head/lib/libc/gdtoa/Makefile.inc
==============================================================================
--- head/lib/libc/gdtoa/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/gdtoa/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,20 +1,20 @@
# $FreeBSD$
# netlib gdtoa sources
-.PATH: ${.CURDIR}/gdtoa
+.PATH: ${LIBC_SRCTOP}/gdtoa
MISRCS+=_hdtoa.c _hldtoa.c _ldtoa.c glue.c
GDTOASRCS+=dmisc.c dtoa.c gdtoa.c gethex.c gmisc.c \
hd_init.c hexnan.c misc.c smisc.c \
strtod.c strtodg.c strtof.c strtord.c sum.c ulp.c
-SYM_MAPS+=${.CURDIR}/gdtoa/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/gdtoa/Symbol.map
-CFLAGS+=-I${.CURDIR}/../../contrib/gdtoa
+CFLAGS+=-I${LIBC_SRCTOP}/../../contrib/gdtoa
.for src in ${GDTOASRCS}
MISRCS+=gdtoa_${src}
CLEANFILES+=gdtoa_${src}
gdtoa_${src}:
- ln -sf ${.CURDIR}/../../contrib/gdtoa/${src} ${.TARGET}
+ ln -sf ${LIBC_SRCTOP}/../../contrib/gdtoa/${src} ${.TARGET}
.endfor
Modified: head/lib/libc/gen/Makefile.inc
==============================================================================
--- head/lib/libc/gen/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/gen/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -2,7 +2,7 @@
# $FreeBSD$
# machine-independent gen sources
-.PATH: ${.CURDIR}/${LIBC_ARCH}/gen ${.CURDIR}/gen
+.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/gen ${LIBC_SRCTOP}/gen
SRCS+= __getosreldate.c \
__xuname.c \
@@ -145,11 +145,11 @@ SRCS+= __getosreldate.c \
waitid.c \
wordexp.c
-.PATH: ${.CURDIR}/../../contrib/libc-pwcache
+.PATH: ${LIBC_SRCTOP}/../../contrib/libc-pwcache
SRCS+= pwcache.c pwcache.h
-.PATH: ${.CURDIR}/../../contrib/libc-vis
-CFLAGS+= -I${.CURDIR}/../../contrib/libc-vis
+.PATH: ${LIBC_SRCTOP}/../../contrib/libc-vis
+CFLAGS+= -I${LIBC_SRCTOP}/../../contrib/libc-vis
SRCS+= unvis.c vis.c
MISRCS+=modf.c
@@ -159,13 +159,13 @@ CANCELPOINTS_SRCS=sem.c sem_new.c
SRCS+=cancelpoints_${src}
CLEANFILES+=cancelpoints_${src}
cancelpoints_${src}:
- ln -sf ${.CURDIR}/gen/${src} ${.TARGET}
+ ln -sf ${LIBC_SRCTOP}/gen/${src} ${.TARGET}
.endfor
-SYM_MAPS+=${.CURDIR}/gen/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/gen/Symbol.map
# machine-dependent gen sources
-.sinclude "${.CURDIR}/${LIBC_ARCH}/gen/Makefile.inc"
+.sinclude "${LIBC_SRCTOP}/${LIBC_ARCH}/gen/Makefile.inc"
MAN+= alarm.3 \
arc4random.3 \
Modified: head/lib/libc/gmon/Makefile.inc
==============================================================================
--- head/lib/libc/gmon/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/gmon/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -2,11 +2,11 @@
# $FreeBSD$
# gmon sources
-.PATH: ${.CURDIR}/gmon
+.PATH: ${LIBC_SRCTOP}/gmon
SRCS+= gmon.c mcount.c
-SYM_MAPS+=${.CURDIR}/gmon/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/gmon/Symbol.map
MAN+= moncontrol.3
Modified: head/lib/libc/i386/Makefile.inc
==============================================================================
--- head/lib/libc/i386/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/i386/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -3,4 +3,4 @@
# Long double is 80 bits
GDTOASRCS+=strtorx.c
MDSRCS+=machdep_ldisx.c
-SYM_MAPS+=${.CURDIR}/i386/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/i386/Symbol.map
Modified: head/lib/libc/ia64/Makefile.inc
==============================================================================
--- head/lib/libc/ia64/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/ia64/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -6,4 +6,4 @@
# Long double is 80 bits
GDTOASRCS+=strtorx.c
MDSRCS+=machdep_ldisx.c
-SYM_MAPS+=${.CURDIR}/ia64/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/ia64/Symbol.map
Modified: head/lib/libc/iconv/Makefile.inc
==============================================================================
--- head/lib/libc/iconv/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/iconv/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,7 +1,7 @@
# $FreeBSD$
# iconv sources
-.PATH: ${.CURDIR}/iconv
+.PATH: ${LIBC_SRCTOP}/iconv
MAN+= iconv.3 iconvctl.3 iconv_canonicalize.3 iconvlist.3 __iconv_get_list.3
MLINKS+= iconv.3 iconv_open.3 \
@@ -15,8 +15,8 @@ SRCS+= citrus_bcs.c citrus_bcs_strtol.c
citrus_lookup_factory.c citrus_mapper.c citrus_memstream.c \
citrus_mmap.c citrus_module.c citrus_none.c citrus_pivot_factory.c \
citrus_prop.c citrus_stdenc.c bsd_iconv.c iconv_compat.c
-SYM_MAPS+= ${.CURDIR}/iconv/Symbol.map
+SYM_MAPS+= ${LIBC_SRCTOP}/iconv/Symbol.map
.if ${MK_ICONV} == yes
-.include "${.CURDIR}/../libc_nonshared/Makefile.iconv"
+.include "${LIBC_SRCTOP}/../libc_nonshared/Makefile.iconv"
.endif
Modified: head/lib/libc/inet/Makefile.inc
==============================================================================
--- head/lib/libc/inet/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/inet/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,11 +1,11 @@
# $FreeBSD$
# inet sources
-.PATH: ${.CURDIR}/inet
+.PATH: ${LIBC_SRCTOP}/inet
SRCS+= inet_addr.c inet_cidr_ntop.c inet_cidr_pton.c inet_lnaof.c \
inet_makeaddr.c inet_net_ntop.c inet_net_pton.c inet_neta.c \
inet_netof.c inet_network.c inet_ntoa.c inet_ntop.c \
inet_pton.c nsap_addr.c
-SYM_MAPS+= ${.CURDIR}/inet/Symbol.map
+SYM_MAPS+= ${LIBC_SRCTOP}/inet/Symbol.map
Modified: head/lib/libc/isc/Makefile.inc
==============================================================================
--- head/lib/libc/isc/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/isc/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,6 +1,6 @@
# $FreeBSD$
# isc sources
-.PATH: ${.CURDIR}/isc
+.PATH: ${LIBC_SRCTOP}/isc
SRCS+= ev_streams.c ev_timers.c
Modified: head/lib/libc/locale/Makefile.inc
==============================================================================
--- head/lib/libc/locale/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/locale/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -2,7 +2,7 @@
# $FreeBSD$
# locale sources
-.PATH: ${.CURDIR}/${LIBC_ARCH}/locale ${.CURDIR}/locale
+.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/locale ${LIBC_SRCTOP}/locale
SRCS+= ascii.c big5.c btowc.c collate.c collcmp.c euc.c fix_grouping.c \
gb18030.c gb2312.c gbk.c ctype.c isctype.c iswctype.c \
@@ -29,7 +29,7 @@ SRCS+= c16rtomb_iconv.c c32rtomb_iconv.c
SRCS+= c16rtomb.c c32rtomb.c mbrtoc16.c mbrtoc32.c
.endif
-SYM_MAPS+=${.CURDIR}/locale/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/locale/Symbol.map
MAN+= btowc.3 \
ctype_l.3 \
Modified: head/lib/libc/mips/Makefile.inc
==============================================================================
--- head/lib/libc/mips/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/mips/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -4,4 +4,4 @@
CFLAGS+=-DSOFTFLOAT
MDSRCS+= machdep_ldisd.c
-SYM_MAPS+= ${.CURDIR}/mips/Symbol.map
+SYM_MAPS+= ${LIBC_SRCTOP}/mips/Symbol.map
Modified: head/lib/libc/nameser/Makefile.inc
==============================================================================
--- head/lib/libc/nameser/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/nameser/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,8 +1,8 @@
# $FreeBSD$
# nameser sources
-.PATH: ${.CURDIR}/nameser
+.PATH: ${LIBC_SRCTOP}/nameser
SRCS+= ns_name.c ns_netint.c ns_parse.c ns_print.c ns_samedomain.c ns_ttl.c
-SYM_MAPS+= ${.CURDIR}/nameser/Symbol.map
+SYM_MAPS+= ${LIBC_SRCTOP}/nameser/Symbol.map
Modified: head/lib/libc/net/Makefile.inc
==============================================================================
--- head/lib/libc/net/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/net/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -2,7 +2,7 @@
# $FreeBSD$
# machine-independent net sources
-.PATH: ${.CURDIR}/net
+.PATH: ${LIBC_SRCTOP}/net
SRCS+= base64.c ether_addr.c eui64.c \
gai_strerror.c getaddrinfo.c \
@@ -20,7 +20,7 @@ SRCS+= base64.c ether_addr.c eui64.c \
SRCS+= nscache.c nscachedcli.c
.endif
-SYM_MAPS+=${.CURDIR}/net/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/net/Symbol.map
.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+=-DINET6
@@ -29,7 +29,7 @@ CFLAGS+=-DINET6
CFLAGS+=-I${.OBJDIR}
# name6.c refers res_private.h
-CFLAGS+=-I${.CURDIR}/resolv
+CFLAGS+=-I${LIBC_SRCTOP}/resolv
YFLAGS+=-p_nsyy
LFLAGS+=-P_nsyy
Modified: head/lib/libc/nls/Makefile.inc
==============================================================================
--- head/lib/libc/nls/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/nls/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,11 +1,11 @@
# from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $
# $FreeBSD$
-.PATH: ${.CURDIR}/nls
+.PATH: ${LIBC_SRCTOP}/nls
SRCS+= msgcat.c
-SYM_MAPS+=${.CURDIR}/nls/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/nls/Symbol.map
MAN+= catclose.3 catgets.3 catopen.3
Modified: head/lib/libc/posix1e/Makefile.inc
==============================================================================
--- head/lib/libc/posix1e/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/posix1e/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,11 +1,11 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/posix1e
+.PATH: ${LIBC_SRCTOP}/posix1e
CFLAGS+=-D_ACL_PRIVATE
# Copy kern/subr_acl_nfs4.c to the libc object directory.
-subr_acl_nfs4.c: ${.CURDIR}/../../sys/kern/subr_acl_nfs4.c
+subr_acl_nfs4.c: ${LIBC_SRCTOP}/../../sys/kern/subr_acl_nfs4.c
cat ${.ALLSRC} > ${.TARGET}
SRCS+= acl_branding.c \
@@ -37,7 +37,7 @@ SRCS+= acl_branding.c \
mac_set.c \
subr_acl_nfs4.c
-SYM_MAPS+=${.CURDIR}/posix1e/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/posix1e/Symbol.map
MAN+= acl.3 \
acl_add_flag_np.3 \
Modified: head/lib/libc/powerpc/Makefile.inc
==============================================================================
--- head/lib/libc/powerpc/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/powerpc/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -4,4 +4,4 @@ SRCS+= __vdso_gettc.c
# Long double is 64-bits
MDSRCS+=machdep_ldisd.c
-SYM_MAPS+=${.CURDIR}/powerpc/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/powerpc/Symbol.map
Modified: head/lib/libc/powerpc64/Makefile.inc
==============================================================================
--- head/lib/libc/powerpc64/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/powerpc64/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -4,4 +4,4 @@ SRCS+= __vdso_gettc.c
# Long double is 64-bits
MDSRCS+=machdep_ldisd.c
-SYM_MAPS+=${.CURDIR}/powerpc64/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/powerpc64/Symbol.map
Modified: head/lib/libc/quad/Makefile.inc
==============================================================================
--- head/lib/libc/quad/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/quad/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -2,7 +2,7 @@
# $FreeBSD$
# Quad support, if needed
-.PATH: ${.CURDIR}/${LIBC_ARCH}/quad ${.CURDIR}/quad
+.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/quad ${LIBC_SRCTOP}/quad
.if ${LIBC_ARCH} == "i386"
@@ -22,4 +22,4 @@ SRCS+= adddi3.c anddi3.c ashldi3.c ashrd
.endif
-SYM_MAPS+=${.CURDIR}/quad/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/quad/Symbol.map
Modified: head/lib/libc/regex/Makefile.inc
==============================================================================
--- head/lib/libc/regex/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/regex/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -2,13 +2,13 @@
# $FreeBSD$
# regex sources
-.PATH: ${.CURDIR}/regex
+.PATH: ${LIBC_SRCTOP}/regex
CFLAGS+=-DPOSIX_MISTAKE
SRCS+= regcomp.c regerror.c regexec.c regfree.c
-SYM_MAPS+=${.CURDIR}/regex/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/regex/Symbol.map
MAN+= regex.3
MAN+= re_format.7
Modified: head/lib/libc/resolv/Makefile.inc
==============================================================================
--- head/lib/libc/resolv/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/resolv/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,10 +1,10 @@
# $FreeBSD$
# resolv sources
-.PATH: ${.CURDIR}/resolv
+.PATH: ${LIBC_SRCTOP}/resolv
SRCS+= herror.c h_errno.c mtctxres.c res_comp.c res_data.c res_debug.c \
res_findzonecut.c res_init.c res_mkquery.c res_mkupdate.c \
res_query.c res_send.c res_state.c res_update.c
-SYM_MAPS+= ${.CURDIR}/resolv/Symbol.map
+SYM_MAPS+= ${LIBC_SRCTOP}/resolv/Symbol.map
Modified: head/lib/libc/rpc/Makefile.inc
==============================================================================
--- head/lib/libc/rpc/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/rpc/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,7 +1,7 @@
# @(#)Makefile 5.11 (Berkeley) 9/6/90
# $FreeBSD$
-.PATH: ${.CURDIR}/rpc ${.CURDIR}/.
+.PATH: ${LIBC_SRCTOP}/rpc ${LIBC_SRCTOP}/.
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 \
@@ -26,10 +26,10 @@ SRCS+= rtime.c
# generated sources
SRCS+= crypt_clnt.c crypt_xdr.c crypt.h
-SYM_MAPS+=${.CURDIR}/rpc/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/rpc/Symbol.map
CFLAGS+= -DBROKEN_DES -DPORTMAP -DDES_BUILTIN
-CFLAGS+= -I${.CURDIR}/rpc
+CFLAGS+= -I${LIBC_SRCTOP}/rpc
CLEANFILES+= crypt_clnt.c crypt_xdr.c crypt.h
Modified: head/lib/libc/softfloat/Makefile.inc
==============================================================================
--- head/lib/libc/softfloat/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/softfloat/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -3,9 +3,11 @@
SOFTFLOAT_BITS?=64
.PATH: ${LIBC_ARCH}/softfloat \
- ${.CURDIR}/softfloat/bits${SOFTFLOAT_BITS} ${.CURDIR}/softfloat
+ ${LIBC_SRCTOP}/softfloat/bits${SOFTFLOAT_BITS} \
+ ${LIBC_SRCTOP}/softfloat
-CFLAGS+= -I${.CURDIR}/${LIBC_ARCH}/softfloat -I${.CURDIR}/softfloat
+CFLAGS+= -I${LIBC_SRCTOP}/${LIBC_ARCH}/softfloat \
+ -I${LIBC_SRCTOP}/softfloat
CFLAGS+= -DSOFTFLOAT_FOR_GCC
SRCS+= softfloat.c
@@ -27,4 +29,4 @@ CFLAGS+= -DFLOATX80
SRCS+= nexf2.c gtxf2.c gexf2.c negxf2.c
.endif
-SYM_MAPS+= ${.CURDIR}/softfloat/Symbol.map
+SYM_MAPS+= ${LIBC_SRCTOP}/softfloat/Symbol.map
Modified: head/lib/libc/sparc64/Makefile.inc
==============================================================================
--- head/lib/libc/sparc64/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/sparc64/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -10,4 +10,4 @@ SRCS+= __vdso_gettc.c
# Long double is quad precision
GDTOASRCS+=strtorQ.c
MDSRCS+=machdep_ldisQ.c
-SYM_MAPS+=${.CURDIR}/sparc64/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/sparc64/Symbol.map
Modified: head/lib/libc/sparc64/fpu/Makefile.inc
==============================================================================
--- head/lib/libc/sparc64/fpu/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/sparc64/fpu/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,8 +1,8 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/sparc64/fpu
+.PATH: ${LIBC_SRCTOP}/sparc64/fpu
-CFLAGS+= -I${.CURDIR}/sparc64/sys
+CFLAGS+= -I${LIBC_SRCTOP}/sparc64/sys
SRCS+= fpu.c fpu_add.c fpu_compare.c fpu_div.c fpu_explode.c fpu_implode.c \
fpu_mul.c fpu_qp.c fpu_reg.S fpu_sqrt.c fpu_subr.c
Modified: head/lib/libc/sparc64/sys/Makefile.inc
==============================================================================
--- head/lib/libc/sparc64/sys/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/sparc64/sys/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -10,7 +10,7 @@ SRCS+= __sparc_sigtramp_setup.c \
__sparc_utrap_setup.c \
sigcode.S
-CFLAGS+= -I${.CURDIR}/sparc64/fpu
+CFLAGS+= -I${LIBC_SRCTOP}/sparc64/fpu
MDASM+= brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S
sigaction.S
Modified: head/lib/libc/stdio/Makefile.inc
==============================================================================
--- head/lib/libc/stdio/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/stdio/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -2,7 +2,7 @@
# $FreeBSD$
# stdio sources
-.PATH: ${.CURDIR}/stdio
+.PATH: ${LIBC_SRCTOP}/stdio
SRCS+= _flock_stub.c asprintf.c clrerr.c dprintf.c \
fclose.c fcloseall.c fdopen.c \
@@ -31,7 +31,7 @@ SRCS+= xprintf.c xprintf_float.c xprintf
SRCS+= xprintf_errno.c xprintf_hexdump.c xprintf_quote.c
SRCS+= xprintf_time.c xprintf_vis.c
-SYM_MAPS+= ${.CURDIR}/stdio/Symbol.map
+SYM_MAPS+= ${LIBC_SRCTOP}/stdio/Symbol.map
MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetwln.3 fgetws.3 \
flockfile.3 \
Modified: head/lib/libc/stdlib/Makefile.inc
==============================================================================
--- head/lib/libc/stdlib/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/stdlib/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -2,7 +2,7 @@
# $FreeBSD$
# machine-independent stdlib sources
-.PATH: ${.CURDIR}/${LIBC_ARCH}/stdlib ${.CURDIR}/stdlib
+.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/stdlib ${LIBC_SRCTOP}/stdlib
MISRCS+=_Exit.c a64l.c abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \
bsearch.c div.c exit.c getenv.c getopt.c getopt_long.c \
@@ -13,10 +13,10 @@ MISRCS+=_Exit.c a64l.c abort.c abs.c ate
strtol.c strtoll.c strtoq.c strtoul.c strtonum.c strtoull.c \
strtoumax.c strtouq.c system.c tdelete.c tfind.c tsearch.c twalk.c
-SYM_MAPS+= ${.CURDIR}/stdlib/Symbol.map
+SYM_MAPS+= ${LIBC_SRCTOP}/stdlib/Symbol.map
# machine-dependent stdlib sources
-.sinclude "${.CURDIR}/${LIBC_ARCH}/stdlib/Makefile.inc"
+.sinclude "${LIBC_SRCTOP}/${LIBC_ARCH}/stdlib/Makefile.inc"
MAN+= a64l.3 abort.3 abs.3 alloca.3 atexit.3 atof.3 \
atoi.3 atol.3 at_quick_exit.3 bsearch.3 \
Modified: head/lib/libc/stdlib/jemalloc/Makefile.inc
==============================================================================
--- head/lib/libc/stdlib/jemalloc/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/stdlib/jemalloc/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,26 +1,26 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/stdlib/jemalloc
+.PATH: ${LIBC_SRCTOP}/stdlib/jemalloc
JEMALLOCSRCS:= jemalloc.c arena.c atomic.c base.c bitmap.c chunk.c \
chunk_dss.c chunk_mmap.c ckh.c ctl.c extent.c hash.c huge.c mb.c \
mutex.c prof.c quarantine.c rtree.c stats.c tcache.c tsd.c util.c
-SYM_MAPS+=${.CURDIR}/stdlib/jemalloc/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/stdlib/jemalloc/Symbol.map
-CFLAGS+=-I${.CURDIR}/../../contrib/jemalloc/include
+CFLAGS+=-I${LIBC_SRCTOP}/../../contrib/jemalloc/include
.for src in ${JEMALLOCSRCS}
MISRCS+=jemalloc_${src}
CLEANFILES+=jemalloc_${src}
jemalloc_${src}:
- ln -sf ${.CURDIR}/../../contrib/jemalloc/src/${src} ${.TARGET}
+ ln -sf ${LIBC_SRCTOP}/../../contrib/jemalloc/src/${src} ${.TARGET}
.endfor
MAN+=jemalloc.3
CLEANFILES+=jemalloc.3
jemalloc.3:
- ln -sf ${.CURDIR}/../../contrib/jemalloc/doc/jemalloc.3 ${.TARGET}
+ ln -sf ${LIBC_SRCTOP}/../../contrib/jemalloc/doc/jemalloc.3 ${.TARGET}
MLINKS+= \
jemalloc.3 malloc.3 \
Modified: head/lib/libc/stdtime/Makefile.inc
==============================================================================
--- head/lib/libc/stdtime/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/stdtime/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,15 +1,15 @@
# Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp
# $FreeBSD$
-.PATH: ${.CURDIR}/stdtime ${.CURDIR}/../locale \
- ${.CURDIR}/../../contrib/tzcode/stdtime
+.PATH: ${LIBC_SRCTOP}/stdtime ${LIBC_SRCTOP}/../locale \
+ ${LIBC_SRCTOP}/../../contrib/tzcode/stdtime
SRCS+= asctime.c difftime.c localtime.c strftime.c strptime.c timelocal.c \
time32.c
-SYM_MAPS+= ${.CURDIR}/stdtime/Symbol.map
+SYM_MAPS+= ${LIBC_SRCTOP}/stdtime/Symbol.map
-CFLAGS+= -I${.CURDIR}/../../contrib/tzcode/stdtime -I${.CURDIR}/stdtime
+CFLAGS+= -I${LIBC_SRCTOP}/../../contrib/tzcode/stdtime -I${LIBC_SRCTOP}/stdtime
CFLAGS.localtime.c= -fwrapv
CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
Modified: head/lib/libc/string/Makefile.inc
==============================================================================
--- head/lib/libc/string/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/string/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,9 +1,9 @@
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
# $FreeBSD$
-.PATH: ${.CURDIR}/${LIBC_ARCH}/string ${.CURDIR}/string
+.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/string ${LIBC_SRCTOP}/string
-CFLAGS+= -I${.CURDIR}/locale
+CFLAGS+= -I${LIBC_SRCTOP}/locale
# machine-independent string sources
MISRCS+=bcmp.c bcopy.c bzero.c ffs.c ffsl.c ffsll.c fls.c flsl.c flsll.c \
@@ -22,11 +22,11 @@ MISRCS+=bcmp.c bcopy.c bzero.c ffs.c ffs
wmemcmp.c \
wmemcpy.c wmemmove.c wmemset.c
-SYM_MAPS+= ${.CURDIR}/string/Symbol.map
+SYM_MAPS+= ${LIBC_SRCTOP}/string/Symbol.map
# machine-dependent string sources
-.sinclude "${.CURDIR}/${LIBC_ARCH}/string/Makefile.inc"
+.sinclude "${LIBC_SRCTOP}/${LIBC_ARCH}/string/Makefile.inc"
MAN+= bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \
memcmp.3 memcpy.3 memmem.3 memmove.3 memset.3 strcasecmp.3 strcat.3 \
Modified: head/lib/libc/sys/Makefile.inc
==============================================================================
--- head/lib/libc/sys/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/sys/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -2,18 +2,18 @@
# $FreeBSD$
# sys sources
-.PATH: ${.CURDIR}/${LIBC_ARCH}/sys ${.CURDIR}/sys
+.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/sys ${LIBC_SRCTOP}/sys
# Include the generated makefile containing the *complete* list
# of syscall names in MIASM.
-.include "${.CURDIR}/../../sys/sys/syscall.mk"
+.include "${LIBC_SRCTOP}/../../sys/sys/syscall.mk"
# Include machine dependent definitions.
#
# MDASM names override the default syscall names in MIASM.
# NOASM will prevent the default syscall code from being generated.
#
-.sinclude "${.CURDIR}/${LIBC_ARCH}/sys/Makefile.inc"
+.sinclude "${LIBC_SRCTOP}/${LIBC_ARCH}/sys/Makefile.inc"
SRCS+= clock_gettime.c gettimeofday.c __vdso_gettimeofday.c
NOASM+= clock_gettime.o gettimeofday.o
@@ -55,7 +55,7 @@ SPSEUDO= ${PSEUDO:S/.o/.S/}
SRCS+= ${SASM} ${SPSEUDO}
-SYM_MAPS+= ${.CURDIR}/sys/Symbol.map
+SYM_MAPS+= ${LIBC_SRCTOP}/sys/Symbol.map
# Generated files
CLEANFILES+= ${SASM} ${SPSEUDO}
Modified: head/lib/libc/uuid/Makefile.inc
==============================================================================
--- head/lib/libc/uuid/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/uuid/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -2,12 +2,12 @@
# DCE 1.1 UUID implementation sources
-.PATH: ${.CURDIR}/uuid
+.PATH: ${LIBC_SRCTOP}/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_stream.c \
uuid_to_string.c
-SYM_MAPS+= ${.CURDIR}/uuid/Symbol.map
+SYM_MAPS+= ${LIBC_SRCTOP}/uuid/Symbol.map
MAN+= uuid.3
MLINKS+=uuid.3 uuid_compare.3
Modified: head/lib/libc/xdr/Makefile.inc
==============================================================================
--- head/lib/libc/xdr/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/xdr/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -1,12 +1,12 @@
# @(#)Makefile 5.11 (Berkeley) 9/6/90
# $FreeBSD$
-.PATH: ${.CURDIR}/xdr ${.CURDIR}/.
+.PATH: ${LIBC_SRCTOP}/xdr ${LIBC_SRCTOP}/.
SRCS+= xdr.c xdr_array.c xdr_float.c xdr_mem.c \
xdr_rec.c xdr_reference.c xdr_sizeof.c \
xdr_stdio.c
-SYM_MAPS+= ${.CURDIR}/xdr/Symbol.map
+SYM_MAPS+= ${LIBC_SRCTOP}/xdr/Symbol.map
MAN+= xdr.3
Modified: head/lib/libc/yp/Makefile.inc
==============================================================================
--- head/lib/libc/yp/Makefile.inc Tue Mar 4 01:14:37 2014
(r262721)
+++ head/lib/libc/yp/Makefile.inc Tue Mar 4 02:19:39 2014
(r262722)
@@ -2,12 +2,12 @@
# $FreeBSD$
# yp sources
-.PATH: ${.CURDIR}/yp
+.PATH: ${LIBC_SRCTOP}/yp
SRCS+= xdryp.c yp.h yp_xdr.c yplib.c
CLEANFILES+= yp.h yp_xdr.c
-SYM_MAPS+= ${.CURDIR}/yp/Symbol.map
+SYM_MAPS+= ${LIBC_SRCTOP}/yp/Symbol.map
RPCSRC= ${DESTDIR}/usr/include/rpcsvc/yp.x
RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
