diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-03-08 20:49:00 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-03-08 20:49:00 +0000 |
| commit | 8497862bdc0e560d1d9fd5306860b00b1fbc1f79 (patch) | |
| tree | f43a538f6c8aa3f931f0d0158892cace0b728d50 /app/fvwm | |
| parent | e3a3855ef99aac36d1c9dd930ab403ef96c040d1 (diff) | |
xcb is no longer optional.
Diffstat (limited to 'app/fvwm')
| -rw-r--r-- | app/fvwm/Makefile.inc | 6 | ||||
| -rw-r--r-- | app/fvwm/fvwm/Makefile | 4 | ||||
| -rw-r--r-- | app/fvwm/modules/Makefile.inc | 7 | ||||
| -rw-r--r-- | app/fvwm/utils/Makefile | 4 |
4 files changed, 7 insertions, 14 deletions
diff --git a/app/fvwm/Makefile.inc b/app/fvwm/Makefile.inc index a034ad307..98036e496 100644 --- a/app/fvwm/Makefile.inc +++ b/app/fvwm/Makefile.inc @@ -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 diff --git a/app/fvwm/fvwm/Makefile b/app/fvwm/fvwm/Makefile index df420c0e8..3207e2f6e 100644 --- a/app/fvwm/fvwm/Makefile +++ b/app/fvwm/fvwm/Makefile @@ -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 diff --git a/app/fvwm/modules/Makefile.inc b/app/fvwm/modules/Makefile.inc index 9c523ca3b..1d51431dc 100644 --- a/app/fvwm/modules/Makefile.inc +++ b/app/fvwm/modules/Makefile.inc @@ -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 diff --git a/app/fvwm/utils/Makefile b/app/fvwm/utils/Makefile index bdd3c5b9e..57701b8aa 100644 --- a/app/fvwm/utils/Makefile +++ b/app/fvwm/utils/Makefile @@ -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> |