fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-02 07:58:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

dri/common: move source file lists to Makefile.sources

Browse source 
* Allow the lists to be shared among build systems.
* Update automake and Android build systems.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Emil Velikov 2013-09-28 18:11:20 +01:00
parent b51b3fc537
commit 01d35eb372
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/common/Android.mk
View file

@ -40,7 +40,7 @@ LOCAL_C_INCLUDES := \
$(intermediates) \
$(MESA_DRI_C_INCLUDES)
LOCAL_SRC_FILES := $(mesa_dri_common_SOURCES)
LOCAL_SRC_FILES := $(DRI_COMMON_FILES)
LOCAL_GENERATED_SOURCES := \
$(intermediates)/xmlpool/options.h

10
src/mesa/drivers/dri/common/Makefile.am
View file

@ -21,6 +21,8 @@
SUBDIRS = xmlpool
include Makefile.sources
AM_CFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/ \
@ -35,13 +37,9 @@ noinst_LTLIBRARIES = \
libmegadriver_stub.la \
libdri_test_stubs.la
libdricommon_la_SOURCES = \
utils.c \
dri_util.c \
xmlconfig.c
libdricommon_la_SOURCES = $(DRI_COMMON_FILES)
libdri_test_stubs_la_SOURCES = \
dri_test.c
libdri_test_stubs_la_SOURCES = $(test_stubs_FILES)
libdri_test_stubs_la_CFLAGS = $(AM_CFLAGS) -DNO_MAIN
libmegadriver_stub_la_SOURCES = megadriver_stub.c

8
src/mesa/drivers/dri/common/Makefile.sources
View file

@ -1,11 +1,8 @@
mesa_dri_common_gallium_SOURCES := \
DRI_COMMON_FILES := \
utils.c \
dri_util.c \
xmlconfig.c
mesa_dri_common_SOURCES := \
$(mesa_dri_common_gallium_SOURCES)
# Paths are relative to MESA_TOP.
mesa_dri_common_INCLUDES := \
include \
@ -14,3 +11,6 @@ mesa_dri_common_INCLUDES := \
src/mapi \
src/mesa \
src/mesa/drivers/dri/common
test_stubs_FILES := \
dri_test.c