diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-02-02 17:38:57 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-02-02 17:38:57 +0000 |
| commit | 15e5b56642cca0b4c43a181624be398b2773477d (patch) | |
| tree | 0b57432160f7b46d2ff095f535f8e27a9d58ffe2 | |
| parent | e591b6dc9781fc94935cfab63f6dca0124102096 (diff) | |
Don't change the libGL linkage when not using dri.
| -rw-r--r-- | lib/libGL/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/libGL/Makefile b/lib/libGL/Makefile index e0aeed758..ae80d6a6b 100644 --- a/lib/libGL/Makefile +++ b/lib/libGL/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.15 2008/02/02 17:24:30 matthieu Exp $ +# $OpenBSD: Makefile,v 1.16 2008/02/02 17:38:56 matthieu Exp $ .include <bsd.own.mk> .if defined(XENOCARA_BUILD_DRI) && ${XENOCARA_BUILD_DRI:L} == "yes" SUBDIR=libmesa dri .endif -all: ${OBJS} LIB= GL MESA= ${.CURDIR}/../../dist/Mesa/src/mesa @@ -18,7 +17,12 @@ DRI_DRIVER_INSTALL_DIR= ${X11BASE}/lib/modules/dri DRI_DRIVER_SEARCH_DIR= $(DRI_DRIVER_INSTALL_DIR) INCSDIR= ${X11BASE}/include/GL -LDADD= -L${X11BASE}/lib -lXfixes -lXdamage -lXext -lX11 -ldrm + +.if defined(XENOCARA_BUILD_DRI) && ${XENOCARA_BUILD_DRI:L} == "yes" +LDADD= -L${X11BASE}/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes -ldrm +.else +LDADD= -L${X11BASE}/lib -lXext -lX11 +.endif CPP= cpp -notraditional DEBUG?= |