From owner-cvs-all Mon Mar 18 0:52: 3 2002 Delivered-To: cvs-all@freebsd.org Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by hub.freebsd.org (Postfix) with ESMTP id A0D5F37B400; Mon, 18 Mar 2002 00:51:46 -0800 (PST) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.11.6/8.11.2) id g2I8peL42334; Mon, 18 Mar 2002 10:51:40 +0200 (EET) (envelope-from ru) Date: Mon, 18 Mar 2002 10:51:40 +0200 From: Ruslan Ermilov To: Mark Murray Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/share/mk bsd.lib.mk sys.mk src/sys/conf kern.post.mk kmod.mk Message-ID: <20020318085140.GD37136@sunbay.com> References: <200203171005.g2HA5vt02562@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200203171005.g2HA5vt02562@freefall.freebsd.org> User-Agent: Mutt/1.3.27i Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sun, Mar 17, 2002 at 02:05:57AM -0800, Mark Murray wrote: > markm 2002/03/17 02:05:57 PST > > Modified files: > share/mk bsd.lib.mk sys.mk > sys/conf kern.post.mk kmod.mk > Log: > Allow "make lint" to mostly work. Our sources are very unclean WRT > lint, so this is turned off by default. Setting WANT_LINT will turn > on generation of lint libraries for /usr/libdata/lint/*.ln. > > Reviewd by: silence in -audit. > > Revision Changes Path > 1.104 +34 -7 src/share/mk/bsd.lib.mk > 1.57 +5 -2 src/share/mk/sys.mk > 1.11 +3 -0 src/sys/conf/kern.post.mk > 1.114 +3 -0 src/sys/conf/kmod.mk > %%% Index: share/mk/bsd.lib.mk =================================================================== RCS file: /home/ncvs/src/share/mk/bsd.lib.mk,v retrieving revision 1.104 diff -u -r1.104 bsd.lib.mk --- share/mk/bsd.lib.mk 17 Mar 2002 10:05:57 -0000 1.104 +++ share/mk/bsd.lib.mk 18 Mar 2002 08:49:52 -0000 @@ -58,11 +58,11 @@ .c.ln: ${LINT} ${LINTOBJFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC} || \ - touch ${.TARGET} + touch ${.TARGET} .cc.ln .C.ln .cpp.ln .cxx.ln: - ${LINT} ${LINTOBJFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC} || \ - touch ${.TARGET} + ${LINT} ${LINTOBJFLAGS} ${CXXFLAGS:M-[DIU]*} ${.IMPSRC} || \ + touch ${.TARGET} .c.o: ${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} @@ -167,10 +167,9 @@ LINTOBJS+= ${SRCS:M*.c:C/\..+$/.ln/} -.if defined(WANT_LINT) && defined(LIB) && defined(LINTOBJS) && (${LINTOBJS} != "") +.if defined(WANT_LINT) && defined(LIB) && defined(LINTOBJS) && !empty(LINTOBJS) LINTLIB=llib-l${LIB}.ln -.else -LINTLIB= +_LIBS+=${LINTLIB} .endif .if defined(SHLIB_NAME) @@ -189,9 +188,9 @@ .endif .if !defined(NOMAN) -all: objwarn ${_LIBS} all-man _SUBDIR ${LINTLIB} +all: objwarn ${_LIBS} all-man _SUBDIR .else -all: objwarn ${_LIBS} _SUBDIR ${LINTLIB} +all: objwarn ${_LIBS} _SUBDIR .endif OBJS+= ${SRCS:N*.h:R:S/$/.o/g} @@ -239,9 +238,9 @@ ${RANLIB} lib${LIB}_pic.a .endif -.if defined(WANT_LINT) && defined(LIB) && defined(LINTOBJS) && (${LINTOBJS} != "") +.if defined(WANT_LINT) && defined(LIB) && defined(LINTOBJS) && !empty(LINTOBJS) ${LINTLIB}: ${LINTOBJS} - @${ECHO} building lint library ${SHLIB_NAME} + @${ECHO} building lint library ${LINTLIB} @rm -f ${LINTLIB} ${LINT} ${LINTLIBFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC} .endif @@ -249,7 +248,7 @@ .if !target(clean) clean: _SUBDIR rm -f a.out ${OBJS} ${STATICOBJS} ${OBJS:S/$/.tmp/} ${CLEANFILES} - rm -f lib${LIB}.a ${LINTLIB} + rm -f lib${LIB}.a rm -f ${POBJS} ${POBJS:S/$/.tmp/} lib${LIB}_p.a rm -f ${SOBJS} ${SOBJS:.So=.so} ${SOBJS:S/$/.tmp/} \ ${SHLIB_NAME} ${SHLIB_LINK} \ @@ -348,7 +347,7 @@ ln -fs $$l $$t; \ done; true .endif -.if defined(WANT_LINT) && defined(LIB) && defined(LINTOBJS) && (${LINTOBJS} != "") +.if defined(WANT_LINT) && defined(LIB) && defined(LINTOBJS) && !empty(LINTOBJS) ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR} .endif @@ -375,9 +374,8 @@ .if !target(lint) lint: ${SRCS:M*.c} _SUBDIR - ${LINT} ${LINTOBJFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC} | more 2>&1 + ${LINT} ${LINTOBJFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC} .endif - .if !defined(NOMAN) .include Index: sys/conf/kern.post.mk =================================================================== RCS file: /home/ncvs/src/sys/conf/kern.post.mk,v retrieving revision 1.11 diff -u -r1.11 kern.post.mk --- sys/conf/kern.post.mk 17 Mar 2002 10:05:57 -0000 1.11 +++ sys/conf/kern.post.mk 18 Mar 2002 08:49:52 -0000 @@ -58,7 +58,7 @@ find . -type f ! -name version -delete lint: ${CFILES} - ${LINT} ${LINTKERNFLAGS} ${CFLAGS:M-[DILU]*} ${.ALLSRC} | more 2>&1 + ${LINT} ${LINTKERNFLAGS} ${CFLAGS:M-[DILU]*} ${.ALLSRC} locore.o: $S/$M/$M/locore.s assym.s ${NORMAL_S} Index: sys/conf/kmod.mk =================================================================== RCS file: /home/ncvs/src/sys/conf/kmod.mk,v retrieving revision 1.114 diff -u -r1.114 kmod.mk --- sys/conf/kmod.mk 17 Mar 2002 10:05:57 -0000 1.114 +++ sys/conf/kmod.mk 18 Mar 2002 08:49:52 -0000 @@ -339,7 +339,7 @@ regress: lint: ${SRCS} - ${LINT} ${LINTKERNFLAGS} ${CFLAGS:M-[DILU]*} ${.ALLSRC:M*.c} | more 2>&1 + ${LINT} ${LINTKERNFLAGS} ${CFLAGS:M-[DILU]*} ${.ALLSRC:M*.c} .include %%% Cheers, -- Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message