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

xcb is no longer optional.

Browse Source
This commit is contained in:
matthieu 2011-03-08 20:48:59 +00:00
parent 2cc47a1202
commit 7ae39052df
19 changed files with 34 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/cwm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2010/11/27 14:25:47 matthieu Exp $
# $OpenBSD: Makefile,v 1.17 2011/03/08 20:48:59 matthieu Exp $
.include <bsd.xconf.mk>
@ -11,11 +11,8 @@ SRCS= calmwm.c screen.c xmalloc.c client.c menu.c \
CPPFLAGS+= -I${X11BASE}/include -I${X11BASE}/include/freetype2 -I${.CURDIR}
CFLAGS+= -Wall
.if ${XENOCARA_BUILD_XCB:L} != "no"
LIBXCB= -lxcb
.endif
LDADD+= -L${X11BASE}/lib -lXft -lXrender -lX11 ${LIBXCB} -lXau -lXdmcp \
LDADD+= -L${X11BASE}/lib -lXft -lXrender -lX11 -lxcb -lXau -lXdmcp \
-lfontconfig -lexpat -lfreetype -lz -lXinerama -lXrandr -lXext
MANDIR= ${X11BASE}/man/cat

6
app/fvwm/Makefile.inc
View File

@ -1,5 +1,5 @@
# -*- makefile -*-
# $OpenBSD: Makefile.inc,v 1.6 2010/11/27 14:25:47 matthieu Exp $
# $OpenBSD: Makefile.inc,v 1.7 2011/03/08 20:48:59 matthieu Exp $
.ifndef FVWM_MAKEFILE_INC
FVWM_MAKEFILE_INC = done
@ -9,10 +9,6 @@ CFLAGS+= -I${X11BASE}/include -I${.CURDIR} -I${.CURDIR}/.. \
-I${.CURDIR}/../libs
LDADD+= -L${X11BASE}/lib
.if ${XENOCARA_BUILD_XCB:L} != "no"
LIBXCB= -lxcb
.endif
FVWMLIBDIR= ${X11BASE}/lib/X11/fvwm
MANDIR= ${X11BASE}/man/cat

4
app/fvwm/fvwm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2010/11/27 14:25:47 matthieu Exp $
# $OpenBSD: Makefile,v 1.8 2011/03/08 20:48:59 matthieu Exp $
.include "../Makefile.inc"
@ -14,7 +14,7 @@ CPPFLAGS+= -DFVWM_MODULEDIR=\"$(FVWMLIBDIR)\" \
-DFVWMRC=\".fvwmrc\" \
-DFVWM_CONFIGDIR=\"$(FVWMLIBDIR)\"
LDADD+= -lXpm -lXt -lICE -lSM -lXext -lX11 ${LIBXCB} -lXdmcp -lXau
LDADD+= -lXpm -lXt -lICE -lSM -lXext -lX11 -lxcb -lXdmcp -lXau
fvwm.1tbl: fvwm2.1
sed -e "s,__projectroot__,${X11BASE}," ${.CURDIR}/fvwm2.1 > fvwm.1tbl

7
app/fvwm/modules/Makefile.inc
View File

@ -1,5 +1,5 @@
# -*- makefile -*-
# $OpenBSD: Makefile.inc,v 1.6 2010/11/27 14:25:47 matthieu Exp $
# $OpenBSD: Makefile.inc,v 1.7 2011/03/08 20:48:59 matthieu Exp $
.ifndef FVWM_MAKEFILE_INC
FVWM_MAKEFILE_INC = done
@ -10,10 +10,7 @@ X11BASE?= /usr/X11R6
CFLAGS+= -I${X11BASE}/include -I${.CURDIR}/../.. -I${.CURDIR}/../../libs
LDADD+= -L${X11BASE}/lib
.if ${XENOCARA_BUILD_XCB:L} != "no"
LIBXCB= -lxcb
.endif
XLIB= -lX11 ${LIBXCB} -lXau -lXdmcp
XLIB= -lX11 -lxcb -lXau -lXdmcp
FVWMLIBDIR= ${X11BASE}/lib/X11/fvwm
MANDIR= ${X11BASE}/man/cat

4
app/fvwm/utils/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2010/11/27 14:25:47 matthieu Exp $
# $OpenBSD: Makefile,v 1.4 2011/03/08 20:48:59 matthieu Exp $
.include "../Makefile.inc"
@ -7,7 +7,7 @@
PROG= xpmroot
SRCS= xpmroot.c
LDADD+= -lXpm -lXt -lICE -lSM -lXext -lX11 ${LIBXCB} -lXdmcp -lXau
LDADD+= -lXpm -lXt -lICE -lSM -lXext -lX11 -lxcb -lXdmcp -lXau
.include <bsd.prog.mk>
.include <bsd.xorg.mk>

