[PATCH wayland] build: Build libwayland-util-light for the scanner

[Derek Foreman]

This introduces libwayland-util-light, a small subset of libwayland-util
that supplies just the bits the scanner needs.

Signed-off-by: Derek Foreman <derekf at osg.samsung.com>
---
 Makefile.am | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 58f5595..a12b46a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,25 +27,28 @@ wayland_scanner = $(top_builddir)/wayland-scanner
 bin_PROGRAMS = wayland-scanner
 wayland_scanner_SOURCES = src/scanner.c
 wayland_scanner_CFLAGS = $(EXPAT_CFLAGS) $(AM_CFLAGS)
-wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la
+wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util-light.la
 $(BUILT_SOURCES) : wayland-scanner
 pkgconfig_DATA += src/wayland-scanner.pc
 else
 wayland_scanner = wayland-scanner
 endif
 
-libwayland_util_la_CFLAGS = $(AM_CFLAGS)
-libwayland_util_la_SOURCES =			\
+libwayland_util_light_la_CFLAGS = $(AM_CFLAGS)
+libwayland_util_light_la_SOURCES =			\
 	src/wayland-util.c			\
 	src/wayland-util.h
 
-noinst_LTLIBRARIES = libwayland-util.la
+noinst_LTLIBRARIES = libwayland-util-light.la
 
 if ENABLE_LIBRARIES
+noinst_LTLIBRARIES += libwayland-util.la
 lib_LTLIBRARIES = libwayland-server.la libwayland-client.la
 
-libwayland_util_la_CFLAGS += $(FFI_CFLAGS)
-libwayland_util_la_SOURCES +=			\
+libwayland_util_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS)
+libwayland_util_la_SOURCES =		\
+	src/wayland-util.c			\
+	src/wayland-util.h			\
 	src/connection.c			\
 	src/wayland-os.c			\
 	src/wayland-os.h			\
@@ -229,4 +232,4 @@ 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
-endif
+endif #ENABLE_LIBRARIES
-- 
2.1.4