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

Introduce bsd.xconf.mk to set default config variables used

Browse Source 
at several places in the Xenocara build in a central place instead
of duplicating the checks all over the place. ok oga@.
This commit is contained in:
matthieu 2008-03-25 23:41:50 +00:00
parent 736c23fba4
commit bbc31bf586
26 changed files with 95 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Makefile
View File

@ -1,4 +1,5 @@
# $OpenBSD: Makefile,v 1.14 2008/02/21 08:04:44 todd Exp $ # $OpenBSD: Makefile,v 1.15 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.xconf.mk>
SUBDIR= bdftopcf mkfontscale mkfontdir \ SUBDIR= bdftopcf mkfontscale mkfontdir \
appres beforelight bitmap editres fonttosfnt fslsfonts \ appres beforelight bitmap editres fonttosfnt fslsfonts \
@ -16,13 +17,12 @@ SUBDIR= bdftopcf mkfontscale mkfontdir \
xwud xwud
# Font server doesn't link on architectures with static only libraries # Font server doesn't link on architectures with static only libraries
.if ${MACHINE} != landisk && ${MACHINE} != "vax" && ${MACHINE_ARCH} != "m88k" .if ${XENOCARA_HAVE_SHARED_LIBS:L} == "yes"
SUBDIR += xfs SUBDIR += xfs
.endif .endif
# GL # GL
.if ${MACHINE} != "sgi" && ${MACHINE} != "vax" && ${MACHINE_ARCH} != "m88k" \ .if ${XENOCARA_BUILD_GL:L} == "yes"
&& ${MACHINE} != "landisk"
SUBDIR += xdriinfo glxgears glxinfo SUBDIR += xdriinfo glxgears glxinfo
.endif .endif

6
app/cwm/Makefile
View File

@ -1,8 +1,6 @@
# $OpenBSD: Makefile,v 1.5 2008/03/23 15:09:21 simon Exp $ # $OpenBSD: Makefile,v 1.6 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.own.mk> .include <bsd.xconf.mk>
X11BASE?= /usr/X11R6
PROG= cwm PROG= cwm

6
app/fvwm/Makefile.inc
View File

@ -1,11 +1,9 @@
# -*- makefile -*- # -*- makefile -*-
# $OpenBSD: Makefile.inc,v 1.4 2007/04/04 22:33:46 david Exp $ # $OpenBSD: Makefile.inc,v 1.5 2008/03/25 23:41:50 matthieu Exp $
.ifndef FVWM_MAKEFILE_INC .ifndef FVWM_MAKEFILE_INC
FVWM_MAKEFILE_INC = done FVWM_MAKEFILE_INC = done
.include <bsd.own.mk> .include <bsd.xconf.mk>
X11BASE?= /usr/X11R6
CFLAGS+= -I${X11BASE}/include -I${.CURDIR} -I${.CURDIR}/.. \ CFLAGS+= -I${X11BASE}/include -I${.CURDIR} -I${.CURDIR}/.. \
-I${.CURDIR}/../libs -I${.CURDIR}/../libs

6
app/glxgears/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.5 2007/04/08 21:53:14 matthieu Exp $ # $OpenBSD: Makefile,v 1.6 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.own.mk> .include <bsd.xconf.mk>
X11BASE?= /usr/X11R6
DIST= ${XSRCDIR}/dist/Mesa DIST= ${XSRCDIR}/dist/Mesa
GLXGEARS= ${DIST}/progs/xdemos GLXGEARS= ${DIST}/progs/xdemos
MANDIR= ${X11BASE}/man/cat MANDIR= ${X11BASE}/man/cat

6
app/glxinfo/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.5 2007/04/08 21:53:14 matthieu Exp $ # $OpenBSD: Makefile,v 1.6 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.own.mk> .include <bsd.xconf.mk>
X11BASE?= /usr/X11R6
DIST= ${XSRCDIR}/dist/Mesa DIST= ${XSRCDIR}/dist/Mesa
GLXINFO= ${DIST}/progs/xdemos GLXINFO= ${DIST}/progs/xdemos
MANDIR= ${X11BASE}/man/cat MANDIR= ${X11BASE}/man/cat

5
app/ssh-askpass/Makefile
View File

@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.9 2008/03/19 20:31:09 matthieu Exp $ # $OpenBSD: Makefile,v 1.10 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.xconf.mk>
.include <bsd.own.mk>
X11BASE?= /usr/X11R6
PROG= ssh-askpass PROG= ssh-askpass
SRCS= drawing.c dynlist.c resources.c x11-ssh-askpass.c SRCS= drawing.c dynlist.c resources.c x11-ssh-askpass.c
MANDIR= ${X11BASE}/man/cat MANDIR= ${X11BASE}/man/cat

6
app/xidle/Makefile
View File

