projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove third buffer support from Mesa.
[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 49c366ea411f9b5cd0ac3bf7aed1f51da1db01e3..2dc3664cc6a5b739300dbda377a1319f61b7b1ee 100644
(file)
--- a/
src/mesa/drivers/dri/Makefile.template
+++ b/
src/mesa/drivers/dri/Makefile.template
@@
-3,7
+3,6
@@
MESA_MODULES = $(TOP)/src/mesa/libmesa.a
COMMON_SOURCES = \
MESA_MODULES = $(TOP)/src/mesa/libmesa.a
COMMON_SOURCES = \
- ../../common/driverfuncs.c \
../common/utils.c \
../common/texmem.c \
../common/vblank.c \
../common/utils.c \
../common/texmem.c \
../common/vblank.c \
@@
-11,12
+10,6
@@
COMMON_SOURCES = \
../common/xmlconfig.c \
../common/drirenderbuffer.c
../common/xmlconfig.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=
ifeq ($(WINDOW_SYSTEM),dri)
WINOBJ=
WINLIB=
@@
-46,15
+39,7
@@
SHARED_INCLUDES = \
-I$(TOP)/src/mesa/drivers/dri/common \
-Iserver \
-I$(TOP)/include \
-I$(TOP)/src/mesa/drivers/dri/common \
-Iserver \
-I$(TOP)/include \
- -I$(TOP)/include/GL/internal \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa \
- -I$(TOP)/src/mesa/main \
- -I$(TOP)/src/mesa/glapi \
- -I$(TOP)/src/mesa/math \
- -I$(TOP)/src/mesa/transform \
- -I$(TOP)/src/mesa/shader \
- -I$(TOP)/src/mesa/swrast \
- -I$(TOP)/src/mesa/swrast_setup \
-I$(TOP)/src/egl/main \
-I$(TOP)/src/egl/drivers/dri \
$(LIBDRM_CFLAGS)
-I$(TOP)/src/egl/main \
-I$(TOP)/src/egl/drivers/dri \
$(LIBDRM_CFLAGS)
@@
-71,11
+56,11
@@
SHARED_INCLUDES = \
##### TARGETS #####
##### TARGETS #####
-default:
depend symlinks
$(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
+default:
symlinks depend
$(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
$(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 $@
\
+ $(
MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)'
\
$(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
$(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
@@
-86,7
+71,7
@@
$(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_SOURCES) \
depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_SOURCES) \
- $(ASM_SOURCES)
2>&1 /dev/null
+ $(ASM_SOURCES)
# Emacs tags
# Emacs tags
@@
-101,8
+86,8
@@
clean:
install: $(LIBNAME)
install: $(LIBNAME)
- $(INSTALL) -d $(DRI_DRIVER_INSTALL_DIR)
- $(INSTALL) -m 755 $(LIBNAME) $(DRI_DRIVER_INSTALL_DIR)
+ $(INSTALL) -d $(D
ESTDIR)$(D
RI_DRIVER_INSTALL_DIR)
+ $(INSTALL) -m 755 $(LIBNAME) $(D
ESTDIR)$(D
RI_DRIVER_INSTALL_DIR)
-include depend
+
-
include depend