Merge branch 'origin'

[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 4a7a6552ac0ffcc4bee0a285307d2ce7fe0643a1..5261a4b55d1ef36628cbe7b349a685621870fab6 100644 (file)
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -9,7 +9,12 @@ 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_drmpool.c
+
 
 ifeq ($(WINDOW_SYSTEM),dri)
 WINOBJ=
@@ -62,21 +67,21 @@ 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
+#$(TOP)/$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile
 #      @echo BUILDING FOR: $(WINDOW_SYSTEM)
-#      $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \
+#      $(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
+$(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) 
 
 
 
@@ -85,7 +90,7 @@ $(LIB_DIR)/$(LIBNAME): $(LIBNAME)
 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
@@ -99,6 +104,7 @@ clean:
        -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