atom: allow passing NULLs to find_node_pointer()

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

diff --git a/Makefile.am b/Makefile.am
index 0e31100..0d13625 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,10 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xkbcommon.pc
 
+EXTRA_DIST = \
+       makekeys.py \
+       src/xkbcomp/keywords.gperf
+
 AM_CPPFLAGS = \
        -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' \
        -I$(top_srcdir)/src \
@@ -14,8 +18,7 @@ AM_CFLAGS = $(BASE_CFLAGS)
 
 AM_LDFLAGS = -no-undefined
 
-AM_LFLAGS = -o lex.yy.c
-AM_YFLAGS = -d
+AM_YFLAGS = -d -p _xkbcommon_
 
 xkbcommonincludedir = $(includedir)/xkbcommon
 xkbcommoninclude_HEADERS = \
@@ -108,7 +111,7 @@ endif ENABLE_DOCS
 
 # Some tests need to use unexported symbols, so we link them against
 # a private copy of libxkbcommon with all symbols exposed.
-noinst_LTLIBRARIES = libtest.la
+check_LTLIBRARIES = libtest.la
 libtest_la_CFLAGS = $(AM_CLFLAGS) -fvisibility=default
 libtest_la_SOURCES = \
        $(libxkbcommon_la_SOURCES) \
@@ -164,7 +167,7 @@ check_PROGRAMS += \
 
 endif BUILD_LINUX_TESTS
 
-EXTRA_DIST = \
+EXTRA_DIST += \
        test/data
 
 # This sed script strips out lines that start with '#define _' which