diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-09-12 20:33:59 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-09-12 20:33:59 +1000 |
| commit | 81335d0f1760fe172a106f79e81281c1f0d7dedf (patch) | |
| tree | f081924b0dad0fdfb1fa94580d63a88498469909 /src/egl | |
| parent | f302fca5eb63e4bca8af5b35c585451486143e6a (diff) | |
| parent | aa66f08a21b791f338b519f0c2162cd8f7b3aeb0 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/egl')
| -rw-r--r-- | src/egl/drivers/dri/Makefile | 2 | ||||
| -rw-r--r-- | src/egl/drivers/xdri/Makefile | 3 |
2 files changed, 3 insertions, 2 deletions
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..afd551dea5 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 \ @@ -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) |