summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Dänzer <[email protected]>2007-12-10 16:34:25 +0100
committerMichel Dänzer <[email protected]>2007-12-10 17:36:59 +0100
commit41ce1f8fb30c9a918d85d4016ce82fe2a3d2c72c (patch)
tree6048904c41782679507aa8b48d51b2d0fd29265c
parentf7195b32323d50e9541a5c5cb3143e83d05bd8d8 (diff)
Link fewer common objects into Gallium winsys layers.
These are useless or even harmful due to referencing symbols no longer available in the Gallium build.
-rw-r--r--src/mesa/drivers/dri/Makefile.template12
-rw-r--r--src/mesa/drivers/dri/intel_winsys/Makefile2
2 files changed, 8 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 37bf0a49772..3e7e527a982 100644
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -2,14 +2,16 @@
MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-COMMON_SOURCES = \
- ../../common/driverfuncs.c \
+COMMON_GALLIUM_SOURCES = \
../common/utils.c \
- ../common/texmem.c \
../common/vblank.c \
../common/dri_util.c \
- ../common/xmlconfig.c \
- ../common/drirenderbuffer.c
+ ../common/xmlconfig.c
+
+COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \
+ ../../common/driverfuncs.c \
+ ../common/texmem.c \
+ ../common/drirenderbuffer.c
COMMON_BM_SOURCES = \
../common/dri_bufmgr.c \
diff --git a/src/mesa/drivers/dri/intel_winsys/Makefile b/src/mesa/drivers/dri/intel_winsys/Makefile
index 46b9541d7d4..9ae0f013256 100644
--- a/src/mesa/drivers/dri/intel_winsys/Makefile
+++ b/src/mesa/drivers/dri/intel_winsys/Makefile
@@ -22,7 +22,7 @@ DRIVER_SOURCES = \
intel_batchpool.c
C_SOURCES = \
- $(COMMON_SOURCES) \
+ $(COMMON_GALLIUM_SOURCES) \
$(COMMON_BM_SOURCES) \
$(DRIVER_SOURCES)