From 912488a8d016834349273acac88be85a6afadcc0 Mon Sep 17 00:00:00 2001 From: Dima Zavin Date: Thu, 21 Aug 2008 10:40:55 -0700 Subject: egl_dri/egl_xdri: Makefiles should use pkg-config to find libdrm. --- src/egl/drivers/dri/Makefile | 2 +- src/egl/drivers/xdri/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/egl/drivers') diff --git a/src/egl/drivers/dri/Makefile b/src/egl/drivers/dri/Makefile index bdc683a0c1..a41aca4370 100644 --- a/src/egl/drivers/dri/Makefile +++ b/src/egl/drivers/dri/Makefile @@ -8,7 +8,7 @@ include $(TOP)/configs/current INCLUDE_DIRS = \ -I. \ -I/usr/include \ - -I/usr/include/drm \ + $(shell pkg-config --cflags-only-I libdrm) \ -I$(TOP)/include \ -I$(TOP)/include/GL/internal \ -I$(TOP)/src/mesa \ diff --git a/src/egl/drivers/xdri/Makefile b/src/egl/drivers/xdri/Makefile index 252d00b6c2..9a2b7e0a9d 100644 --- a/src/egl/drivers/xdri/Makefile +++ b/src/egl/drivers/xdri/Makefile @@ -13,7 +13,7 @@ DRIVER_NAME = egl_xdri.so INCLUDE_DIRS = \ -I. \ -I/usr/include \ - -I/usr/include/drm \ + $(shell pkg-config --cflags-only-I libdrm) \ -I$(TOP)/include \ -I$(TOP)/include/GL/internal \ -I$(TOP)/src/mesa/glapi \ -- cgit v1.2.3 From 7d3d5fb7a57d01c99645f30189244287260239f0 Mon Sep 17 00:00:00 2001 From: Dima Zavin Date: Thu, 21 Aug 2008 10:41:19 -0700 Subject: egl_xdri: Add the top-level lib dir so we link against the libGL we built. --- src/egl/drivers/xdri/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'src/egl/drivers') diff --git a/src/egl/drivers/xdri/Makefile b/src/egl/drivers/xdri/Makefile index 9a2b7e0a9d..afd551dea5 100644 --- a/src/egl/drivers/xdri/Makefile +++ b/src/egl/drivers/xdri/Makefile @@ -48,6 +48,7 @@ $(TOP)/$(LIB_DIR)/$(DRIVER_NAME): $(OBJECTS) $(TOP)/bin/mklib -o $(DRIVER_NAME) \ -noprefix \ -major 1 -minor 0 \ + -L $(TOP)/$(LIB_DIR) \ -install $(TOP)/$(LIB_DIR) \ $(OBJECTS) $(DRM_LIB) $(MISC_LIBS) -- cgit v1.2.3