From owner-freebsd-bugs  Tue Aug 19 10:56:46 1997
Return-Path: <owner-freebsd-bugs>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id KAA22772
          for bugs-outgoing; Tue, 19 Aug 1997 10:56:46 -0700 (PDT)
Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.2.228.19])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id KAA22763
          for <bugs@FreeBSD.ORG>; Tue, 19 Aug 1997 10:56:42 -0700 (PDT)
Received: (from bde@localhost) by godzilla.zeta.org.au (8.8.5/8.6.9) id DAA21799; Wed, 20 Aug 1997 03:56:12 +1000
Date: Wed, 20 Aug 1997 03:56:12 +1000
From: Bruce Evans <bde@zeta.org.au>
Message-Id: <199708191756.DAA21799@godzilla.zeta.org.au>
To: bugs@FreeBSD.ORG, nnd@itfs.nsk.su
Subject: Re: bin/4314: games/boggle Makefile correction
Sender: owner-freebsd-bugs@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

>	Here is another patch (relative to previous one
>already committed by jkh). After it:
>
>1) All work is done at 'make all' stage and not at 'make install';
>2) All standard targets (obj clean cleandepend depend all install cleandir)
>works with/without '-j12' flag (one at a time - their combinations
>have little sense with '-j12');
>3) 'cleandepend' target works (with unpatched Makefile it only
>produced 'rm -f .depend' at top level).

>--- src/games/boggle/Makefile	Mon Aug 18 15:28:47 1997
>+++ src/games/boggle-patched/Makefile	Mon Aug 18 16:20:56 1997
>...
>+.if make(depend) || make(cleandepend)
>+.include <bsd.subdir.mk>
>+.else
> .include <bsd.prog.mk>
>+.endif

OK, except the `cleandepend' bug seems to be elsewhere - the default
for cleandepend in bsd.dep.mk (included from bsd.prog.mk) only works
right if SRCS is defined, but SRCS isn't defined here since all the C
programs are in subdirectories.  Partially tested fix:

diff -c2 bsd.dep.mk~ bsd.dep.mk
*** bsd.dep.mk~	Fri Jun 20 17:48:24 1997
--- bsd.dep.mk	Wed Aug 20 03:39:48 1997
***************
*** 84,90 ****
  .endif
  
- .if defined(SRCS)
  .if !target(cleandepend)
  cleandepend: _SUBDIR
  	rm -f ${DEPENDFILE}
  	rm -f ${.CURDIR}/GRTAGS ${.CURDIR}/GTAGS
--- 84,90 ----
  .endif
  
  .if !target(cleandepend)
  cleandepend: _SUBDIR
+ .if defined(SRCS)
  	rm -f ${DEPENDFILE}
  	rm -f ${.CURDIR}/GRTAGS ${.CURDIR}/GTAGS

Bruce