aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/drivers/dri/Makefile.defines
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-08-31 11:39:10 +0200
committermarha <marha@users.sourceforge.net>2011-08-31 11:39:10 +0200
commitbdc38022df44bde91e7ff95f6446cf20e19eaa5f (patch)
tree63386f21679537a891a7cc44fb7dc15ad57cf1df /mesalib/src/mesa/drivers/dri/Makefile.defines
parenta15173d276fcc8bb45637bba9f027136f4915652 (diff)
parentd14fe6598b87092374b1be6eb655153d270c3066 (diff)
downloadvcxsrv-bdc38022df44bde91e7ff95f6446cf20e19eaa5f.tar.gz
vcxsrv-bdc38022df44bde91e7ff95f6446cf20e19eaa5f.tar.bz2
vcxsrv-bdc38022df44bde91e7ff95f6446cf20e19eaa5f.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/docs/README.WIN32 mesalib/docs/install.html mesalib/src/glu/sgi/include/gluos.h mesalib/src/mesa/drivers/windows/gdi/wgl.c mesalib/src/mesa/main/state.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/tnl/t_draw.c
Diffstat (limited to 'mesalib/src/mesa/drivers/dri/Makefile.defines')
-rw-r--r--mesalib/src/mesa/drivers/dri/Makefile.defines21
1 files changed, 7 insertions, 14 deletions
diff --git a/mesalib/src/mesa/drivers/dri/Makefile.defines b/mesalib/src/mesa/drivers/dri/Makefile.defines
index 19b6de8b8..6ff8df5c0 100644
--- a/mesalib/src/mesa/drivers/dri/Makefile.defines
+++ b/mesalib/src/mesa/drivers/dri/Makefile.defines
@@ -1,15 +1,13 @@
# -*-makefile-*-
+# Import mesa_dri_common_*
+include ../common/Makefile.sources
+
COMMON_GALLIUM_SOURCES = \
- ../common/utils.c \
- ../common/vblank.c \
- ../common/dri_util.c \
- ../common/xmlconfig.c
+ $(addprefix ../common/, $(mesa_dri_common_gallium_SOURCES))
-COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \
- ../../common/driverfuncs.c \
- ../common/texmem.c \
- ../common/drirenderbuffer.c
+COMMON_SOURCES = \
+ $(addprefix ../common/, $(mesa_dri_common_SOURCES))
INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES)
@@ -21,13 +19,8 @@ OBJECTS = $(C_SOURCES:.c=.o) \
### Include directories
SHARED_INCLUDES = \
-I. \
- -I$(TOP)/src/mesa/drivers/dri/common \
-Iserver \
- -I$(TOP)/include \
- -I$(TOP)/src/mapi \
- -I$(TOP)/src/mesa \
- -I$(TOP)/src/egl/main \
- -I$(TOP)/src/egl/drivers/dri \
+ $(addprefix -I$(TOP)/, $(mesa_dri_common_INCLUDES)) \
$(LIBDRM_CFLAGS)
INCLUDES += $(API_DEFINES)