diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2017-10-10 14:43:48 +0100 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2018-02-09 17:31:00 +0000 |
| commit | 1fcb4d1387e2a40ed8cd35b11a7788de52b9cdb9 (patch) | |
| tree | f52a5c0b88df111cb77e40c1615964c1c9f37bda | |
| parent | 066113a4c8cc6837519beab711d22cf01997ff11 (diff) | |
| download | wayland-1fcb4d1387e2a40ed8cd35b11a7788de52b9cdb9.tar.gz | |
build: wire-up wayland-egl
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@collabora.com>
Reviewed-by: Arnaud Vrac <avrac@freebox.fr>
| -rw-r--r-- | Makefile.am | 22 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 22 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 1d21fa2..1e934fe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -119,6 +119,7 @@ BUILT_SOURCES = \ CLEANFILES = $(BUILT_SOURCES) doc/doxygen/doxygen_sqlite3.db DISTCLEANFILES = src/wayland-version.h +EXTRA_DIST = @@ -143,6 +144,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 \ @@ -164,7 +175,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 + +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 @@ -178,6 +195,7 @@ AM_TESTS_ENVIRONMENT = \ ; TESTS = $(built_test_programs) \ + egl/wayland-egl-symbols-check \ tests/scanner-test.sh noinst_PROGRAMS = \ @@ -263,7 +281,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 \ protocol/tests.xml \ tests/data/example.xml \ tests/data/example-client.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 |