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 67ef72b139655ceede4771066d2db6fb3b1aa41f..49c366ea411f9b5cd0ac3bf7aed1f51da1db01e3 100644 (file)
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -9,24 +9,30 @@ 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=
 WINLIB=
-INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES) \
-           `pkg-config --cflags libdrm`
+INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES)
 
 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) \
-          `pkg-config --cflags libdrm` \
-          $(SHARED_INCLUDES)
+          $(SHARED_INCLUDES) \
+          $(PCIACCESS_CFLAGS)
 
 OBJECTS = $(C_SOURCES:.c=.o) \
          $(MINIGLX_SOURCES:.c=.o) \
@@ -39,7 +45,6 @@ SHARED_INCLUDES = \
        -I. \
        -I$(TOP)/src/mesa/drivers/dri/common \
        -Iserver \
-       `pkg-config --cflags libdrm` \
        -I$(TOP)/include \
        -I$(TOP)/include/GL/internal \
        -I$(TOP)/src/mesa \
@@ -51,7 +56,9 @@ SHARED_INCLUDES = \
        -I$(TOP)/src/mesa/swrast \
        -I$(TOP)/src/mesa/swrast_setup \
        -I$(TOP)/src/egl/main \
-       -I$(TOP)/src/egl/drivers/dri
+       -I$(TOP)/src/egl/drivers/dri \
+       $(LIBDRM_CFLAGS)
+
 
 ##### RULES #####
 
@@ -64,31 +71,22 @@ SHARED_INCLUDES = \
 
 ##### TARGETS #####
 
-default: depend symlinks $(LIBNAME) $(LIB_DIR)/$(LIBNAME)
-
+default: depend symlinks $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
 
-#$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile
-#      @echo BUILDING FOR: $(WINDOW_SYSTEM)
-#      $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \
-#              $(WINLIB) $(LIB_DEPS) $(WINOBJ) $(MESA_MODULES) $(OBJECTS)
 
-$(LIBNAME):  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
+$(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)
 
 
-$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
-       install $(LIBNAME) $(LIB_DIR) 
+$(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.
-.PHONY: depend
 depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
        touch depend
        $(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_SOURCES) \
-               $(ASM_SOURCES) > /dev/null
+               $(ASM_SOURCES) 2>&1 /dev/null
 
 
 # Emacs tags
@@ -101,7 +99,10 @@ clean:
        -rm -f *.o */*.o *~ *.so *~ server/*.o $(SYMLINKS)
        -rm -f depend depend.bak
 
+
 install: $(LIBNAME)
-       install $(LIBNAME) /usr/X11R6/lib/modules/dri/$(LIBNAME)
+       $(INSTALL) -d $(DRI_DRIVER_INSTALL_DIR)
+       $(INSTALL) -m 755 $(LIBNAME) $(DRI_DRIVER_INSTALL_DIR)
+
 
 include depend