On Tue, 20 Mar 2001, Bruce A. Mah wrote:

> If memory serves me right, "Michael C . Wu" wrote:
> 
> > cvs diff: Diffing .
> > Index: Makefile
> > ===================================================================
> > RCS file: /home/ncvs/src/usr.sbin/amd/mk-amd-map/Makefile,v
> > retrieving revision 1.11
> > diff -u -r1.11 Makefile
> > --- Makefile    2001/03/20 18:16:16     1.11
> > +++ Makefile    2001/03/20 21:37:46
> > @@ -8,6 +8,10 @@
> > 
> >  .PATH:         ${.CURDIR}/../../../contrib/amd/mk-amd-map
> > 
> > +MAN8=          mk-amd-map.8
> > +
> > +SRCS=          mk-amd-map.c
> > +
> >  PROG=          mk-amd-map
> > 
> >  .include <bsd.prog.mk>
> 
> That reverts all of Ruslan's change.  You don't want to put the MAN8=
> definition back, because that was the point of his commit.  Just the 
> SRCS= needs to be reverted.

It doesn't quite revert them.  It also adds 2 style bugs (1 more blank
line and perfect disordering of the macros (the normal order is
PROG, [SRCS], [MAN*]).

> Now Ruslan (or someone) needs to go and fix all of these files too:
> 
> src/usr.sbin/amd/wire-test/Makefile
> src/usr.sbin/ancontrol/Makefile
> src/usr.sbin/usbdevs/Makefile
> src/usr.sbin/wicontrol/Makefile
> src/usr.sbin/wlconfig/Makefile

Only the amd ones are broken.  The bug is in ../Makefile.inc.  It spams
${SRCS} with some nfs headers.  This breaks <bsd.prog.mk>'s automatic
setting of ${SRCS} from ${PROG}.  SRCS should be under the control of
individual Makefiles except for the default in <bsd.prog.mk>.

This bug also causes bogus setting and building of nfs headers in amd
subdirs that don't have any C sources and/or don't need any nfs headers,
e.g. in the scripts subdir.

Bruce


To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message

Reply via email to