[Mesa-dev] [PATCH 3/3] make: Factor out source lists from drivers/dri/common into Makefile.sources

[Chad Versace]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 08/29/2011 08:46 PM, Chia-I Wu wrote:
> On Tue, Aug 30, 2011 at 2:43 AM, Chad Versace <chad at chad-versace.us> wrote:
>> 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.
>>
>> v2
>> ----
>> - [olv] Remove MESA_TOP from definition of *_INCLUDES so that
>>  Makefile.sources can be self-contained.
>>
>> CC: Chia-I Wu <olv at lunarg.com>
>> Signed-off: Chad Versace <chad at chad-versace.us>
>> ---
>>  src/mesa/drivers/dri/Makefile.defines        |   20 +++++++-------------
>>  src/mesa/drivers/dri/common/Makefile.sources |   19 +++++++++++++++++++
>>  2 files changed, 26 insertions(+), 13 deletions(-)
>>  create mode 100644 src/mesa/drivers/dri/common/Makefile.sources
>>
>> diff --git a/src/mesa/drivers/dri/Makefile.defines b/src/mesa/drivers/dri/Makefile.defines
>> index 90ae551..6ff8df5 100644
>> --- a/src/mesa/drivers/dri/Makefile.defines
>> +++ b/src/mesa/drivers/dri/Makefile.defines
>> @@ -1,14 +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/texmem.c \
>> -        ../common/drirenderbuffer.c
>> +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)
>> diff --git a/src/mesa/drivers/dri/common/Makefile.sources b/src/mesa/drivers/dri/common/Makefile.sources
>> new file mode 100644
>> index 0000000..22df2f0
>> --- /dev/null
>> +++ b/src/mesa/drivers/dri/common/Makefile.sources
>> @@ -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 \

> Is the last backslash intended?  Either way, this file looks good to
> me.  I did not go through other changes though.

Oops. It was not intentional, and I removed it from the pushed patch.

- -- 
Chad Versace
chad at chad-versace.us
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJOXQvaAAoJEAIvNt057x8iaQoP/juAYus1o0ZpJMpyuNRmZPoG
64YbnFegA1RYCKPHiDwXDKzByqn0BmOR27zn8JUBAOmYN639crOg+gaJjVr2AEXK
qs9iIxRdY/ezLNlPG2QrZMp7ZuXl+s+MJ1GtP2Q5qRXRwaIL0CNWjjIEf3IyAcHo
UtLLPg+JufuOCenIn0YhLSaYnjeDFQtju28UjN3zgWXeR3e7P78MmhP/kT+7jJ5b
F51yFm5PQMbytHn3MPkH7QvvzdWEyn/CJ9neN2QgQLJdxzj5ZF9gAKHU2HzB5Z3K
8raXafx02wisI3J/6UI+1IwKDv6G4bPB/AV0yEj5hEmoGhitQDtuSJmYVOcAieV3
sZAO6OzqC0/LwOCV8evbZrNNPTUNLs/M6w897NmrwcfIKUfZLVEo4w7Sq56f4dYL
H7S1nEMbkNmhppPu2xmPvJX54jCbFtCHLvwqjB3OLgM2hYLQ5WbieFZbJvhPca5I
yTcxFnoVR6B0ADYPRYeWrQ+0bIOpD+Kn/2GTNEzB7rPQFNMa5O+Yr8EfhGs2Of7y
YB+x7UJhtzKppagVBIGkNVG042AoIp03Jin8CNuP1zBo22kcY7Nkuk2PySMDmWDA
cGHgJ/0/crorh4k3dc9GqLlqYvSfvAkM185Eyl5+OFgIzNubCVnwcBkz3sYYzoEZ
025IvE+s8Y9jP3RXTiQM
=GwU0
-----END PGP SIGNATURE-----