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