svn commit: r314893 - in head/usr.bin/fortune: . datfiles fortune unstr
Rodney W. Grimes
freebsd at pdx.rh.CN85.dnsmgr.net
Wed Mar 8 06:12:21 UTC 2017
> Author: ngie
> Date: Wed Mar 8 05:31:54 2017
> New Revision: 314893
> URL: https://svnweb.freebsd.org/changeset/base/314893
>
> Log:
> usr.bin/fortune: convert to OBJTOP/SRCTOP idioms
>
> - Use OBJTOP/SRCTOP-relative paths when looking for include files and
> strfile.
> - Add FORTUNES_OBJ and FORTUNES_SRC to abbreviate usr.bin/fortune
> pathing.
Is this a one off change, or are you planning to propogate this
to FOO_OBJ and FOO_SRC through out the tree?
> This is being done to simplify make output/idioms.
An hornorable goal, but I think, given the several different
attempts I have seen attempted at this, a step be taken
back to really engineer a solution.
> MFC after: 1 week
Please dont
> Reviewed by: bdrewery
I had asked that a larger discussion occur on -hackers
regarding the SRCTOP changes. I seen you post that, and
thank you for doing it, yesterday, however to proceed with a
Differential and commit without allowing that discussion to occur
is counter productive.
> Sponsored by: Dell EMC Isilon
> Differential Revision: D9916
>
> Modified:
> head/usr.bin/fortune/Makefile.inc
> head/usr.bin/fortune/datfiles/Makefile
> head/usr.bin/fortune/fortune/Makefile
> head/usr.bin/fortune/unstr/Makefile
>
> Modified: head/usr.bin/fortune/Makefile.inc
> ==============================================================================
> --- head/usr.bin/fortune/Makefile.inc Wed Mar 8 05:27:04 2017 (r314892)
> +++ head/usr.bin/fortune/Makefile.inc Wed Mar 8 05:31:54 2017 (r314893)
> @@ -1,3 +1,6 @@
> -.if exists(${.CURDIR}/../../Makefile.inc)
> -.include "${.CURDIR}/../../Makefile.inc"
> -.endif
> +# $FreeBSD$
When did this line get lost?
> +
> +FORTUNE_SRC= ${SRCTOP}/usr.bin/fortune
> +FORTUNE_OBJ= ${OBJTOP}/usr.bin/fortune
> +
> +.include "${SRCTOP}/usr.bin/Makefile.inc"
You have now added 3 hard codings of usr.bin into a Makefile which
makes it requre an edit to move this part of the src tree to any
other part. Is that REALLY the direction we want to go?
>
> Modified: head/usr.bin/fortune/datfiles/Makefile
> ==============================================================================
> --- head/usr.bin/fortune/datfiles/Makefile Wed Mar 8 05:27:04 2017 (r314892)
> +++ head/usr.bin/fortune/datfiles/Makefile Wed Mar 8 05:31:54 2017 (r314893)
> @@ -15,7 +15,7 @@ FILESDIR= ${SHAREDIR}/games/fortune
>
> .for f in ${DB}
> $f.dat: $f
> - PATH=$$PATH:/usr/bin:${.OBJDIR}/../strfile \
> + PATH=$$PATH:/usr/bin:${FORTUNE_OBJ}/strfile \
Are we seriously talking about introducing ~6000 variables into the .mk
system?
> strfile -Cs ${.ALLSRC} ${.TARGET}
> .endfor
>
>
> Modified: head/usr.bin/fortune/fortune/Makefile
> ==============================================================================
> --- head/usr.bin/fortune/fortune/Makefile Wed Mar 8 05:27:04 2017 (r314892)
> +++ head/usr.bin/fortune/fortune/Makefile Wed Mar 8 05:31:54 2017 (r314893)
> @@ -3,7 +3,7 @@
>
> PROG= fortune
> MAN= fortune.6
> -CFLAGS+=-DDEBUG -I${.CURDIR}/../strfile
> +CFLAGS+=-DDEBUG -I${FORTUNE_SRC}/strfile
>
> .include <bsd.prog.mk>
>
>
> Modified: head/usr.bin/fortune/unstr/Makefile
> ==============================================================================
> --- head/usr.bin/fortune/unstr/Makefile Wed Mar 8 05:27:04 2017 (r314892)
> +++ head/usr.bin/fortune/unstr/Makefile Wed Mar 8 05:31:54 2017 (r314893)
> @@ -3,6 +3,6 @@
>
> PROG= unstr
> MAN=
> -CFLAGS+= -I${.CURDIR}/../strfile
> +CFLAGS+= -I${FORTUNE_SRC}/strfile
>
> .include <bsd.prog.mk>
>
>
--
Rod Grimes rgrimes at freebsd.org
More information about the svn-src-all
mailing list