From 077bc2fda2afdbe0bf12e1baeafa4ce41b711d1d Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Fri, 5 Feb 2010 13:55:32 -0500 Subject: egl_dri2: Use pkg-config cflags and libs from configure output Running pkg-config in Makefiles is bad form, since it doesn't respect the PKG_CONFIG_PATH value set at ./configure time. --- src/egl/drivers/dri2/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/egl') diff --git a/src/egl/drivers/dri2/Makefile b/src/egl/drivers/dri2/Makefile index 95f9574531..129e67b8c6 100644 --- a/src/egl/drivers/dri2/Makefile +++ b/src/egl/drivers/dri2/Makefile @@ -11,9 +11,8 @@ EGL_INCLUDES = \ -I$(TOP)/src/egl/main \ -I$(TOP)/src/mesa \ -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \ - $(shell pkg-config --cflags xcb-dri2 xcb-xfixes x11-xcb libdrm) + $(EGL_DRI2_CFLAGS) -EGL_CFLAGS = -EGL_LIBS = $(shell pkg-config --libs xcb-dri2 xcb-xfixes x11-xcb libdrm) +EGL_LIBS = $(EGL_DRI2_LIBS) include ../Makefile.template -- cgit v1.2.3