@ -1,7 +1,5 @@
# $OpenBSD: Makefile,v 1.3 2007/04/09 11:14:25 matthieu Exp $ # $OpenBSD: Makefile,v 1.4 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.xconf.mk>
.include <bsd.own.mk>
X11BASE?= /usr/X11R6
PROG= xidle PROG= xidle

4
app/xsystrace/Makefile
View File

@ -1,4 +1,5 @@
# $OpenBSD: Makefile,v 1.8 2007/04/09 15:47:23 matthieu Exp $ # $OpenBSD: Makefile,v 1.9 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.xconf.mk>
PROG= xsystrace PROG= xsystrace
MAN= xsystrace.1 MAN= xsystrace.1
@ -16,7 +17,6 @@ afterinstall:
${INSTALL_DATA} \ ${INSTALL_DATA} \
${.CURDIR}/Xsystrace.ad ${DESTDIR}/etc/X11/app-defaults/Xsystrace ${.CURDIR}/Xsystrace.ad ${DESTDIR}/etc/X11/app-defaults/Xsystrace
X11BASE?= /usr/X11R6
MANDIR= ${X11BASE}/man/cat MANDIR= ${X11BASE}/man/cat
obj: _xenocara_obj obj: _xenocara_obj

4
app/xterm/Makefile
View File

@ -1,4 +1,5 @@
# $OpenBSD: Makefile,v 1.10 2008/03/22 12:40:02 merdely Exp $ # $OpenBSD: Makefile,v 1.11 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.xconf.mk>
SUBDIR= icons resize SUBDIR= icons resize
@ -22,7 +23,6 @@ SRCS= TekPrsTbl.c Tekproc.c VTPrsTbl.c button.c cachedGCs.c \
misc.c precompose.c print.c ptydata.c wcwidth.c screen.c \ misc.c precompose.c print.c ptydata.c wcwidth.c screen.c \
scrollbar.c tabs.c util.c xstrings.c scrollbar.c tabs.c util.c xstrings.c
X11BASE?= /usr/X11R6
MANDIR= ${X11BASE}/man/cat MANDIR= ${X11BASE}/man/cat
XETC?= /etc/X11 XETC?= /etc/X11

4
app/xtsscale/Makefile
View File

@ -1,4 +1,5 @@
# $OpenBSD: Makefile,v 1.3 2007/08/31 21:17:33 matthieu Exp $ # $OpenBSD: Makefile,v 1.4 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.xconf.mk>
PROG= xtsscale PROG= xtsscale
MAN= xtsscale.1 MAN= xtsscale.1
@ -7,7 +8,6 @@ CPPFLAGS+= -I${X11BASE}/include -I${X11BASE}/include/freetype2
LDADD+= -L${X11BASE}/lib -lXft -lXrender -lX11 -lXau \ LDADD+= -L${X11BASE}/lib -lXft -lXrender -lX11 -lXau \
-lXdmcp -lfontconfig -lexpat -lfreetype -lz -lXdmcp -lfontconfig -lexpat -lfreetype -lz
X11BASE?= /usr/X11R6
MANDIR= ${X11BASE}/man/cat MANDIR= ${X11BASE}/man/cat
obj: _xenocara_obj obj: _xenocara_obj

6
app/xvctl/Makefile
View File

@ -1,7 +1,5 @@
# $OpenBSD: Makefile,v 1.3 2007/04/09 15:48:56 matthieu Exp $ # $OpenBSD: Makefile,v 1.4 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.xconf.mk>
.include <bsd.own.mk>
X11BASE?= /usr/X11R6
PROG=xvctl PROG=xvctl
MAN=xvctl.1 MAN=xvctl.1

6
driver/xf86-video-ati/Makefile.bsd-wrapper
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/02/02 17:19:57 matthieu Exp $ # $OpenBSD: Makefile.bsd-wrapper,v 1.4 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.own.mk> .include <bsd.xconf.mk>
.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes" .if ${XENOCARA_BUILD_DRI:L} != "yes"
CONFIGURE_ARGS+= --disable-dri CONFIGURE_ARGS+= --disable-dri
.endif .endif

6
driver/xf86-video-glint/Makefile.bsd-wrapper
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/02/02 17:19:57 matthieu Exp $ # $OpenBSD: Makefile.bsd-wrapper,v 1.4 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.own.mk> .include <bsd.xconf.mk>
.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes" .if ${XENOCARA_BUILD_DRI:L} != "yes"
CONFIGURE_ARGS+= --disable-dri CONFIGURE_ARGS+= --disable-dri
.endif .endif

6
driver/xf86-video-i810/Makefile.bsd-wrapper
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2008/02/02 17:19:57 matthieu Exp $ # $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.own.mk> .include <bsd.xconf.mk>
.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes" .if ${XENOCARA_BUILD_DRI:L} != "yes"
CONFIGURE_ARGS+= --disable-dri CONFIGURE_ARGS+= --disable-dri
.endif .endif

