Spell NO_PROFILE= as MK_PROFILE=no.

2014-04-25 19:25:26 +00:00 · 2014-04-25 19:25:26 +00:00 · 29752a1c14
commit 29752a1c14
parent 26f9e00af9
25 changed files with 36 additions and 33 deletions
--- a/Makefile.inc1
+++ b/Makefile.inc1
@ -247,7 +247,7 @@ BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
 		MK_HTML=no MK_INFO=no NO_LINT=yes MK_MAN=no \
-		-DNO_PIC -DNO_PROFILE -DNO_SHARED \
+		-DNO_PIC MK_PROFILE=no -DNO_SHARED \
 		-DNO_CPU_CFLAGS -DNO_WARNS MK_CTF=no -DEARLY_BUILD MK_TESTS=no

 # build-tools stage
@ -276,7 +276,7 @@ KTMAKE=		TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
 		MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \
-		-DNO_PIC -DNO_PROFILE -DNO_SHARED \
+		-DNO_PIC MK_PROFILE=no -DNO_SHARED \
 		-DNO_CPU_CFLAGS -DNO_WARNS MK_CTF=no -DEARLY_BUILD

 # world stage
@ -557,7 +557,7 @@ _libraries:
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; \
 	    ${WMAKE} -DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \
-	    -DNO_PROFILE MK_TESTS=no libraries
+	    MK_PROFILE=no  MK_TESTS=no libraries
 _depend:
 	@echo
 	@echo "--------------------------------------------------------------"
@ -1602,9 +1602,9 @@ ${_lib}__PL: .PHONY .MAKE
 		cd ${.CURDIR}/${_lib} && \
 		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj && \
 		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend && \
