Merge branch 'master' into i915-unification

[mesa.git] / src / mesa / drivers / dri / Makefile.template

diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 1040194d0d0d6d1291c1f8cc4ec3a1240c1cf7f5..49c366ea411f9b5cd0ac3bf7aed1f51da1db01e3 100644 (file)
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -9,7 +9,13 @@ COMMON_SOURCES = \
         ../common/vblank.c \
         ../common/dri_util.c \
         ../common/xmlconfig.c \
-        ../common/drirenderbuffer.c
+        ../common/drirenderbuffer.c 
+
+COMMON_BM_SOURCES = \
+       ../common/dri_bufmgr.c \
+       ../common/dri_bufmgr_ttm.c \
+       ../common/dri_bufmgr_fake.c
+
 
 ifeq ($(WINDOW_SYSTEM),dri)
 WINOBJ=
@@ -20,11 +26,13 @@ OBJECTS = $(C_SOURCES:.c=.o) \
          $(ASM_SOURCES:.S=.o) 
 
 else
+# miniglx
 WINOBJ=
 WINLIB=-L$(MESA)/src/glx/mini
 MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
 INCLUDES = $(MINIGLX_INCLUDES) \
-          $(SHARED_INCLUDES)
+          $(SHARED_INCLUDES) \
+          $(PCIACCESS_CFLAGS)
 
 OBJECTS = $(C_SOURCES:.c=.o) \
          $(MINIGLX_SOURCES:.c=.o) \
@@ -49,7 +57,8 @@ SHARED_INCLUDES = \
        -I$(TOP)/src/mesa/swrast_setup \
        -I$(TOP)/src/egl/main \
        -I$(TOP)/src/egl/drivers/dri \
-       `pkg-config --cflags libdrm`
+       $(LIBDRM_CFLAGS)
+
 
 ##### RULES #####
 
@@ -65,11 +74,6 @@ SHARED_INCLUDES = \
 default: depend symlinks $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
 
 
-#$(TOP)/$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile
-#      @echo BUILDING FOR: $(WINDOW_SYSTEM)
-#      $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(TOP)/$(LIB_DIR) \
-#              $(WINLIB) $(LIB_DEPS) $(WINOBJ) $(MESA_MODULES) $(OBJECTS)
-
 $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
        $(TOP)/bin/mklib -noprefix -o $@ \
                $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
@@ -79,9 +83,6 @@ $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
        $(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR) 
 
 
-
-# Run 'make depend' to update the dependencies if you change
-# what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
        touch depend
        $(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_SOURCES) \
@@ -98,8 +99,10 @@ clean:
        -rm -f *.o */*.o *~ *.so *~ server/*.o $(SYMLINKS)
        -rm -f depend depend.bak
 
+
 install: $(LIBNAME)
        $(INSTALL) -d $(DRI_DRIVER_INSTALL_DIR)
        $(INSTALL) -m 755 $(LIBNAME) $(DRI_DRIVER_INSTALL_DIR)
 
+
 include depend