diff options
| author | Adam Jackson <ajax@freedesktop.org> | 2005-08-19 20:20:03 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@freedesktop.org> | 2005-08-19 20:20:03 +0000 |
| commit | 8fcd1e028750ec7669aa311dfd63d86767097feb (patch) | |
| tree | 94877d24574a9fc54d85579bcd5834a64ef436ce /src | |
| parent | 2ae5645115124ecc97bf4a0ba9f5542cf2409845 (diff) | |
Convert libGL and DRI drivers to require libdrm.
libdrm can be had from:
http://people.freedesktop.org/~ajax/libdrm/
Diffstat (limited to 'src')
| -rw-r--r-- | src/glx/x11/Makefile | 7 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/Makefile.template | 5 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile index 7cfd180e78..415ec02dd6 100644 --- a/src/glx/x11/Makefile +++ b/src/glx/x11/Makefile @@ -8,10 +8,6 @@ C_SOURCES = \ $(TOP)/src/mesa/glapi/glthread.c \ $(TOP)/src/mesa/main/dispatch.c \ glcontextmodes.c \ - $(DRM_SOURCE_PATH)/libdrm/xf86drm.c \ - $(DRM_SOURCE_PATH)/libdrm/xf86drmHash.c \ - $(DRM_SOURCE_PATH)/libdrm/xf86drmRandom.c \ - $(DRM_SOURCE_PATH)/libdrm/xf86drmSL.c \ clientattrib.c \ compsize.c \ eval.c \ @@ -53,8 +49,7 @@ INCLUDES = -I. \ -I$(TOP)/src/mesa/main \ -I$(TOP)/src/mesa/glapi \ -I$(TOP)/src/mesa/drivers/dri/common \ - -I$(DRM_SOURCE_PATH)/libdrm \ - -I$(DRM_SOURCE_PATH)/shared-core \ + `pkg-config --cflags libdrm` \ $(X11_INCLUDES) diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template index 7c21137ab6..9e22f9e82e 100644 --- a/src/mesa/drivers/dri/Makefile.template +++ b/src/mesa/drivers/dri/Makefile.template @@ -13,11 +13,10 @@ COMMON_SOURCES = \ ../common/drirenderbuffer.c ifeq ($(WINDOW_SYSTEM),dri) -WINOBJ=../dri_client/dri.a +WINOBJ= WINLIB= INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES) \ - -I../dri_client \ - -I../dri_client/imports + `pkg-config --cflags libdrm` OBJECTS = $(C_SOURCES:.c=.o) \ $(ASM_SOURCES:.S=.o) |