Date: Wed, 20 Aug 1997 03:56:12 +1000 From: Bruce Evans <bde@zeta.org.au> To: bugs@FreeBSD.ORG, nnd@itfs.nsk.su Subject: Re: bin/4314: games/boggle Makefile correction Message-ID: <199708191756.DAA21799@godzilla.zeta.org.au>
next in thread | raw e-mail | index | archive | help
> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199708191756.DAA21799>