build: actually make use of pkg-config info about xbkcommon

We now use xkbcommon in lots of places so add the build-flags to all
libraries and applications that use it.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>

diff --git a/Makefile.am b/Makefile.am
index fa3fa32..52854ad 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -155,8 +155,10 @@ libtsm_la_SOURCES = \
        src/tsm_vte_charsets.c
 
 libtsm_la_CPPFLAGS = \
-       $(AM_CPPFLAGS)
+       $(AM_CPPFLAGS) \
+       $(XKBCOMMON_CFLAGS)
 libtsm_la_LDFLAGS = \
+       $(XKBCOMMON_LIBS) \
        -version-info 1:0:0
 
 #
@@ -387,9 +389,11 @@ endif
 
 libkmscon_core_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
-       $(GLES2_CFLAGS)
+       $(GLES2_CFLAGS) \
+       $(XKBCOMMON_CFLAGS)
 libkmscon_core_la_LIBADD = \
        $(GLES2_LIBS) \
+       $(XKBCOMMON_LIBS) \
        -lpthread \
        libeloop.la \
        libtsm.la \
@@ -415,7 +419,11 @@ kmscon_SOURCES = \
        $(SHL_DLIST) \
        $(SHL_MISC) \
        src/main.c
+kmscon_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       $(XKBCOMMON_CFLAGS)
 kmscon_LDADD = \
+       $(XKBCOMMON_LIBS) \
        libuterm.la \
        libeloop.la \
        libtext-font.la \