openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-09 18:59:00 +00:00
Code Issues Projects Releases Wiki Activity

Explicitely link libxcb when needed for static arches.

Browse Source
This commit is contained in:
matthieu
2010-11-27 14:25:47 +00:00
parent 07dcad530f
commit 66473b7fbe
13 changed files with 66 additions and 26 deletions
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.15 2009/01/19 20:23:19 todd Exp $ # $OpenBSD: Makefile,v 1.16 2010/11/27 14:25:47 matthieu Exp $
.include <bsd.xconf.mk> .include <bsd.xconf.mk>
@@ -11,8 +11,11 @@ SRCS= calmwm.c screen.c xmalloc.c client.c menu.c \
CPPFLAGS+= -I${X11BASE}/include -I${X11BASE}/include/freetype2 -I${.CURDIR} CPPFLAGS+= -I${X11BASE}/include -I${X11BASE}/include/freetype2 -I${.CURDIR}
CFLAGS+= -Wall CFLAGS+= -Wall
.if ${XENOCARA_BUILD_XCB:L} != "no"
LIBXCB= -lxcb
.endif
LDADD+= -L${X11BASE}/lib -lXft -lXrender -lX11 -lXau -lXdmcp \ LDADD+= -L${X11BASE}/lib -lXft -lXrender -lX11 ${LIBXCB} -lXau -lXdmcp \
-lfontconfig -lexpat -lfreetype -lz -lXinerama -lXrandr -lXext -lfontconfig -lexpat -lfreetype -lz -lXinerama -lXrandr -lXext
MANDIR= ${X11BASE}/man/cat MANDIR= ${X11BASE}/man/cat

6
app/fvwm/Makefile.inc
View File

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

4
app/fvwm/fvwm/Makefile
View File

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

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

@@ -1,16 +1,19 @@
# -*- makefile -*- # -*- makefile -*-
# $OpenBSD: Makefile.inc,v 1.5 2007/04/09 18:59:57 matthieu Exp $ # $OpenBSD: Makefile.inc,v 1.6 2010/11/27 14:25:47 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 X11BASE?= /usr/X11R6
CFLAGS+= -I${X11BASE}/include -I${.CURDIR}/../.. -I${.CURDIR}/../../libs CFLAGS+= -I${X11BASE}/include -I${.CURDIR}/../.. -I${.CURDIR}/../../libs
LDADD+= -L${X11BASE}/lib LDADD+= -L${X11BASE}/lib
XLIB= -lX11 -lXau -lXdmcp .if ${XENOCARA_BUILD_XCB:L} != "no"
LIBXCB= -lxcb
.endif
XLIB= -lX11 ${LIBXCB} -lXau -lXdmcp
FVWMLIBDIR= ${X11BASE}/lib/X11/fvwm FVWMLIBDIR= ${X11BASE}/lib/X11/fvwm
MANDIR= ${X11BASE}/man/cat MANDIR= ${X11BASE}/man/cat

6
app/fvwm/utils/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2006/11/27 19:56:35 matthieu Exp $ # $OpenBSD: Makefile,v 1.3 2010/11/27 14:25:47 matthieu Exp $
.include "../Makefile.inc" .include "../Makefile.inc"
@@ -7,7 +7,7 @@
PROG= xpmroot PROG= xpmroot
SRCS= xpmroot.c SRCS= xpmroot.c
LDADD+= -lXpm -lXt -lICE -lSM -lXext -lX11 -lXdmcp -lXau LDADD+= -lXpm -lXt -lICE -lSM -lXext -lX11 ${LIBXCB} -lXdmcp -lXau
.include <bsd.prog.mk> .include <bsd.prog.mk>
.include <bsd.xorg.mk> .include <bsd.xorg.mk>

8
app/ssh-askpass/Makefile
View File

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

9
app/video/Makefile
View File

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

7
app/xidle/Makefile
View File

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

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

@@ -1,10 +1,17 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.7 2010/08/05 06:44:21 matthieu Exp $ # $OpenBSD: Makefile.bsd-wrapper,v 1.8 2010/11/27 14:25:47 matthieu Exp $
.include <bsd.xconf.mk>
.if ${XENOCARA_BUILD_XCB:L} != "no"
LIBXCB= -lxcb
.endif
config.status: config.status:
AUTOMAKE_VERSION="$(AUTOMAKE_VERSION)" \ AUTOMAKE_VERSION="$(AUTOMAKE_VERSION)" \
AUTOCONF_VERSION="$(AUTOCONF_VERSION)" \ AUTOCONF_VERSION="$(AUTOCONF_VERSION)" \
ACLOCAL="aclocal -I ${X11BASE}/share/aclocal" \ ACLOCAL="aclocal -I ${X11BASE}/share/aclocal" \
CFLAGS="${CFLAGS}" \ CFLAGS="${CFLAGS}" \
LIBXCB="${LIBXCB}" \
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" \ PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" \
sh ${.CURDIR}/configure --prefix=${X11BASE} \ sh ${.CURDIR}/configure --prefix=${X11BASE} \
--enable-appdefaultdir=/etc/X11/app-defaults \ --enable-appdefaultdir=/etc/X11/app-defaults \

4
app/xlockmore/configure.in
View File

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

7
app/xsystrace/Makefile
View File

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

7
app/xterm/Makefile
View File

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

9
app/xvctl/Makefile
View File

@@ -1,11 +1,16 @@
# $OpenBSD: Makefile,v 1.4 2008/03/25 23:41:50 matthieu Exp $ # $OpenBSD: Makefile,v 1.5 2010/11/27 14:25:47 matthieu Exp $
.include <bsd.xconf.mk> .include <bsd.xconf.mk>
PROG=xvctl PROG=xvctl
MAN=xvctl.1 MAN=xvctl.1
CPPFLAGS+= -I${X11BASE}/include CPPFLAGS+= -I${X11BASE}/include
LDADD+=-L${X11BASE}/lib -lXv -lXext -lX11 -lXau -lXdmcp
.if ${XENOCARA_BUILD_XCB:L} != "no"
LIBXCB= -lxcb
.endif
LDADD+=-L${X11BASE}/lib -lXv -lXext -lX11 ${LIBXCB} -lXau -lXdmcp
MANDIR= ${X11BASE}/man/cat MANDIR= ${X11BASE}/man/cat