-		${MAKE} MK_TESTS=no -DNO_PROFILE -DNO_PIC \
+		${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \
 		    DIRPRFX=${_lib}/ all && \
-		${MAKE} MK_TESTS=no -DNO_PROFILE -DNO_PIC \
+		${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \
 		    DIRPRFX=${_lib}/ install
 .endif
 .endfor
@ -1858,7 +1858,7 @@ XDEV_CPUTYPE?=${TARGET_CPUTYPE}
 .endif

 NOFUN=-DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT \
-	MK_MAN=no MK_NLS=no -DNO_PROFILE \
+	MK_MAN=no MK_NLS=no MK_PROFILE=no \
 	MK_KERBEROS=no MK_RESCUE=no MK_TESTS=no -DNO_WARNS \
 	TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
 	CPUTYPE=${XDEV_CPUTYPE}
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@ -60,7 +60,7 @@ DPADD=		${LIBMD} ${LIBPTHREAD} ${LIBZ}
 LDADD=		-lmd -lpthread -lz

 # atomic.S doesn't like profiling.
-NO_PROFILE=
+MK_PROFILE=	no

 CSTD=	c99

--- a/contrib/ofed/usr.lib/libibcm/Makefile
+++ b/contrib/ofed/usr.lib/libibcm/Makefile
@ -12,7 +12,7 @@ IBSRCDIR=	${IBCMDIR}/src

 LIB=		ibcm
 SHLIB_MAJOR=	1
-NO_PROFILE=
+MK_PROFILE=	no

 SRCS= cm.c
 CFLAGS+=	-I ${IBCMDIR}/include
--- a/contrib/ofed/usr.lib/libibcommon/Makefile
+++ b/contrib/ofed/usr.lib/libibcommon/Makefile
@ -11,7 +11,7 @@ IBSRCDIR=	${IBCOMMONDIR}/src

 LIB=		ibcommon
 SHLIB_MAJOR=	1
-NO_PROFILE=
+MK_PROFILE=	no

 SRCS=	sysfs.c util.c hash.c stack.c time.c

--- a/contrib/ofed/usr.lib/libibmad/Makefile
+++ b/contrib/ofed/usr.lib/libibmad/Makefile
@ -11,7 +11,7 @@ IBSRCDIR=	${IBMADDIR}/src

 LIB=		ibmad
 SHLIB_MAJOR=	1
-NO_PROFILE=
+MK_PROFILE=	no

 SRCS=	dump.c fields.c gs.c mad.c portid.c register.c resolve.c rpc.c sa.c \
 	serv.c smp.c vendor.c
--- a/contrib/ofed/usr.lib/libibumad/Makefile
+++ b/contrib/ofed/usr.lib/libibumad/Makefile
@ -11,7 +11,7 @@ IBSRCDIR=	${UMADDIR}/src

 LIB=		ibumad
 SHLIB_MAJOR=	1
-NO_PROFILE=
+MK_PROFILE=	no

 SRCS=	umad.c

--- a/contrib/ofed/usr.lib/libibverbs/Makefile
+++ b/contrib/ofed/usr.lib/libibverbs/Makefile
@ -12,7 +12,7 @@ IBMANDIR=	${IBVERBSDIR}/man

 LIB=		ibverbs
 SHLIB_MAJOR=	1
-NO_PROFILE=
+MK_PROFILE=	no

 SRCS=	device.c init.c marshall.c verbs.c cmd.c enum_strs.c kern_abi.h \
 	memory.c compat-1_0.c sysfs.c
--- a/contrib/ofed/usr.lib/libmlx4/Makefile
+++ b/contrib/ofed/usr.lib/libmlx4/Makefile
@ -12,7 +12,7 @@ MLXSRCDIR=	${MLX4DIR}/src

 LIB=		mlx4
 SHLIB_MAJOR=	1
-NO_PROFILE=
+MK_PROFILE=	no

 SRCS=	buf.c cq.c dbrec.c mlx4.c qp.c srq.c verbs.c

--- a/contrib/ofed/usr.lib/libmthca/Makefile
+++ b/contrib/ofed/usr.lib/libmthca/Makefile
@ -12,7 +12,7 @@ MTHCASRCDIR=	${MTHCADIR}/src

 LIB=		mthca
 SHLIB_MAJOR=	1
-NO_PROFILE=
+MK_PROFILE=	no

 SRCS=	ah.c buf.c cq.c memfree.c mthca.c qp.c srq.c verbs.c

--- a/contrib/ofed/usr.lib/libopensm/Makefile
+++ b/contrib/ofed/usr.lib/libopensm/Makefile
@ -9,7 +9,7 @@ SHLIBDIR?=	/usr/lib

 LIB=		opensm
 SHLIB_MAJOR=	1
-NO_PROFILE=
+MK_PROFILE=	no

 SRCS=	osm_log.c osm_mad_pool.c osm_helper.c

--- a/contrib/ofed/usr.lib/libosmcomp/Makefile
+++ b/contrib/ofed/usr.lib/libosmcomp/Makefile
@ -9,7 +9,7 @@ SHLIBDIR?=	/usr/lib

 LIB=		osmcomp
 SHLIB_MAJOR=	1
-NO_PROFILE=
+MK_PROFILE=	no

 SRCS=	cl_complib.c cl_dispatcher.c cl_event.c cl_event_wheel.c cl_list.c
 SRCS+=	cl_log.c cl_map.c cl_pool.c cl_ptr_vector.c cl_spinlock.c
--- a/contrib/ofed/usr.lib/libosmvendor/Makefile
+++ b/contrib/ofed/usr.lib/libosmvendor/Makefile
@ -9,7 +9,7 @@ SHLIBDIR?=	/usr/lib

 LIB=		osmvendor
 SHLIB_MAJOR=	1
-NO_PROFILE=
+MK_PROFILE=	no

 SRCS=	osm_vendor_ibumad.c osm_vendor_ibumad_sa.c

--- a/contrib/ofed/usr.lib/librdmacm/Makefile
+++ b/contrib/ofed/usr.lib/librdmacm/Makefile
@ -12,7 +12,7 @@ RDMAMANDIR=	${RDMACMDIR}/man

 LIB=		rdmacm
 SHLIB_MAJOR=	1
-NO_PROFILE=
+MK_PROFILE=	no

 SRCS=	cma.c

--- a/contrib/ofed/usr.lib/libsdp/Makefile
+++ b/contrib/ofed/usr.lib/libsdp/Makefile
@ -10,7 +10,7 @@ SDPDIR=	${.CURDIR}/../../libsdp/src

 LIB=		ibsdp
 SHLIB_MAJOR=	1
-NO_PROFILE=
+MK_PROFILE=	no
 MAN=

 SRCS=	log.c match.c port.c config_parser.c config_scanner.c
--- a/gnu/lib/libgcov/Makefile
+++ b/gnu/lib/libgcov/Makefile
@ -1,8 +1,9 @@
 # $FreeBSD$

-NO_PROFILE=
-.include <bsd.own.mk>
+MK_PROFILE=	no
 MK_SSP=		no
+
+.include <bsd.own.mk>
 .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"

 GCCDIR=	${.CURDIR}/../../../contrib/gcc
--- a/gnu/lib/libssp/Makefile
+++ b/gnu/lib/libssp/Makefile
@ -2,9 +2,11 @@

 SHLIBDIR?=	/lib

-.include <bsd.own.mk>
+MK_PROFILE=	no
 MK_SSP=		no

+.include <bsd.own.mk>
+
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
 SRCDIR=	${GCCLIB}/libssp
@ -13,7 +15,6 @@ SRCDIR=	${GCCLIB}/libssp

 LIB=		ssp
 SHLIB_MAJOR=	0
-NO_PROFILE=

 SRCS=	ssp.c gets-chk.c memcpy-chk.c memmove-chk.c mempcpy-chk.c \
 	memset-chk.c snprintf-chk.c sprintf-chk.c stpcpy-chk.c \
--- a/gnu/lib/libssp/libssp_nonshared/Makefile
+++ b/gnu/lib/libssp/libssp_nonshared/Makefile
@ -7,7 +7,7 @@ GCCLIB=	${.CURDIR}/../../../../contrib/gcclibs

 LIB=	ssp_nonshared
 NO_PIC=
-NO_PROFILE=
+MK_PROFILE=no

 SRCS=	ssp-local.c

--- a/lib/libc_nonshared/Makefile
+++ b/lib/libc_nonshared/Makefile
@ -4,7 +4,7 @@
 # It is used exclusively with libc.so.* - there is no need for any other
 # compile modes.
 # bsd.lib.mk doesn't have an easy way to express that.
-NO_PROFILE?=
+MK_PROFILE?=no
 .include <bsd.own.mk>
 NO_PIC=	
 # -fpic on some platforms, -fPIC on others.
--- a/lib/libiconv_modules/Makefile.inc
+++ b/lib/libiconv_modules/Makefile.inc
@ -14,4 +14,4 @@ SHLIBDIR= /usr/lib/i18n
 SHLIBDIR= /usr/lib32/i18n
 .endif
 LIBDIR=	 ${SHLIBDIR}
-NO_PROFILE=
+MK_PROFILE=	no
--- a/lib/libpam/libpam/Makefile
+++ b/lib/libpam/libpam/Makefile
@ -39,7 +39,7 @@ OPENPAM=	${.CURDIR}/../../../contrib/openpam
 .PATH: ${OPENPAM}/include ${OPENPAM}/lib/libpam ${OPENPAM}/doc/man

 LIB=	pam
-NO_PROFILE=
+MK_PROFILE=no

 SRCS=	openpam_asprintf.c \
 	openpam_borrow_cred.c \
--- a/lib/libpam/modules/Makefile.inc
+++ b/lib/libpam/modules/Makefile.inc
@ -3,7 +3,7 @@
 PAMDIR=		${.CURDIR}/../../../../contrib/openpam

 MK_INSTALLLIB=	no
-NO_PROFILE=
+MK_PROFILE=	no

 CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam

--- a/lib/librpcsec_gss/Makefile
+++ b/lib/librpcsec_gss/Makefile
@ -13,7 +13,7 @@ SYMBOL_MAPS=	${.CURDIR}/Symbol.map

 CFLAGS+= -I${.CURDIR}/../../include
 CFLAGS+= -I${.CURDIR}/../../libc_rpc
-NO_PROFILE=
+MK_PROFILE=	no

 MAN=	rpcsec_gss.3
 MAN+=	rpc_gss_seccreate.3
--- a/lib/libstand/Makefile
+++ b/lib/libstand/Makefile
@ -6,11 +6,12 @@
 #   quite large.
 #

-.include <bsd.own.mk>
+MK_PROFILE=	no
 MK_SSP=		no

+.include <bsd.own.mk>
+
 LIB=		stand
-NO_PROFILE=
 NO_PIC=
 INCS=		stand.h
 MAN=		libstand.3
--- a/sys/boot/libstand32/Makefile
+++ b/sys/boot/libstand32/Makefile
@ -16,7 +16,7 @@ S=		${.CURDIR}/../../../lib/libstand
 .PATH:		${S}
 LIB=		stand
 INTERNALLIB=
-NO_PROFILE=
+MK_PROFILE=	no
 NO_PIC=

 WARNS?=		0
--- a/sys/boot/userboot/libstand/Makefile
+++ b/sys/boot/userboot/libstand/Makefile
@ -16,7 +16,7 @@ S=		${.CURDIR}/../../../../lib/libstand
 .PATH:		${S}
 LIB=		stand
 INTERNALLIB=
-NO_PROFILE=
+MK_PROFILE=	no
 NO_PIC=

 WARNS?=		0