openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-14 05:08:53 +00:00
Code Issues Projects Releases Wiki Activity

Remove the global 'make includes' step from 'make build'.

Browse Source 
This is no longer needed and gets in the way of tightening
permission used during build. ok and suggestions natano@
This commit is contained in:
matthieu
2016-10-10 13:34:43 +00:00
parent 178fb5f1c1
commit d9fc70eb7c
5 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.73 2016/10/02 09:25:23 tb Exp $ # $OpenBSD: Makefile,v 1.74 2016/10/10 13:34:43 matthieu Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
.include <bsd.xconf.mk> .include <bsd.xconf.mk>
@@ -43,7 +43,6 @@ bootstrap-root:
beforeinstall beforebuild: beforeinstall beforebuild:
cd util/macros && exec ${MAKE} -f Makefile.bsd-wrapper install cd util/macros && exec ${MAKE} -f Makefile.bsd-wrapper install
exec ${MAKE} includes
afterinstall afterbuild: afterinstall afterbuild:
exec ${MAKE} fix-appd exec ${MAKE} fix-appd

4
app/fvwm/Makefile
View File

@@ -1,9 +1,7 @@
# $OpenBSD: Makefile,v 1.3 2015/07/19 10:43:08 matthieu Exp $ # $OpenBSD: Makefile,v 1.4 2016/10/10 13:34:43 matthieu Exp $
SUBDIR= libs fvwm sample.fvwmrc utils icons modules SUBDIR= libs fvwm sample.fvwmrc utils icons modules
includes:
update: update:
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

10
lib/freetype/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.44 2016/08/09 07:16:08 dcoppa Exp $ # $OpenBSD: Makefile,v 1.45 2016/10/10 13:34:43 matthieu Exp $
FREETYPESRC= ${.CURDIR}/src FREETYPESRC= ${.CURDIR}/src
@@ -29,7 +29,10 @@ CLEANFILES+= freetype-config freetype2.pc
obj: _xenocara_obj obj: _xenocara_obj
beforedepend: freetype-config freetype2.pc includes-root beforedepend: freetype-config freetype2.pc
beforeinstall:
cd ${.CURDIR} ; exec ${MAKE} ${MAKE_FLAGS} includes
includes: _SUBDIRUSE includes: _SUBDIRUSE
@cmp -s ${DESTDIR}${X11BASE}/include/freetype2/ft2build.h \ @cmp -s ${DESTDIR}${X11BASE}/include/freetype2/ft2build.h \
@@ -41,9 +44,6 @@ includes: _SUBDIRUSE
${INSTALL_DATA} ${.CURDIR}/builds/unix/ftconfig.h \ ${INSTALL_DATA} ${.CURDIR}/builds/unix/ftconfig.h \
${DESTDIR}${X11BASE}/include/freetype2/freetype/config/ftconfig.h ${DESTDIR}${X11BASE}/include/freetype2/freetype/config/ftconfig.h
includes-root:
cd ${.CURDIR} && exec ${SUDO} ${MAKE} includes
install-pc: freetype2.pc install-pc: freetype2.pc
${INSTALL_DATA} freetype2.pc ${DESTDIR}${LIBDIR}/pkgconfig ${INSTALL_DATA} freetype2.pc ${DESTDIR}${LIBDIR}/pkgconfig

4
lib/libepoxy/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2016/10/08 19:09:34 matthieu Exp $ # $OpenBSD: Makefile,v 1.6 2016/10/10 13:34:43 matthieu Exp $
.include <bsd.xconf.mk> .include <bsd.xconf.mk>
EPOXY= ${.CURDIR}/../../dist/libepoxy EPOXY= ${.CURDIR}/../../dist/libepoxy
@@ -50,6 +50,8 @@ includes: _SUBDIRUSE
eval "$$j"; \ eval "$$j"; \
done done
beforeinstall: includes
NOPROFILE= NOPROFILE=
PKGCONFIG= epoxy.pc PKGCONFIG= epoxy.pc

6
share/mk/bsd.xorg.mk
View File

@@ -1,4 +1,4 @@
# $OpenBSD: bsd.xorg.mk,v 1.53 2016/03/28 11:59:06 matthieu Exp $ -*- makefile -*- # $OpenBSD: bsd.xorg.mk,v 1.54 2016/10/10 13:34:43 matthieu Exp $ -*- makefile -*-
# #
# Copyright <20> 2006,2012 Matthieu Herrb # Copyright <20> 2006,2012 Matthieu Herrb
# #
@@ -129,10 +129,6 @@ realinstall: install-headers-subdirs
.MAIN: all .MAIN: all
.endif .endif
.if !target(includes)
includes: _SUBDIRUSE
.endif
.if defined(SHARED_LIBS) .if defined(SHARED_LIBS)
_lt_libs= _lt_libs=
.for _n _v in ${SHARED_LIBS} .for _n _v in ${SHARED_LIBS}