diff options
| author | Dave Airlie <airliedfreedesktop.org> | 2006-04-07 03:20:56 +0000 |
|---|---|---|
| committer | Dave Airlie <airliedfreedesktop.org> | 2006-04-07 03:20:56 +0000 |
| commit | 9d3de643d1cd84cd0f48ff72ab7218f20b158c28 (patch) | |
| tree | a9f63803b75e2e90029e05e785591a9c0e253f3e | |
| parent | d25ad506f2c2ce28e7d01b8d3f31c1863ef15d63 (diff) | |
make miniglx use libdrm properly
| -rw-r--r-- | src/glx/mini/Makefile | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/Makefile.template | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile index 3a95849d1a..9503192274 100644 --- a/src/glx/mini/Makefile +++ b/src/glx/mini/Makefile @@ -32,8 +32,7 @@ INCLUDE_DIRS = \ -I$(TOP)/src/mesa/swrast \ -I$(TOP)/src/mesa/swrast_setup \ -I$(TOP)/src/mesa/drivers/dri/common \ - -I$(DRM_SOURCE_PATH)/libdrm \ - -I$(DRM_SOURCE_PATH)/shared + `pkg-config --cflags libdrm` ##### RULES ##### diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template index f07dda3171..b5e062f9c0 100644 --- a/src/mesa/drivers/dri/Makefile.template +++ b/src/mesa/drivers/dri/Makefile.template @@ -25,8 +25,7 @@ WINOBJ= WINLIB=-L$(MESA)/src/glx/mini MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini INCLUDES = $(MINIGLX_INCLUDES) \ - -I$(DRM_SOURCE_PATH)/shared-core \ - -I$(DRM_SOURCE_PATH)/libdrm \ + `pkg-config --cflags libdrm` \ $(SHARED_INCLUDES) OBJECTS = $(C_SOURCES:.c=.o) \ @@ -40,7 +39,7 @@ SHARED_INCLUDES = \ -I. \ -I$(TOP)/src/mesa/drivers/dri/common \ -Iserver \ - -I$(DRM_SOURCE_PATH)/shared-core \ + `pkg-config --cflags libdrm` \ -I$(TOP)/include \ -I$(TOP)/include/GL/internal \ -I$(TOP)/src/mesa \ |