6
driver/xf86-video-intel/Makefile.bsd-wrapper
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2008/02/02 17:19:57 matthieu Exp $ # $OpenBSD: Makefile.bsd-wrapper,v 1.5 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.own.mk> .include <bsd.xconf.mk>
.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes" .if ${XENOCARA_BUILD_DRI:L} != "yes"
CONFIGURE_ARGS+= --disable-dri CONFIGURE_ARGS+= --disable-dri
.endif .endif

6
driver/xf86-video-mga/Makefile.bsd-wrapper
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/02/02 17:19:57 matthieu Exp $ # $OpenBSD: Makefile.bsd-wrapper,v 1.4 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.own.mk> .include <bsd.xconf.mk>
.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes" .if ${XENOCARA_BUILD_DRI:L} != "yes"
CONFIGURE_ARGS+= --disable-dri CONFIGURE_ARGS+= --disable-dri
.endif .endif

6
driver/xf86-video-savage/Makefile.bsd-wrapper
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/02/02 17:19:57 matthieu Exp $ # $OpenBSD: Makefile.bsd-wrapper,v 1.4 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.own.mk> .include <bsd.xconf.mk>
.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes" .if ${XENOCARA_BUILD_DRI:L} != "yes"
CONFIGURE_ARGS+= --disable-dri CONFIGURE_ARGS+= --disable-dri
.endif .endif

6
driver/xf86-video-sis/Makefile.bsd-wrapper
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/02/02 17:19:57 matthieu Exp $ # $OpenBSD: Makefile.bsd-wrapper,v 1.4 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.own.mk> .include <bsd.xconf.mk>
.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes" .if ${XENOCARA_BUILD_DRI:L} != "yes"
CONFIGURE_ARGS+= --disable-dri CONFIGURE_ARGS+= --disable-dri
.endif .endif

6
driver/xf86-video-tdfx/Makefile.bsd-wrapper
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/02/02 17:19:57 matthieu Exp $ # $OpenBSD: Makefile.bsd-wrapper,v 1.4 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.own.mk> .include <bsd.xconf.mk>
.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes" .if ${XENOCARA_BUILD_DRI:L} != "yes"
CONFIGURE_ARGS+= --disable-dri CONFIGURE_ARGS+= --disable-dri
.endif .endif

6
driver/xf86-video-via/Makefile.bsd-wrapper
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/02/02 17:19:57 matthieu Exp $ # $OpenBSD: Makefile.bsd-wrapper,v 1.4 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.own.mk> .include <bsd.xconf.mk>
.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes" .if ${XENOCARA_BUILD_DRI:L} != "yes"
CONFIGURE_ARGS+= --disable-dri CONFIGURE_ARGS+= --disable-dri
.endif .endif

15
lib/Makefile
View File

@ -1,4 +1,6 @@
# $OpenBSD: Makefile,v 1.8 2008/03/21 21:07:48 oga Exp $ # $OpenBSD: Makefile,v 1.9 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.xconf.mk>
SUBDIR= freetype fontconfig libxtrans libXau libXdmcp \ SUBDIR= freetype fontconfig libxtrans libXau libXdmcp \
libX11 libXext libXrender libXft libdmx libfontenc \ libX11 libXext libXrender libXft libdmx libfontenc \
@ -9,14 +11,11 @@ SUBDIR= freetype fontconfig libxtrans libXau libXdmcp \
libXprintAppUtil libXrandr libXRes libXScrnSaver libXTrap \ libXprintAppUtil libXrandr libXRes libXScrnSaver libXTrap \
libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm
DRM_ARCHES= alpha amd64 i386 macppc sparc64 .if ${XENOCARA_BUILD_DRI:L} == "yes"
SUBDIR+= libdrm
.endif
.for a in $(DRM_ARCHES) .if ${XENOCARA_BUILD_GL:L} == "yes"
SUBDIR_$a+= libdrm
.endfor
SUBDIR+= $(SUBDIR_$(MACHINE))
.if ${MACHINE} != "sgi" && ${MACHINE} != "vax"
SUBDIR+= libGL libGLU libGLw SUBDIR+= libGL libGLU libGLw
.endif .endif

