Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

[mesa.git] / src / egl / drivers / xdri / Makefile

diff --git a/src/egl/drivers/xdri/Makefile b/src/egl/drivers/xdri/Makefile
index eb83867b71871d5ab6351665c08a3de9e4aa34fe..4c1fc9071c5457b4bd0df8f284a3bc1f46421cfd 100644 (file)
--- a/src/egl/drivers/xdri/Makefile
+++ b/src/egl/drivers/xdri/Makefile
@@ -16,19 +16,24 @@ INCLUDE_DIRS = \
        $(shell pkg-config --cflags-only-I libdrm) \
        -I$(TOP)/include \
        -I$(TOP)/include/GL/internal \
+       -I$(TOP)/src/mesa \
        -I$(TOP)/src/mesa/glapi \
-       -I$(TOP)/src/mesa/drivers/dri/common \
        -I$(TOP)/src/egl/main \
        -I$(TOP)/src/glx/x11
 
-SOURCES = egl_xdri.c
+HEADERS = glxinit.h driinit.h
+SOURCES = egl_xdri.c glxinit.c driinit.c
+
+DRI_SOURCES = dri_common.c XF86dri.c dri2.c dri2_glx.c dri_glx.c
+DRI_SOURCES := $(addprefix ../../../glx/x11/,$(DRI_SOURCES))
+
+SOURCES += $(DRI_SOURCES)
 
 OBJECTS = $(SOURCES:.c=.o)
 
 DRM_LIB = `pkg-config --libs libdrm`
 
-MISC_LIBS = -ldl -lXext -lGL
-
+CFLAGS += -DGLX_DIRECT_RENDERING
 
 .c.o:
        $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
@@ -50,11 +55,11 @@ $(TOP)/$(LIB_DIR)/$(DRIVER_NAME): $(OBJECTS)
                -major 1 -minor 0 \
                -L$(TOP)/$(LIB_DIR) \
                -install $(TOP)/$(LIB_DIR) \
-               $(OBJECTS) $(DRM_LIB) $(MISC_LIBS)
+               $(OBJECTS) $(DRM_LIB) $(GL_LIB_DEPS)
 
 install:
        $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
-       $(INSTALL) $(TOP)/$(LIB_DIR)/$(DRIVER_NAME) $(DESTDIR)$(INSTALL_LIB_DIR)
+       $(MINSTALL) $(TOP)/$(LIB_DIR)/$(DRIVER_NAME) $(DESTDIR)$(INSTALL_LIB_DIR)
 
 clean:
        rm -f *.o