mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: pass client flags to test programs

Browse Source 
Fix build failures of the kind:

  CC       tests/bad-buffer-test.o
In file included from tests/weston-test-client-helper.h:28:0,
                 from tests/bad-buffer-test.c:28:
./protocol/wayland-test-client-protocol.h:35:28: fatal error: wayland-client.h: No such file or directory
compilation terminated.
make[1]: *** [tests/bad-buffer-test.o] Error 1

These are only triggerable if libwayland has not been installed
system-wide, but only in a custom prefix.

Since the Makefile already uses AM_CPPFLAGS, simply add
TEST_CLIENT_CFLAGS to test programs instead of dropping AM_CPPFLAGS.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
dev
Pekka Paalanen 11 years ago committed by Kristian Høgsberg
parent 304d40d615
commit cca3a06cab
1 changed files with 7 additions and 0 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      Makefile.am

7
Makefile.am
Unescape View File

@ -834,27 +834,34 @@ libtest_client_la_SOURCES = \
nodist_libtest_client_la_SOURCES = \ nodist_libtest_client_la_SOURCES = \
protocol/wayland-test-protocol.c \ protocol/wayland-test-protocol.c \
protocol/wayland-test-client-protocol.h protocol/wayland-test-client-protocol.h
libtest_client_la_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CLIENT_CFLAGS)
libtest_client_la_LIBADD = $(TEST_CLIENT_LIBS) libshared.la libtest-runner.la libtest_client_la_LIBADD = $(TEST_CLIENT_LIBS) libshared.la libtest-runner.la
bad_buffer_weston_SOURCES = tests/bad-buffer-test.c bad_buffer_weston_SOURCES = tests/bad-buffer-test.c
bad_buffer_weston_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CLIENT_CFLAGS)
bad_buffer_weston_LDADD = libtest-client.la bad_buffer_weston_LDADD = libtest-client.la
keyboard_weston_SOURCES = tests/keyboard-test.c keyboard_weston_SOURCES = tests/keyboard-test.c
keyboard_weston_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CLIENT_CFLAGS)
keyboard_weston_LDADD = libtest-client.la keyboard_weston_LDADD = libtest-client.la
event_weston_SOURCES = tests/event-test.c event_weston_SOURCES = tests/event-test.c
event_weston_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CLIENT_CFLAGS)
event_weston_LDADD = libtest-client.la event_weston_LDADD = libtest-client.la
button_weston_SOURCES = tests/button-test.c button_weston_SOURCES = tests/button-test.c
button_weston_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CLIENT_CFLAGS)
button_weston_LDADD = libtest-client.la button_weston_LDADD = libtest-client.la
text_weston_SOURCES = tests/text-test.c text_weston_SOURCES = tests/text-test.c
nodist_text_weston_SOURCES = \ nodist_text_weston_SOURCES = \
protocol/text-protocol.c \ protocol/text-protocol.c \
protocol/text-client-protocol.h protocol/text-client-protocol.h
text_weston_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CLIENT_CFLAGS)
text_weston_LDADD = libtest-client.la text_weston_LDADD = libtest-client.la
subsurface_weston_SOURCES = tests/subsurface-test.c subsurface_weston_SOURCES = tests/subsurface-test.c
subsurface_weston_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CLIENT_CFLAGS)
subsurface_weston_LDADD = libtest-client.la subsurface_weston_LDADD = libtest-client.la
if ENABLE_EGL if ENABLE_EGL

Write Preview
Loading…
Cancel
Save