mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-24 17:30:12 +01:00
make: Factor out source lists from drivers/dri/common into Makefile.sources
In order that the Autoconf and Android build can share the same source
lists, move the lists from
src/mesa/drivers/dri/Makefile.defines
into
src/mesa/drivers/dri/common/Makefile.sources
I would like for Android to just reuse Makefile.defines, but the file is
unsuitable for reuse.
Reviewed-by: Chia-I Wu <olv@lunarg.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off: Chad Versace <chad@chad-versace.us>
This commit is contained in:
parent
e4a6ebdd87
commit
16f442e9d5
2 changed files with 27 additions and 14 deletions
|
|
@ -1,14 +1,13 @@
|
|||
# -*-makefile-*-
|
||||
|
||||
COMMON_GALLIUM_SOURCES = \
|
||||
../common/utils.c \
|
||||
../common/vblank.c \
|
||||
../common/dri_util.c \
|
||||
../common/xmlconfig.c
|
||||
# Import mesa_dri_common_*
|
||||
include ../common/Makefile.sources
|
||||
|
||||
COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \
|
||||
../common/texmem.c \
|
||||
../common/drirenderbuffer.c
|
||||
COMMON_GALLIUM_SOURCES = \
|
||||
$(addprefix ../common/, $(mesa_dri_common_gallium_SOURCES))
|
||||
|
||||
COMMON_SOURCES = \
|
||||
$(addprefix ../common/, $(mesa_dri_common_SOURCES))
|
||||
|
||||
INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES)
|
||||
|
||||
|
|
@ -20,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)
|
||||
|
|
|
|||
19
src/mesa/drivers/dri/common/Makefile.sources
Normal file
19
src/mesa/drivers/dri/common/Makefile.sources
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
mesa_dri_common_gallium_SOURCES := \
|
||||
utils.c \
|
||||
vblank.c \
|
||||
dri_util.c \
|
||||
xmlconfig.c
|
||||
|
||||
mesa_dri_common_SOURCES := \
|
||||
$(mesa_dri_common_gallium_SOURCES) \
|
||||
texmem.c \
|
||||
drirenderbuffer.c
|
||||
|
||||
# Paths are relative to MESA_TOP.
|
||||
mesa_dri_common_INCLUDES := \
|
||||
include \
|
||||
src/egl/drivers/dri \
|
||||
src/egl/main \
|
||||
src/mapi \
|
||||
src/mesa \
|
||||
src/mesa/drivers/dri/common
|
||||
Loading…
Add table
Reference in a new issue