qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

let X directories build even if you forget depend.

Browse Source 
- use BUILDFIRST
- have fontconfig use normal 'all' targets to make sure its files are built
- explicitly document the fontconfig lib order

okay matthieu@
This commit is contained in:
espie 2017-06-18 21:09:07 +00:00
parent 7224838fbe
commit 251e3d9436
7 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/xterm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.31 2016/11/03 14:25:06 matthieu Exp $
# $OpenBSD: Makefile,v 1.32 2017/06/18 21:09:07 espie Exp $
.include <bsd.xconf.mk>
SUBDIR= icons resize
@ -55,6 +55,7 @@ builtin_icons.h :
awk '/^CASE_/{printf "#define %s %d\n", $$1, n++}' < $< >$@
beforedepend: builtin_icons.h VTparse.hin
BUILDFIRST = builtin_icons.h VTparse.hin
.SUFFIXES: .man .1

11
lib/fontconfig/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2015/04/05 16:05:34 matthieu Exp $
# $OpenBSD: Makefile,v 1.5 2017/06/18 21:09:07 espie Exp $
FONTCONFIG = ${.CURDIR}/../../dist/fontconfig
FC_DEFAULT_FONTS = ${X11BASE}/lib/X11/fonts
@ -6,7 +6,14 @@ FC_FONTPATH = "<dir>/usr/local/share/fonts</dir>"
CONFIGDIR = conf.d
FC_CACHEDIR = /var/cache/fontconfig
SUBDIR = fc-case fc-lang fc-glyphname src \
# Respect order:
SUBDIR = fc-case
# fc-lang depends on fc-case
SUBDIR += fc-lang fc-glyphname
# src requires fc-case fc-lang and fc-glyphname
SUBDIR += src \
fc-cache fc-cat fc-list fc-match fc-pattern fc-query \
fc-scan fc-validate conf.d pc doc

3
lib/fontconfig/fc-case/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.1 2013/03/09 14:34:44 matthieu Exp $
# $OpenBSD: Makefile,v 1.2 2017/06/18 21:09:07 espie Exp $
FONTCONFIG= ${.CURDIR}/../../../dist/fontconfig
PROG= fc-case
afterdepend: fccase.h
all: fccase.h
fccase.h: ${PROG}
./${PROG} ${FONTCONFIG}/fc-case/CaseFolding.txt \

3
lib/fontconfig/fc-glyphname/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.1 2013/03/09 14:34:44 matthieu Exp $
# $OpenBSD: Makefile,v 1.2 2017/06/18 21:09:07 espie Exp $
FONTCONFIG= ${.CURDIR}/../../../dist/fontconfig
PROG= fc-glyphname
afterdepend: fcglyphname.h
all: fcglyphname.h
fcglyphname.h: ${PROG}
./${PROG} ${FONTCONFIG}/fc-glyphname/zapfdingbats.txt \

3
lib/fontconfig/fc-lang/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1 2013/03/09 14:34:44 matthieu Exp $
# $OpenBSD: Makefile,v 1.2 2017/06/18 21:09:07 espie Exp $
FONTCONFIG= ${.CURDIR}/../../../dist/fontconfig
@ -7,6 +7,7 @@ PROG= fc-lang
CFLAGS+= -I../fc-case
afterdepend: fclang.h
all: fclang.h
fclang.h: ${PROG}
./${PROG} -d ${FONTCONFIG}/fc-lang ${ORTH} \

3
lib/fontconfig/src/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2016/08/09 18:57:45 matthieu Exp $
# $OpenBSD: Makefile,v 1.9 2017/06/18 21:09:07 espie Exp $
.include <bsd.xconf.mk>
@ -68,6 +68,7 @@ fcobjshash.h: fcobjshash.gperf
.endif
beforedepend: fcalias.h fcftalias.h fcobjshash.h lib${LIB}.la
BUILDFIRST = fcalias.h fcftalias.h fcobjshash.h lib${LIB}.la
lib${LIB}.la: ${.CURDIR}/lib${LIB}.la.in
sed -e 's#@libdir@#${LIBDIR}#g' \

3
lib/freetype/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.47 2017/01/13 11:19:58 dcoppa Exp $
# $OpenBSD: Makefile,v 1.48 2017/06/18 21:09:07 espie Exp $
FREETYPESRC= ${.CURDIR}/src
@ -30,6 +30,7 @@ CLEANFILES+= freetype-config freetype2.pc
obj: _xenocara_obj
beforedepend: freetype-config freetype2.pc
BUILDFIRST = freetype-config freetype2.pc
beforeinstall:
cd ${.CURDIR} ; exec ${MAKE} ${MAKE_FLAGS} includes