NOPROFILE -> NO_PROFILE

Craig Dooley xlnxminusx at gmail.com
Mon Mar 14 08:58:06 PST 2005 

Another patch to clean up make options.  This one changes NOPROFILE to
NO_PROFILE.  It was taken with the other two patches I have sent
today.

-Craig
-- 
-----------------------------------------------------------------------
Craig Dooley <xlnxminusx at xxxxxxxxx>
Index: Makefile.inc1
===================================================================
RCS file: /home/dcvs/src/Makefile.inc1,v
retrieving revision 1.59
diff -u -r1.59 Makefile.inc1
--- Makefile.inc1	13 Mar 2005 19:05:23 -0000	1.59
+++ Makefile.inc1	14 Mar 2005 15:53:06 -0000
@@ -8,8 +8,8 @@
 #	-DNOCLEAN do not clean at all
 #	-DNOCRYPT will prevent building of crypt versions
 #	-DNOMAN do not build the manual pages
-#	-DNOPROFILE do not build profiled libraries
+#	-DNO_PROFILE do not build profiled libraries
 #	-DNOSHARE do not go into share subdir
 #	-DNOINFO do not make or install info files
 #	-DNOLIBC_R do not build libc_r.
@@ -217,7 +217,7 @@
 		INSTALL="sh ${.CURDIR}/tools/install.sh"
 
 BMAKE=		${BMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \
-		-DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \
+		-DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNO_PROFILE -DNOSHARED \
 		-DNO_WERROR
 
 # build-tool stage
Index: contrib/smbfs/lib/smb/Makefile
===================================================================
RCS file: /home/dcvs/src/contrib/smbfs/lib/smb/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- contrib/smbfs/lib/smb/Makefile	17 Jun 2003 02:46:55 -0000	1.1
+++ contrib/smbfs/lib/smb/Makefile	14 Mar 2005 15:57:03 -0000
@@ -2,7 +2,7 @@
 
 LIB=		smb
 
-NOPROFILE=	yes
+NO_PROFILE=	yes
 
 #SHLIB_MAJOR=	1
 #SHLIB_MINOR=	0
Index: etc/defaults/make.conf
===================================================================
RCS file: /home/dcvs/src/etc/defaults/make.conf,v
retrieving revision 1.12
diff -u -r1.12 make.conf
--- etc/defaults/make.conf	1 Mar 2005 18:45:37 -0000	1.12
+++ etc/defaults/make.conf	14 Mar 2005 15:57:15 -0000
@@ -110,15 +111,14 @@
 #NO_OBJC=	true	# do not build Objective C support
 #NO_OPENSSH=	true	# do not build OpenSSH
 #NO_OPENSSL=	true	# do not build OpenSSL (implies NO_OPENSSH)
+#NO_PROFILE=	true	# Avoid compiling profiled libraries
 #NO_SENDMAIL=	true	# do not build sendmail and related programs
 #NO_SHAREDOCS=	true	# do not build the 4.4BSD legacy docs
 #NO_X=		true	# do not compile in XWindows support (e.g. doscmd)
 #NOCRYPT=	true	# do not build any crypto code
 #NOINFO=	true	# do not make or install info files
 #NOLIBC_R=	true	# do not build libc_r (re-entrant version of libc)
 #NOMAN=		true	# do not build manual pages
-#NOPROFILE=	true	# Avoid compiling profiled libraries
 #NOSHARE=	true	# do not go into the share subdir
 #
 # To build sys/modules when building the world (our old way of doing things)
Index: gnu/lib/gcc2/libgcc/Makefile
===================================================================
RCS file: /home/dcvs/src/gnu/lib/gcc2/libgcc/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- gnu/lib/gcc2/libgcc/Makefile	20 Mar 2004 16:27:39 -0000	1.2
+++ gnu/lib/gcc2/libgcc/Makefile	14 Mar 2005 15:57:25 -0000
@@ -145,7 +145,7 @@
 	@mv ${.TARGET}.tmp ${.TARGET}
 .endif
 
-.if !defined(NOPROFILE)
+.if !defined(NO_PROFILE)
 ${LIB1POBJS}: libgcc1.c
 	${CC} -c -p ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 	@${LD} -o ${.TARGET}.tmp -X -r ${.TARGET}
Index: gnu/lib/libg2c/Makefile
===================================================================
RCS file: /home/dcvs/src/gnu/lib/libg2c/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- gnu/lib/libg2c/Makefile	17 Jun 2003 04:25:44 -0000	1.2
+++ gnu/lib/libg2c/Makefile	14 Mar 2005 15:57:33 -0000
@@ -111,7 +111,7 @@
 	@mv ${.TARGET}.tmp ${.TARGET}
 .endif
 
-.if !defined(NOPROFILE)
+.if !defined(NO_PROFILE)
 ${E77OBJS:.o=.po}: f2cext.c
 	${CC} -p ${CFLAGS} -c -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 	@${LD} -o ${.TARGET}.tmp -X -r ${.TARGET}
Index: lib/i18n_module/Makefile.inc
===================================================================
RCS file: /home/dcvs/src/lib/i18n_module/Makefile.inc,v
retrieving revision 1.1
diff -u -r1.1 Makefile.inc
--- lib/i18n_module/Makefile.inc	11 Mar 2005 20:47:05 -0000	1.1
+++ lib/i18n_module/Makefile.inc	14 Mar 2005 15:57:41 -0000
@@ -1,6 +1,6 @@
 # $DragonFly: src/lib/i18n_module/Makefile.inc,v 1.1 2005/03/11 20:47:05 joerg Exp $
 
-NOPROFILE=	1
+NO_PROFILE=	1
 .include "../Makefile.shlib"
 
 SHLIB_MAJOR=	${MODULE_SHLIB_MAJOR}
Index: lib/libdisk/Makefile
===================================================================
RCS file: /home/dcvs/src/lib/libdisk/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- lib/libdisk/Makefile	13 Mar 2005 15:10:03 -0000	1.3
+++ lib/libdisk/Makefile	14 Mar 2005 15:57:48 -0000
@@ -9,7 +9,7 @@
 # Remove KERN_DISKS_BROKEN when kern.disks sysctl returns disks in sorted order
 CFLAGS+= 	-Wall
 CLEANFILES+=	tmp.c tst01 tst01.o
-NOPROFILE=	yes
+NO_PROFILE=	yes
 NOPIC=		yes
 
 MAN=		libdisk.3
Index: lib/libncurses/libncurses/Makefile
===================================================================
RCS file: /home/dcvs/src/lib/libncurses/libncurses/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- lib/libncurses/libncurses/Makefile	12 Mar 2005 20:57:07 -0000	1.2
+++ lib/libncurses/libncurses/Makefile	14 Mar 2005 15:57:57 -0000
@@ -247,7 +247,7 @@
 SYMLINKS+=libncurses.so ${SHLIBDIR}/libmytinfo.so
 SYMLINKS+=libncurses.so ${SHLIBDIR}/libtinfo.so
 .endif
-.if !defined(NOPROFILE)
+.if !defined(NO_PROFILE)
 SYMLINKS+=libncurses_p.a ${LIBDIR}/libcurses_p.a
 SYMLINKS+=libncurses_p.a ${LIBDIR}/libtermcap_p.a
 SYMLINKS+=libncurses_p.a ${LIBDIR}/libtermlib_p.a
Index: lib/libpam/libpam/Makefile
===================================================================
RCS file: /home/dcvs/src/lib/libpam/libpam/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- lib/libpam/libpam/Makefile	20 Dec 2004 18:02:19 -0000	1.6
+++ lib/libpam/libpam/Makefile	14 Mar 2005 15:58:02 -0000
@@ -33,7 +33,7 @@
 LIB=		pam
 CFLAGS+=	-I${PAMDIR}/libpam/include -I${.CURDIR}
 CFLAGS+=	-DDEFAULT_MODULE_PATH=\"${SHLIBDIR}/\"
-NOPROFILE=	yes
+NO_PROFILE=	yes
 
 # Files from ${PAMDIR}/libpam:
 SRCS=		pam_account.c pam_auth.c pam_data.c pam_delay.c \
Index: lib/libpam/modules/Makefile.inc
===================================================================
RCS file: /home/dcvs/src/lib/libpam/modules/Makefile.inc,v
retrieving revision 1.2
diff -u -r1.2 Makefile.inc
--- lib/libpam/modules/Makefile.inc	17 Jun 2003 04:26:50 -0000	1.2
+++ lib/libpam/modules/Makefile.inc	14 Mar 2005 15:58:08 -0000
@@ -4,4 +4,4 @@
 PAMDIR=         ${.CURDIR}/../../../../contrib/libpam
 SHLIB_NAME=     ${LIB}.so
 NOINSTALLLIB=	yes
-NOPROFILE=	yes
+NO_PROFILE=	yes
Index: lib/libstand/Makefile
===================================================================
RCS file: /home/dcvs/src/lib/libstand/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- lib/libstand/Makefile	23 Oct 2004 15:58:18 -0000	1.7
+++ lib/libstand/Makefile	14 Mar 2005 15:58:14 -0000
@@ -9,7 +9,7 @@
 #
 
 LIB=		stand
-NOPROFILE=	YES
+NO_PROFILE=	YES
 NOPIC=		YES
 INCS=		stand.h
 MAN=		libstand.3
Index: secure/lib/libcipher/Makefile
===================================================================
RCS file: /home/dcvs/src/secure/lib/libcipher/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- secure/lib/libcipher/Makefile	17 Jun 2003 04:27:48 -0000	1.2
+++ secure/lib/libcipher/Makefile	14 Mar 2005 15:58:33 -0000
@@ -6,7 +6,7 @@
 LIB=		cipher
 SRCS=		crypt.c
 PRECIOUSLIB=	yes
-#NOPROFILE=	yes
+#NO_PROFILE=	yes
 
 MAN=	cipher.3
 MLINKS= cipher.3 encrypt.3 cipher.3 setkey.3
Index: share/man/man5/make.conf.5
===================================================================
RCS file: /home/dcvs/src/share/man/man5/make.conf.5,v
retrieving revision 1.9
diff -u -r1.9 make.conf.5
--- share/man/man5/make.conf.5	14 Mar 2005 09:10:17 -0000	1.9
+++ share/man/man5/make.conf.5	14 Mar 2005 15:58:43 -0000
@@ -529,7 +529,7 @@
 .It Va NOMANCOMPRESS
 .Pq Vt bool
 Set to install man pages uncompressed.
-.It Va NOPROFILE
+.It Va NO_PROFILE
 .Pq Vt bool
 Set to avoid compiling profiled libraries.
 .It Va NOSHARE
Index: share/mk/bsd.lib.mk
===================================================================
RCS file: /home/dcvs/src/share/mk/bsd.lib.mk,v
retrieving revision 1.8
diff -u -r1.8 bsd.lib.mk
--- share/mk/bsd.lib.mk	10 Mar 2005 14:30:31 -0000	1.8
+++ share/mk/bsd.lib.mk	14 Mar 2005 15:58:54 -0000
@@ -167,7 +167,7 @@
 
 .if !defined(INTERNALLIB)
 
-.if !defined(NOPROFILE) && defined(LIB) && !empty(LIB)
+.if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB)
 _LIBS+=		lib${LIB}_p.a
 POBJS+=		${OBJS:.o=.po} ${STATICOBJS:.o=.po}
 