8
app/ssh-askpass/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2010/11/27 14:25:47 matthieu Exp $
# $OpenBSD: Makefile,v 1.12 2011/03/08 20:48:59 matthieu Exp $
.include <bsd.xconf.mk>
PROG= ssh-askpass
@ -10,12 +10,8 @@ VERSION= 1.2.0
DATE= February 14, 2001
APP_DEFAULTS= $(CLASS)-default.ad
.if ${XENOCARA_BUILD_XCB:L} != "no"
LIBXCB= -lxcb
.endif
CPPFLAGS+= -I${X11BASE}/include -I.
LDADD+= -L${X11BASE}/lib -lXt -lSM -lICE -lXinerama -lX11 ${LIBXCB} -lXau -lXdmcp -lXext
LDADD+= -L${X11BASE}/lib -lXt -lSM -lICE -lXinerama -lX11 -lxcb -lXau -lXdmcp -lXext
CLEANFILES+= ${CLASS}.ad ${CLASS}_ad.h ssh-askpass.1

8
app/video/Makefile
View File

@ -1,15 +1,11 @@
# $OpenBSD: Makefile,v 1.4 2010/11/27 14:25:47 matthieu Exp $
# $OpenBSD: Makefile,v 1.5 2011/03/08 20:48:59 matthieu Exp $
.include <bsd.xconf.mk>
PROG= video
CPPFLAGS+= -I${X11BASE}/include
.if ${XENOCARA_BUILD_XCB:L} != "no"
LIBXCB= -lxcb
.endif
LDADD+= -L${X11BASE}/lib -lXv -lXext -lX11 ${LIBXCB} -lXau -lXdmcp
LDADD+= -L${X11BASE}/lib -lXv -lXext -lX11 -lxcb -lXau -lXdmcp
MANDIR= ${X11BASE}/man/cat
obj: _xenocara_obj

7
app/xidle/Makefile
View File

@ -1,14 +1,11 @@
# $OpenBSD: Makefile,v 1.5 2010/11/27 14:25:47 matthieu Exp $
# $OpenBSD: Makefile,v 1.6 2011/03/08 20:48:59 matthieu Exp $
.include <bsd.xconf.mk>
PROG= xidle
CPPFLAGS+= -I${X11BASE}/include
CFLAGS+= -Wall
.if ${XENOCARA_BUILD_XCB:L} != "no"
LIBXCB= -lxcb
.endif
LDADD+= -L${X11BASE}/lib -lXss -lXext -lX11 ${LIBXCB} -lXau -lXdmcp
LDADD+= -L${X11BASE}/lib -lXss -lXext -lX11 -lxcb -lXau -lXdmcp
MANDIR= ${X11BASE}/man/cat

7
app/xlockmore/Makefile.bsd-wrapper
View File

@ -1,17 +1,12 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.9 2010/11/30 20:05:41 matthieu Exp $
# $OpenBSD: Makefile.bsd-wrapper,v 1.10 2011/03/08 20:48:59 matthieu Exp $
.include <bsd.xconf.mk>
.if ${XENOCARA_BUILD_XCB:L} != "no"
LIBXCB= -lxcb
.endif
config.status:
AUTOMAKE_VERSION="$(AUTOMAKE_VERSION)" \
AUTOCONF_VERSION="$(AUTOCONF_VERSION)" \
ACLOCAL="aclocal -I ${X11BASE}/share/aclocal" \
CFLAGS="${CFLAGS}" \
LIBXCB="${LIBXCB}" \
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" \
sh ${.CURDIR}/configure --prefix=${X11BASE} \
--datarootdir=${X11BASE} \

4
app/xlockmore/configure vendored
View File

@ -9597,7 +9597,7 @@ $as_echo_n "checking for GL >=1.1... " >&6; }
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="${CFLAGS} ${XLOCKINC}"
LIBS="${XLOCKLIBPATHS} ${XLOCKLIBS} -lX11 $(LIBXCB) -lXext -lXau -lXdmcp -lm"
LIBS="${XLOCKLIBPATHS} ${XLOCKLIBS} -lX11 -lxcb -lXext -lXau -lXdmcp -lm"
if test "${ac_cv_c_gl1_1+set}" = set; then
$as_echo_n "(cached) " >&6
else
@ -13854,7 +13854,7 @@ case "${canonical}" in
XGLOCKLIBPATHS="-L/usr/lib32 ${XGLOCKLIBPATHS}"
;;
esac
XLOCKLIBS="${XLOCKLIBPATHS} ${XLOCKLIBS} -lX11 ${LIBXCB} -lXext -lXau -lXdmcp -lm"
XLOCKLIBS="${XLOCKLIBPATHS} ${XLOCKLIBS} -lX11 -lxcb -lXext -lXau -lXdmcp -lm"
XMLOCKLIBS="${XMLOCKLIBPATHS} ${XMLOCKLIBS} -lX11"
XGLOCKLIBS="${XGLOCKLIBPATHS} ${XGLOCKLIBS} ${GTK_LIBS}"

