rules: remove unused struct fields and use size_t

[profile/ivi/libxkbcommon.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6c97739..0da3b79 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,132 @@
-SUBDIRS = include src test
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = makekeys
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xkbcommon.pc
 
-EXTRA_DIST = ChangeLog
+MAINTAINERCLEANFILES = ChangeLog INSTALL
 
-MAINTAINERCLEANFILES = ChangeLog
+.PHONY: ChangeLog INSTALL
 
-.PHONY: ChangeLog
+INSTALL:
+       $(INSTALL_CMD)
 
 ChangeLog:
        $(CHANGELOG_CMD)
 
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
+
+AM_CPPFLAGS = \
+       -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src \
+       -I$(top_srcdir)/src/xkbcomp \
+       -I$(top_builddir)/src/xkbcomp \
+       -include $(top_builddir)/src/config.h
+
+AM_CFLAGS = \
+       $(BASE_CFLAGS) \
+       $(XMALLOC_ZERO_CFLAGS)
+
+AM_YFLAGS = -d
+
+xkbcommonincludedir = $(includedir)/xkbcommon
+xkbcommoninclude_HEADERS = \
+       include/xkbcommon/xkbcommon.h \
+       include/xkbcommon/xkbcommon-names.h \
+       include/xkbcommon/xkbcommon-keysyms.h
+
+lib_LTLIBRARIES = libxkbcommon.la
+libxkbcommon_la_LDFLAGS = -no-undefined
+libxkbcommon_la_SOURCES = \
+       src/xkbcomp/action.c \
+       src/xkbcomp/action.h \
+       src/xkbcomp/alias.c \
+       src/xkbcomp/alias.h \
+       src/xkbcomp/compat.c \
+       src/xkbcomp/expr.c \
+       src/xkbcomp/expr.h \
+       src/xkbcomp/indicators.c \
+       src/xkbcomp/indicators.h \
+       src/xkbcomp/keycodes.c \
+       src/xkbcomp/keycodes.h \
+       src/xkbcomp/keymap.c \
+       src/xkbcomp/keytypes.c \
+       src/xkbcomp/misc.c \
+       src/xkbcomp/parser.y \
+       src/xkbcomp/parseutils.c \
+       src/xkbcomp/parseutils.h \
+       src/xkbcomp/path.c \
+       src/xkbcomp/path.h \
+       src/xkbcomp/scanner.l \
+       src/xkbcomp/symbols.c \
+       src/xkbcomp/vmod.c \
+       src/xkbcomp/vmod.h \
+       src/xkbcomp/xkbcomp.c \
+       src/xkbcomp/xkbcomp.h \
+       src/xkbcomp/xkbcomp-priv.h \
+       src/alloc.c \
+       src/alloc.h \
+       src/atom.c \
+       src/atom.h \
+       src/context.c \
+       src/keysym.c \
+       src/map.c \
+       src/misc.c \
+       src/rules.c \
+       src/rules.h \
+       src/state.c \
+       src/text.c \
+       src/text.h \
+       src/utils.c \
+       src/utils.h \
+       src/xkb.c \
+       src/xkb-priv.h
+
+BUILT_SOURCES = \
+       src/xkbcomp/parser.c \
+       src/xkbcomp/parser.h \
+       src/xkbcomp/scanner.c \
+       src/ks_tables.h
+CLEANFILES = $(BUILT_SOURCES)
+
+src/ks_tables.h: $(KEYSYMDEFS) $(top_builddir)/makekeys/makekeys$(EXEEXT)
+       $(AM_V_GEN)$(top_builddir)/makekeys/makekeys $(top_srcdir)/include/xkbcommon/xkbcommon-keysyms.h > $@
+
+$(top_builddir)/makekeys/makekeys$(EXEEXT): $(top_srcdir)/makekeys/makekeys.c
+       $(MAKE) -C makekeys
+
+# Tests
+
+TESTS_ENVIRONMENT =
+
+TESTS = \
+       test/xkey \
+       test/filecomp \
+       test/namescomp \
+       test/rulescomp \
+       test/canonicalise \
+       test/state \
+       test/context
+TESTS_LDADD = libxkbcommon.la
+
+test_xkey_LDADD = $(TESTS_LDADD)
+test_filecomp_LDADD = $(TESTS_LDADD)
+test_namescomp_LDADD = $(TESTS_LDADD)
+test_rulescomp_LDADD = $(TESTS_LDADD) -lrt
+test_canonicalise_LDADD = $(TESTS_LDADD)
+test_state_LDADD = $(TESTS_LDADD)
+test_context_LDADD = $(TESTS_LDADD)
+
+check_PROGRAMS = $(TESTS)
+
+EXTRA_DIST = test/data
+
+# This sed script strips out lines that start with '#define _' which
+# removes #define _OSF_Keysyms and such.  The XK_Ydiaeresis case is to
+# handle a duplicate definition in HPkeysyms.h which kicks in if it's
+# not already defined.
+
+update-keysyms:
+       sed -e '/XK_Ydiaeresis\s*0x100000ee/d; /#define _/d; s/#define\s*\(\w*\)XK_/#define XKB_KEY_\1/; /\(#ifdef\|#ifndef\|#endif\)/d' $(KEYSYMDEFS) > include/xkbcommon/xkbcommon-keysyms.h