test/state: fix tautological test

[platform/upstream/libxkbcommon.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6775733..c4d3352 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,9 @@ AM_CPPFLAGS = \
 AM_CFLAGS = $(BASE_CFLAGS)
 
 AM_LDFLAGS = -no-undefined
+if HAVE_NO_UNDEFINED
+AM_LDFLAGS += -Wl,--no-undefined
+endif
 
 AM_YFLAGS = -d -p _xkbcommon_
 
@@ -75,6 +78,33 @@ libxkbcommon_la_SOURCES = \
        src/utils.c \
        src/utils.h
 
+if ENABLE_X11
+pkgconfig_DATA += xkbcommon-x11.pc
+
+xkbcommon_x11includedir = $(xkbcommonincludedir)
+xkbcommon_x11include_HEADERS = \
+       xkbcommon/xkbcommon-x11.h
+
+lib_LTLIBRARIES += libxkbcommon-x11.la
+
+libxkbcommon_x11_la_CFLAGS = $(AM_CFLAGS) $(XCB_XKB_CFLAGS)
+libxkbcommon_x11_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/x11
+libxkbcommon_x11_la_LIBADD = libxkbcommon.la $(XCB_XKB_LIBS)
+
+libxkbcommon_x11_la_SOURCES = \
+       src/x11/keymap.c \
+       src/x11/state.c \
+       src/x11/util.c \
+       src/x11/x11-priv.h \
+       src/context.h \
+       src/context-priv.c \
+       src/keymap.h \
+       src/keymap-priv.c \
+       src/atom.h \
+       src/atom.c
+
+endif ENABLE_X11
+
 BUILT_SOURCES = \
        src/xkbcomp/parser.c \
        src/xkbcomp/parser.h
@@ -171,6 +201,21 @@ check_PROGRAMS += \
 
 endif BUILD_LINUX_TESTS
 
+if ENABLE_X11
+TESTS += \
+       test/x11
+TESTS_X11_LDADD = $(TESTS_LDADD) $(XCB_XKB_LIBS) libxkbcommon-x11.la
+TESTS_X11_CFLAGS = $(XCB_XKB_CFLAGS)
+
+test_x11_LDADD = $(TESTS_X11_LDADD)
+test_x11_CFLAGS = $(TESTS_X11_CFLAGS)
+test_interactive_x11_LDADD = $(TESTS_X11_LDADD)
+test_interactive_x11_CFLAGS = $(TESTS_X11_CFLAGS)
+
+check_PROGRAMS += \
+       test/interactive-x11
+endif ENABLE_X11
+
 EXTRA_DIST += \
        test/data