include the test protocol symbols to library

Including the test protocol symbols at the utests binary
makes the build-break issue on aarch64 for ASAN building.

Change-Id: I2f58a714eba83695f11f01299f83339b825e5527

diff --git a/src/Makefile.am b/src/Makefile.am
index 91eff97..7c9441d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,9 @@ include_HEADERS = \
 
 nodist_include_HEADERS = \
        wayland-tbm-server-protocol.h \
-       wayland-tbm-client-protocol.h
+       wayland-tbm-test-server-protocol.h \
+       wayland-tbm-client-protocol.h \
+       wayland-tbm-test-client-protocol.h
 
 libwayland_tbm_server_la_LDFLAGS = $(LDFLAGS) -export-dynamic
 libwayland_tbm_server_la_CFLAGS = \
@@ -30,8 +32,11 @@ libwayland_tbm_server_la_SOURCES = \
 
 nodist_libwayland_tbm_server_la_SOURCES =              \
        wayland-tbm-server-protocol.h   \
+       wayland-tbm-test-server-protocol.h      \
        wayland-tbm-client-protocol.h   \
-       wayland-tbm-protocol.c
+       wayland-tbm-test-client-protocol.h      \
+       wayland-tbm-protocol.c \
+       wayland-tbm-test-protocol.c
 
 libwayland_tbm_client_la_LDFLAGS = $(LDFLAGS) -export-dynamic
 libwayland_tbm_client_la_CFLAGS = \
@@ -47,7 +52,9 @@ libwayland_tbm_client_la_SOURCES = \
 
 nodist_libwayland_tbm_client_la_SOURCES =              \
        wayland-tbm-client-protocol.h   \
-       wayland-tbm-protocol.c
+       wayland-tbm-test-client-protocol.h      \
+       wayland-tbm-protocol.c \
+       wayland-tbm-test-protocol.c
 
 %-protocol.c : $(top_srcdir)/protocol/%.xml
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) code < $< > $@

diff --git a/utests/Makefile.am b/utests/Makefile.am
index 3dc6317..9132673 100644 (file)
--- a/utests/Makefile.am
+++ b/utests/Makefile.am
@@ -1,27 +1,14 @@
 bin_PROGRAMS = wayland-tbm-utests
 
-wayland_tbm_utests_SOURCES = \
-       src/ut_main.cpp \
-       src/ut_base.cpp \
-       src/ut_wayland_tbm.cpp \
-       wayland-tbm-test-protocol.c
-
-nodist_include_HEADERS = \
-       wayland-tbm-test-server-protocol.h \
-       wayland-tbm-test-client-protocol.h
-
 wayland_tbm_utests_CXXFLAGS = \
        $(CXXFLAGS) \
        $(WL_TBM_COMMON_CFLAGS) \
        $(WL_TBM_CLIENT_CFLAGS) \
        $(WL_TBM_SERVER_CFLAGS) \
        -I../src \
-       -I./src \
        -I./ \
        -I$(includedir)/gtest \
-       -fpermissive \
-       -rdynamic \
-       -DFAIL_ON_UNSUPPORTED
+       -fpermissive
 
 # The flag -w is used, because there are many warnings in wayland-tbm sources.
 # Warnings occur because we build project with g++.
@@ -36,14 +23,10 @@ wayland_tbm_utests_LDFLAGS = \
        $(top_builddir)/src/libwayland-tbm-server.la \
        -lgtest
 
-%-protocol.c : $(top_srcdir)/protocol/%.xml
-       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) code < $< > $@
-
-%-server-protocol.h : $(top_srcdir)/protocol/%.xml
-       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) server-header < $< > $@
-
-%-client-protocol.h : $(top_srcdir)/protocol/%.xml
-       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) client-header < $< > $@
+wayland_tbm_utests_SOURCES = \
+       src/ut_main.cpp \
+       src/ut_base.cpp \
+       src/ut_wayland_tbm.cpp
 
 check:
-       ./wayland-tbm-utests
\ No newline at end of file
+       ./wayland-tbm-utests