@@ -249,7 +249,7 @@
 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${USELIBDIR}
 .endif
-.if !defined(NOPROFILE) && defined(LIB) && !empty(LIB)
+.if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB)
 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${USELIBDIR}
 .endif
@@ -304,7 +304,7 @@
 	rm -f a.out ${OBJS} ${OBJS:S/$/.tmp/} ${STATICOBJS}
 .endif
 .if !defined(INTERNALLIB)
-.if !defined(NOPROFILE) && defined(LIB) && !empty(LIB)
+.if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB)
 	rm -f ${POBJS} ${POBJS:S/$/.tmp/}
 .endif
 .if defined(SHLIB_NAME) || \
Index: usr.bin/lex/lib/Makefile
===================================================================
RCS file: /home/dcvs/src/usr.bin/lex/lib/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- usr.bin/lex/lib/Makefile	17 Jun 2003 04:29:28 -0000	1.2
+++ usr.bin/lex/lib/Makefile	14 Mar 2005 15:59:04 -0000
@@ -8,7 +8,7 @@
 LINKS=  ${LIBDIR}/libln.a ${LIBDIR}/libl.a
 LINKS+=	${LIBDIR}/libln.a ${LIBDIR}/libfl.a
 
-.if !defined(NOPROFILE)
+.if !defined(NO_PROFILE)
 LINKS+= ${LIBDIR}/libln_p.a ${LIBDIR}/libl_p.a
 LINKS+=	${LIBDIR}/libln_p.a ${LIBDIR}/libfl_p.a
 .endif

More information about the Submit mailing list