4
app/xlockmore/configure.in
View File

@ -2519,7 +2519,7 @@ AC_MSG_CHECKING([for GL >=1.1])
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="${CFLAGS} ${XLOCKINC}"
LIBS="${XLOCKLIBPATHS} ${XLOCKLIBS} -lX11 $(LIBXCB) -lXext -lXau -lXdmcp -lm"
LIBS="${XLOCKLIBPATHS} ${XLOCKLIBS} -lX11 -lxcb -lXext -lXau -lXdmcp -lm"
AC_CACHE_VAL(ac_cv_c_gl1_1,[
AC_TRY_LINK([#define _XOPEN_SOURCE 1
#include <GL/gl.h>], [
@ -4297,7 +4297,7 @@ case "${canonical}" in
XGLOCKLIBPATHS="-L/usr/lib32 ${XGLOCKLIBPATHS}"
;;
esac
XLOCKLIBS="${XLOCKLIBPATHS} ${XLOCKLIBS} -lX11 ${LIBXCB} -lXext -lXau -lXdmcp -lm"
XLOCKLIBS="${XLOCKLIBPATHS} ${XLOCKLIBS} -lX11 -lxcb -lXext -lXau -lXdmcp -lm"
XMLOCKLIBS="${XMLOCKLIBPATHS} ${XMLOCKLIBS} -lX11"
XGLOCKLIBS="${XGLOCKLIBPATHS} ${XGLOCKLIBS} ${GTK_LIBS}"
AC_SUBST(XLOCKLDFLAGS)

7
app/xsystrace/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2010/11/27 14:25:47 matthieu Exp $
# $OpenBSD: Makefile,v 1.11 2011/03/08 20:48:59 matthieu Exp $
.include <bsd.xconf.mk>
PROG= xsystrace
@ -9,10 +9,7 @@ SUBDIR= pixmaps
.endif
CPPFLAGS+= -I${X11BASE}/include
.if ${XENOCARA_BUILD_XCB:L} != "no"
LIBXCB= -lxcb
.endif
LDADD+= -L${X11BASE}/lib -lXaw -lXt -lSM -lICE -lXmu -lXpm -lX11 ${LIBXCB} -lXext -lXau -lXdmcp
LDADD+= -L${X11BASE}/lib -lXaw -lXt -lSM -lICE -lXmu -lXpm -lX11 -lxcb -lXext -lXau -lXdmcp
SRCS= main.c interface.c callbacks.c policy.c

7
app/xterm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2010/11/27 14:25:47 matthieu Exp $
# $OpenBSD: Makefile,v 1.17 2011/03/08 20:48:59 matthieu Exp $
.include <bsd.xconf.mk>
SUBDIR= icons resize
@ -15,11 +15,8 @@ CPPFLAGS+= -I${.CURDIR} -I${X11BASE}/include \
-DFUNCPROTO=15 -DNARROWPROTO -DXFREE86_FT2 -DUTMP \
-DDEF_ALLOW_FONT=False -DDEF_ALLOW_TCAP=False \
-DDEF_ALLOW_WINDOW=False
.if ${XENOCARA_BUILD_XCB:L} != "no"
LIBXCB= -lxcb
.endif
LDADD+= -L${X11BASE}/lib -lXaw -lXpm -lXt -lSM -lICE \
-lXmu -lXft -lXrender -lX11 ${LIBXCB} -lXext -lXau -lXdmcp \
-lXmu -lXft -lXrender -lX11 -lxcb -lXext -lXau -lXdmcp \
-lfontconfig -lexpat -lfreetype -lutil -ltermcap -lz
SRCS= TekPrsTbl.c Tekproc.c VTPrsTbl.c button.c cachedGCs.c \

8
app/xtsscale/Makefile
View File

@ -1,17 +1,13 @@
# $OpenBSD: Makefile,v 1.9 2010/01/22 07:47:54 matthieu Exp $
# $OpenBSD: Makefile,v 1.10 2011/03/08 20:48:59 matthieu Exp $
.include <bsd.xconf.mk>
PROG= xtsscale
MAN= xtsscale.1
.if ${XENOCARA_BUILD_XCB:L} == "yes"
LIBXCB= -lxcb
.endif
CPPFLAGS+= -I${X11BASE}/include -I${X11BASE}/include/freetype2 \
-I${.CURDIR}/../../driver/xf86-input-ws/include
LDADD+= -L${X11BASE}/lib -lXft -lXi -lXrender -lXrandr -lXext -lX11 \
${LIBXCB} -lXau -lXdmcp -lfontconfig -lexpat -lfreetype -lz
-lxcb -lXau -lXdmcp -lfontconfig -lexpat -lfreetype -lz
CFLAGS+= -Wall
MANDIR= ${X11BASE}/man/cat

8
app/xvctl/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2010/11/27 14:25:47 matthieu Exp $
# $OpenBSD: Makefile,v 1.6 2011/03/08 20:48:59 matthieu Exp $
.include <bsd.xconf.mk>
PROG=xvctl
@ -6,11 +6,7 @@ MAN=xvctl.1
CPPFLAGS+= -I${X11BASE}/include
.if ${XENOCARA_BUILD_XCB:L} != "no"
LIBXCB= -lxcb
.endif
LDADD+=-L${X11BASE}/lib -lXv -lXext -lX11 ${LIBXCB} -lXau -lXdmcp
LDADD+=-L${X11BASE}/lib -lXv -lXext -lX11 -lxcb -lXau -lXdmcp
MANDIR= ${X11BASE}/man/cat

4
lib/Makefile
View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.20 2010/08/02 18:45:02 matthieu Exp $
# $OpenBSD: Makefile,v 1.21 2011/03/08 20:48:59 matthieu Exp $
.include <bsd.xconf.mk>
.if ${XENOCARA_BUILD_XCB:L} == "yes"
XCB_LIBS= \
libpthread-stubs \
libxcb/libxcb \
@ -36,7 +35,6 @@ XCB_LIBS= \
xcb-util/keysyms \
xcb-util/renderutil \
xcb-util/reply
.endif
SUBDIR= freetype fontconfig libxtrans libXau libXdmcp ${XCB_LIBS}\
libX11 libXext libXrender libXft libdmx libfontenc \

6
lib/libX11/Makefile.bsd-wrapper
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.15 2010/10/22 19:50:32 matthieu Exp $
# $OpenBSD: Makefile.bsd-wrapper,v 1.16 2011/03/08 20:48:59 matthieu Exp $
.include <bsd.xconf.mk>
SHARED_LIBS= X11 14.0
@ -6,10 +6,6 @@ SHARED_LIBS= X11 14.0
CONFIGURE_ARGS= --enable-tcp-transport --enable-unix-transport --enable-ipv6 \
--disable-composecache --without-groff
.if ${XENOCARA_BUILD_XCB:L} == "no"
CONFIGURE_ARGS+= --without-xcb
.endif
.if ${XENOCARA_HAVE_SHARED_LIBS:L} == "no"
CONFIGURE_ARGS+= --disable-loadable-xcursor
.endif

10
proto/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2010/05/29 17:25:11 matthieu Exp $
# $OpenBSD: Makefile,v 1.12 2011/03/08 20:48:59 matthieu Exp $
.include <bsd.xconf.mk>
@ -6,18 +6,14 @@ SUBDIR= bigreqsproto compositeproto dmxproto damageproto \
fixesproto fontcacheproto fontsproto glproto inputproto \
kbproto pmproto xineramaproto randrproto \
recordproto renderproto resourceproto scrnsaverproto \
videoproto x11proto xcmiscproto xextproto \
videoproto x11proto xcb-proto xcmiscproto xextproto \
xf86bigfontproto xf86dgaproto xf86miscproto \
xf86vidmodeproto
xf86vidmodeproto
.if ${XENOCARA_BUILD_DRI:L} == "yes"
SUBDIR+= xf86driproto dri2proto
.endif
.if ${XENOCARA_BUILD_XCB:L} == "yes"
SUBDIR+= xcb-proto
.endif
.include <bsd.subdir.mk>
build: _SUBDIRUSE

5
share/mk/bsd.xconf.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: bsd.xconf.mk,v 1.17 2011/03/08 07:59:23 matthieu Exp $
# $OpenBSD: bsd.xconf.mk,v 1.18 2011/03/08 20:48:59 matthieu Exp $
# Shared libs?
.if ${MACHINE_ARCH} == "m88k" || ${MACHINE} == "vax"
@ -11,9 +11,6 @@ XENOCARA_HAVE_SHARED_LIBS?=yes
XENOCARA_BUILD_GL?=${XENOCARA_HAVE_SHARED_LIBS:L}
XENOCARA_BUILD_DRI?=${XENOCARA_HAVE_SHARED_LIBS:L}
# Build XCB?
XENOCARA_BUILD_XCB?=yes
# Build pixman?
.if ${MACHINE} == "vax"
XENOCARA_BUILD_PIXMAN?=no