10
lib/libGL/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.17 2008/02/12 21:09:27 matthieu Exp $ # $OpenBSD: Makefile,v 1.18 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.own.mk> .include <bsd.xconf.mk>
.if defined(XENOCARA_BUILD_DRI) && ${XENOCARA_BUILD_DRI:L} == "yes" .if ${XENOCARA_BUILD_DRI:L} == "yes"
SUBDIR=libmesa dri SUBDIR=libmesa dri
.endif .endif
@ -22,7 +22,7 @@ DRI_DRIVER_SEARCH_DIR= $(DRI_DRIVER_INSTALL_DIR)
INCSDIR= ${X11BASE}/include/GL INCSDIR= ${X11BASE}/include/GL
.if defined(XENOCARA_BUILD_DRI) && ${XENOCARA_BUILD_DRI:L} == "yes" .if ${XENOCARA_BUILD_DRI:L} == "yes"
LDADD= -L${X11BASE}/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes -ldrm LDADD= -L${X11BASE}/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes -ldrm
.else .else
LDADD= -L${X11BASE}/lib -lXext -lX11 LDADD= -L${X11BASE}/lib -lXext -lX11
@ -51,7 +51,7 @@ CPPFLAGS+= \
-DHAVE_ALIAS \ -DHAVE_ALIAS \
-D_REENTRANT -D_REENTRANT
.if defined(XENOCARA_BUILD_DRI) && ${XENOCARA_BUILD_DRI:L} == "yes" .if ${XENOCARA_BUILD_DRI:L} == "yes"
CPPFLAGS+= -DGLX_DIRECT_RENDERING CPPFLAGS+= -DGLX_DIRECT_RENDERING
.endif .endif

5
lib/libGL/dri/Makefile.inc
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile.inc,v 1.4 2008/02/20 22:41:51 matthieu Exp $ # $OpenBSD: Makefile.inc,v 1.5 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.own.mk> .include <bsd.xconf.mk>
MESA= ${.CURDIR}/../../../../dist/Mesa/src/mesa MESA= ${.CURDIR}/../../../../dist/Mesa/src/mesa
TOP= ${.CURDIR}/../../../../dist/Mesa TOP= ${.CURDIR}/../../../../dist/Mesa
DRI_DRIVER_INSTALL_DIR= ${X11BASE}/lib/modules/dri DRI_DRIVER_INSTALL_DIR= ${X11BASE}/lib/modules/dri
X11BASE ?= /usr/X11R6
COMMON_SOURCES = \ COMMON_SOURCES = \
driverfuncs.c \ driverfuncs.c \

4
share/mk/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2007/03/18 10:26:58 matthieu Exp $ # $OpenBSD: Makefile,v 1.3 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
FILES= automake.dep bsd.xorg.mk FILES= automake.dep bsd.xconf.mk bsd.xorg.mk
all: all:

22
share/mk/bsd.xconf.mk Normal file
View File

@ -0,0 +1,22 @@
# $OpenBSD: bsd.xconf.mk,v 1.1 2008/03/25 23:41:50 matthieu Exp $
# Shared libs?
.if ${MACHINE} == landisk || ${MACHINE} == "mvme88k" || ${MACHINE} == "vax"
XENOCARA_HAVE_SHARED_LIBS?=no
.else
XENOCARA_HAVE_SHARED_LIBS?=yes
.endif
# Build DRI?
.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
XENOCARA_BUILD_DRI?=yes
.else
XENOCARA_BUILD_DRI?=no
.endif
# Build GL libs and apps
.if ${MACHINE} == "landisk" || ${MACHINE_ARCH} == "m88k" || ${MACHINE} == "sgi" || ${MACHINE} == vax
XENOCARA_BUILD_GL?=no
.else
XENOCARA_BUILD_GL?=yes
.endif

9
xserver/Makefile.bsd-wrapper
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.20 2008/02/13 21:34:15 miod Exp $ # $OpenBSD: Makefile.bsd-wrapper,v 1.21 2008/03/25 23:41:50 matthieu Exp $
.include <bsd.own.mk> .include <bsd.xconf.mk>
DIST= ${.CURDIR} DIST= ${.CURDIR}
@ -27,12 +27,11 @@ NO_XF86_UTIL_${M} = --disable-xfree86-utils
.endfor .endfor
NO_XF86_UTIL_OPTION=${NO_XF86_UTIL_${MACHINE}} NO_XF86_UTIL_OPTION=${NO_XF86_UTIL_${MACHINE}}
.if ${MACHINE} != "landisk" && ${MACHINE} != "sgi" && ${MACHINE} != "vax" && \ .if ${XENOCARA_BUILD_GL:L} == "yes"
${MACHINE_ARCH} != "m68k"
MESA_SOURCE= --with-mesa-source=${XSRCDIR}/dist/Mesa MESA_SOURCE= --with-mesa-source=${XSRCDIR}/dist/Mesa
.endif .endif
.if defined(XENOCARA_BUILD_DRI) && ${XENOCARA_BUILD_DRI:L} == "yes" .if ${XENOCARA_BUILD_DRI:L} == "yes"
DRI_OPTION= --enable-dri --with-dri-driver-path=${X11BASE}/lib/modules/dri DRI_OPTION= --enable-dri --with-dri-driver-path=${X11BASE}/lib/modules/dri
.endif .endif