On Sun, Oct 09, 2016 at 02:32:12PM +0200, Matthieu Herrb wrote:
> Hi,
>
> while looking at what is needed to switch the xenocara build system to
> the same kind of scheme as base (no more SUDO, start as root and drop
> privs to $BUILDUSER), I figured out that the global 'includes' step
> done at the begin of 'make build' is causing more trouble than it's
> solving...
Makes sense to me, OK. I believe the includes target in
distrib/notes/Makefile can also be removed when you commit this.
See one other comment below.
natano
> Index: share/mk/bsd.xorg.mk
> ===================================================================
> RCS file: /cvs/OpenBSD/xenocara/share/mk/bsd.xorg.mk,v
> retrieving revision 1.53
> diff -u -p -u -r1.53 bsd.xorg.mk
> --- share/mk/bsd.xorg.mk 28 Mar 2016 11:59:06 -0000 1.53
> +++ share/mk/bsd.xorg.mk 8 Oct 2016 19:23:31 -0000
> @@ -129,10 +129,6 @@ realinstall: install-headers-subdirs
> .MAIN: all
> .endif
>
> -.if !target(includes)
> -includes: _SUBDIRUSE
> -.endif
> -
> .if defined(SHARED_LIBS)
> _lt_libs=
> .for _n _v in ${SHARED_LIBS}
> @@ -211,6 +207,10 @@ build:
> @exit 2
> .else
> build:
> +.if target(includes)
> + cd ${.CURDIR} && \
> + exec ${SUDO} ${MAKE} ${MAKE_FLAGS} ${_wrapper} includes
> +.endif
I think this is not be necessary. The only remaining 'includes' targets
are in freetype, libGLw and libepoxy. Those three take the header files
for the compile from the xenocara tree, not X11BASE. The headers will be
installed during 'make install' time anyway, so no need to do it again
before the compile.
> cd ${.CURDIR} && exec ${MAKE} ${MAKE_FLAGS} ${_wrapper} cleandir
> cd ${.CURDIR} && exec ${MAKE} ${MAKE_FLAGS} ${_wrapper} depend
> cd ${.CURDIR} && exec ${MAKE} ${MAKE_FLAGS} ${_wrapper} all
>
> --
> Matthieu Herrb
