[PATCH wayland v2 6/8] build: wire-up wayland-egl

[Quentin Glidic]

On 10/10/17 3:43 PM, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> Wire-up the imported sources, test and pkg-config files.
> 
> v2:
>   - Don't mangle with existing EXTRA_DIST list
>   - Add the symbols check script to the `make check' target
>   - Rename wayland-egl-{priv,backend}.h
> 
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>   Makefile.am  | 22 ++++++++++++++++++++--
>   configure.ac |  2 ++
>   2 files changed, 22 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 0eedb10..eba9e81 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -118,6 +118,7 @@ BUILT_SOURCES =					\
>   
>   CLEANFILES = $(BUILT_SOURCES) doc/doxygen/doxygen_sqlite3.db
>   DISTCLEANFILES = src/wayland-version.h
> +EXTRA_DIST =
>   
>   
>   
> @@ -142,6 +143,16 @@ libwayland_cursor_la_CFLAGS =			\
>   	-I$(top_srcdir)/src			\
>   	-DICONDIR=\"$(ICONDIR)\"
>   
> +lib_LTLIBRARIES += libwayland-egl.la
> +
> +libwayland_egl_la_SOURCES = egl/wayland-egl.c
> +libwayland_egl_la_LDFLAGS = -version-info 1
> +
> +pkgconfig_DATA += egl/wayland-egl.pc
> +
> +## XXX: backend interface
> +include_HEADERS += egl/wayland-egl-backend.h
> +pkgconfig_DATA += egl/wayland-egl-backend.pc
>   
>   built_test_programs =				\
>   	array-test				\
> @@ -163,7 +174,13 @@ built_test_programs =				\
>   	message-test				\
>   	headers-test				\
>   	compositor-introspection-test		\
> -	protocol-logger-test
> +	protocol-logger-test			\
> +	wayland-egl-abi-check
> +
> +EXTRA_DIST += egl/wayland-egl-symbols-check

Nit: dist_check_SCRIPTS

> +
> +check_PROGRAMS = wayland-egl-abi-check
> +wayland_egl_abi_check_SOURCES = egl/wayland-egl-abi-check.c
>   
>   if ENABLE_CPP_TEST
>   built_test_programs += cpp-compile-test
> @@ -177,6 +194,7 @@ AM_TESTS_ENVIRONMENT =							\
>   	;
>   
>   TESTS = $(built_test_programs)			\
> +	egl/wayland-egl-symbols-check		\
>   	tests/scanner-test.sh
>   
>   noinst_PROGRAMS =				\
> @@ -258,7 +276,7 @@ os_wrappers_test_LDADD = libtest-runner.la
>   exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c
>   exec_fd_leak_checker_LDADD = libtest-runner.la
>   
> -EXTRA_DIST = tests/scanner-test.sh			\
> +EXTRA_DIST += tests/scanner-test.sh			\
>   	tests/data/example.xml				\
>   	tests/data/example-client.h			\
>   	tests/data/example-server.h			\
> diff --git a/configure.ac b/configure.ac
> index fcb9718..2542243 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -193,6 +193,8 @@ AC_CONFIG_FILES([Makefile
>   		 doc/publican/Makefile
>   		 doc/doxygen/Makefile
>   		 doc/man/Makefile
> +		 egl/wayland-egl.pc
> +		 egl/wayland-egl-backend.pc
>   		 src/wayland-server-uninstalled.pc
>   		 src/wayland-client-uninstalled.pc
>   		 src/wayland-scanner-uninstalled.pc
> 


-- 

Quentin “Sardem FF7” Glidic