[PATCH 1/3] tests: add COMPOSITOR_CFLAGS to the build

Kristian Høgsberg krh at bitplanet.net
Fri Feb 10 09:18:27 PST 2012


On Fri, Feb 10, 2012 at 12:15 PM, Jesse Barnes <jbarnes at virtuousgeek.org> wrote:
> On Fri, 10 Feb 2012 11:35:50 +0200
> Pekka Paalanen <ppaalanen at gmail.com> wrote:
>
>> On Thu,  9 Feb 2012 13:12:56 -0800
>> Jesse Barnes <jbarnes at virtuousgeek.org> wrote:
>>
>> > This lets the tests pick up headers from an alternate install root.
>> > ---
>> >  tests/Makefile.am |    2 +-
>> >  1 files changed, 1 insertions(+), 1 deletions(-)
>> >
>> > diff --git a/tests/Makefile.am b/tests/Makefile.am
>> > index a1f361e..0b3ed40 100644
>> > --- a/tests/Makefile.am
>> > +++ b/tests/Makefile.am
>> > @@ -6,7 +6,7 @@ endif
>> >
>> >
>> >  AM_CFLAGS = $(GCC_CFLAGS)
>> > -AM_CPPFLAGS = -I../src -DUNIT_TEST
>> > +AM_CPPFLAGS = $(COMPOSITOR_CFLAGS) -I../src -DUNIT_TEST
>> >
>> >  matrix_test_SOURCES =                              \
>> >     matrix-test.c                           \
>>
>> This one is already in as a7ef5c85d8b15a2a19a1602da33fd8a8deafdab1.
>>
>> Shouldn't we drop the line
>>
>> C_INCLUDE_PATH=$WLD/include
>>
>> from http://wayland.freedesktop.org/building.html as that is the
>> environment variable that hid the problem from me?
>
> Yeah this one is obsolete.  Agree on removing the include path from
> the build instructions; I'm not sure why that's there...

It's gone now.

Kristian


More information about the wayland-devel mailing list