2012-10-25 17:51:46 -06:00
|
|
|
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
2012-03-23 20:48:31 -06:00
|
|
|
|
2009-04-01 07:22:06 -06:00
|
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
|
|
pkgconfig_DATA = xkbcommon.pc
|
|
|
|
|
2013-08-29 10:07:25 -06:00
|
|
|
EXTRA_DIST = \
|
|
|
|
makekeys.py \
|
|
|
|
src/xkbcomp/keywords.gperf
|
|
|
|
|
2012-03-27 08:51:28 -06:00
|
|
|
AM_CPPFLAGS = \
|
2012-04-08 06:38:04 -06:00
|
|
|
-DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' \
|
2012-03-27 08:51:28 -06:00
|
|
|
-I$(top_srcdir)/src \
|
|
|
|
-I$(top_srcdir)/src/xkbcomp \
|
2012-05-09 08:23:44 -06:00
|
|
|
-I$(top_builddir)/src/xkbcomp \
|
2012-05-15 06:23:40 -06:00
|
|
|
-include $(top_builddir)/src/config.h
|
2012-04-08 06:38:04 -06:00
|
|
|
|
2012-09-21 10:48:33 -06:00
|
|
|
AM_CFLAGS = $(BASE_CFLAGS)
|
2012-04-08 06:38:04 -06:00
|
|
|
|
2013-08-02 01:21:52 -06:00
|
|
|
AM_LDFLAGS = -no-undefined
|
|
|
|
|
2012-09-20 07:28:27 -06:00
|
|
|
AM_LFLAGS = -o lex.yy.c
|
2012-03-23 20:48:31 -06:00
|
|
|
AM_YFLAGS = -d
|
|
|
|
|
|
|
|
xkbcommonincludedir = $(includedir)/xkbcommon
|
2012-05-08 10:59:35 -06:00
|
|
|
xkbcommoninclude_HEADERS = \
|
2012-07-22 15:41:27 -06:00
|
|
|
xkbcommon/xkbcommon.h \
|
2012-09-12 12:52:30 -06:00
|
|
|
xkbcommon/xkbcommon-compat.h \
|
|
|
|
xkbcommon/xkbcommon-keysyms.h \
|
|
|
|
xkbcommon/xkbcommon-names.h
|
2012-03-23 20:48:31 -06:00
|
|
|
|
|
|
|
lib_LTLIBRARIES = libxkbcommon.la
|
|
|
|
libxkbcommon_la_SOURCES = \
|
|
|
|
src/xkbcomp/action.c \
|
|
|
|
src/xkbcomp/action.h \
|
2012-08-13 02:00:43 -06:00
|
|
|
src/xkbcomp/ast.h \
|
|
|
|
src/xkbcomp/ast-build.c \
|
|
|
|
src/xkbcomp/ast-build.h \
|
2012-03-23 20:48:31 -06:00
|
|
|
src/xkbcomp/compat.c \
|
|
|
|
src/xkbcomp/expr.c \
|
|
|
|
src/xkbcomp/expr.h \
|
2012-08-13 02:00:43 -06:00
|
|
|
src/xkbcomp/include.c \
|
|
|
|
src/xkbcomp/include.h \
|
2012-03-23 20:48:31 -06:00
|
|
|
src/xkbcomp/keycodes.c \
|
2012-08-29 06:02:40 -06:00
|
|
|
src/xkbcomp/keymap.c \
|
2013-03-01 12:48:02 -07:00
|
|
|
src/xkbcomp/keymap-dump.c \
|
Replace flex scanner with a hand-written one
The scanner is very similar in structure to the one in xkbcomp/rules.c.
It avoids copying and has nicer error reporting.
It uses gperf to generate a hashtable for the keywords, which gives a
nice speed boost (compared to the naive strcasecmp method at least). But
since there's hardly a reason to regenerate it every time and require
people to install gperf, the output (keywords.c) is added here as well.
Here are some stats from test/rulescomp:
Before:
compiled 1000 keymaps in 4.052939625s
==22063== total heap usage: 101,101 allocs, 101,101 frees, 11,840,834 bytes allocated
After:
compiled 1000 keymaps in 3.519665434s
==26505== total heap usage: 99,945 allocs, 99,945 frees, 7,033,608 bytes allocated
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-12 02:40:02 -06:00
|
|
|
src/xkbcomp/keywords.c \
|
2012-05-08 04:57:07 -06:00
|
|
|
src/xkbcomp/parser.y \
|
2012-08-13 02:00:43 -06:00
|
|
|
src/xkbcomp/parser-priv.h \
|
2012-05-13 00:49:08 -06:00
|
|
|
src/xkbcomp/rules.c \
|
|
|
|
src/xkbcomp/rules.h \
|
Replace flex scanner with a hand-written one
The scanner is very similar in structure to the one in xkbcomp/rules.c.
It avoids copying and has nicer error reporting.
It uses gperf to generate a hashtable for the keywords, which gives a
nice speed boost (compared to the naive strcasecmp method at least). But
since there's hardly a reason to regenerate it every time and require
people to install gperf, the output (keywords.c) is added here as well.
Here are some stats from test/rulescomp:
Before:
compiled 1000 keymaps in 4.052939625s
==22063== total heap usage: 101,101 allocs, 101,101 frees, 11,840,834 bytes allocated
After:
compiled 1000 keymaps in 3.519665434s
==26505== total heap usage: 99,945 allocs, 99,945 frees, 7,033,608 bytes allocated
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-12 02:40:02 -06:00
|
|
|
src/xkbcomp/scanner.c \
|
2013-03-14 06:31:55 -06:00
|
|
|
src/xkbcomp/scanner-utils.h \
|
2012-03-23 20:48:31 -06:00
|
|
|
src/xkbcomp/symbols.c \
|
2012-08-13 02:00:43 -06:00
|
|
|
src/xkbcomp/types.c \
|
2012-03-23 20:48:31 -06:00
|
|
|
src/xkbcomp/vmod.c \
|
|
|
|
src/xkbcomp/vmod.h \
|
|
|
|
src/xkbcomp/xkbcomp.c \
|
2012-05-08 04:57:07 -06:00
|
|
|
src/xkbcomp/xkbcomp-priv.h \
|
2012-03-23 20:48:31 -06:00
|
|
|
src/atom.c \
|
2012-05-08 05:52:23 -06:00
|
|
|
src/atom.h \
|
2012-03-27 09:59:01 -06:00
|
|
|
src/context.c \
|
2012-09-16 05:45:32 -06:00
|
|
|
src/context.h \
|
2012-09-12 12:52:30 -06:00
|
|
|
src/compat.c \
|
2012-05-21 14:33:56 -06:00
|
|
|
src/darray.h \
|
2012-03-23 20:48:31 -06:00
|
|
|
src/keysym.c \
|
2012-09-16 05:45:32 -06:00
|
|
|
src/keysym.h \
|
2012-06-08 06:10:28 -06:00
|
|
|
src/keysym-utf.c \
|
2012-10-17 11:52:47 -06:00
|
|
|
src/ks_tables.h \
|
2012-09-21 05:58:31 -06:00
|
|
|
src/keymap.c \
|
|
|
|
src/keymap.h \
|
2012-03-23 20:48:31 -06:00
|
|
|
src/state.c \
|
|
|
|
src/text.c \
|
2012-05-08 05:52:23 -06:00
|
|
|
src/text.h \
|
2013-03-14 06:33:40 -06:00
|
|
|
src/utils.c \
|
2012-09-16 05:45:32 -06:00
|
|
|
src/utils.h
|
2012-03-23 20:48:31 -06:00
|
|
|
|
2012-03-27 08:51:28 -06:00
|
|
|
BUILT_SOURCES = \
|
2012-05-08 04:57:07 -06:00
|
|
|
src/xkbcomp/parser.c \
|
Replace flex scanner with a hand-written one
The scanner is very similar in structure to the one in xkbcomp/rules.c.
It avoids copying and has nicer error reporting.
It uses gperf to generate a hashtable for the keywords, which gives a
nice speed boost (compared to the naive strcasecmp method at least). But
since there's hardly a reason to regenerate it every time and require
people to install gperf, the output (keywords.c) is added here as well.
Here are some stats from test/rulescomp:
Before:
compiled 1000 keymaps in 4.052939625s
==22063== total heap usage: 101,101 allocs, 101,101 frees, 11,840,834 bytes allocated
After:
compiled 1000 keymaps in 3.519665434s
==26505== total heap usage: 99,945 allocs, 99,945 frees, 7,033,608 bytes allocated
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-12 02:40:02 -06:00
|
|
|
src/xkbcomp/parser.h
|
2012-03-27 08:51:28 -06:00
|
|
|
CLEANFILES = $(BUILT_SOURCES)
|
2012-03-23 20:48:31 -06:00
|
|
|
|
2012-06-04 09:14:42 -06:00
|
|
|
src/xkbcomp/parser.c: $(top_builddir)/src/$(am__dirstamp) $(top_builddir)/src/xkbcomp/$(am__dirstamp)
|
|
|
|
src/xkbcomp/parser.h: $(top_builddir)/src/$(am__dirstamp) $(top_builddir)/src/xkbcomp/$(am__dirstamp)
|
2012-06-04 07:06:01 -06:00
|
|
|
|
2012-09-22 06:02:54 -06:00
|
|
|
# Documentation
|
|
|
|
|
|
|
|
if ENABLE_DOCS
|
|
|
|
if HAVE_DOXYGEN
|
|
|
|
doc: doc/stamp-doxygen
|
|
|
|
clean-doc: clean-doxygen
|
|
|
|
all-local:: doc
|
|
|
|
clean-local:: clean-doc
|
|
|
|
|
|
|
|
doc/stamp-doxygen: $(top_srcdir)/xkbcommon/*.h
|
|
|
|
$(AM_V_GEN)$(DOXYGEN) doc/Doxyfile
|
|
|
|
touch $@
|
|
|
|
|
|
|
|
clean-doxygen:
|
|
|
|
rm -rf doc/html doc/stamp-doxygen
|
|
|
|
|
|
|
|
install-data-local:: doc
|
|
|
|
$(MKDIR_P) $(DESTDIR)$(htmldir)
|
|
|
|
$(INSTALL_DATA) doc/html/* $(DESTDIR)$(htmldir)
|
|
|
|
|
|
|
|
uninstall-local::
|
|
|
|
rm -rf $(DESTDIR)$(htmldir)
|
|
|
|
|
|
|
|
endif HAVE_DOXYGEN
|
|
|
|
endif ENABLE_DOCS
|
|
|
|
|
2012-03-30 17:44:39 -06:00
|
|
|
# Tests
|
|
|
|
|
2012-05-18 17:35:15 -06:00
|
|
|
# Some tests need to use unexported symbols, so we link them against
|
|
|
|
# a private copy of libxkbcommon with all symbols exposed.
|
2013-08-15 00:32:42 -06:00
|
|
|
check_LTLIBRARIES = libtest.la
|
2013-08-02 02:07:27 -06:00
|
|
|
libtest_la_CFLAGS = $(AM_CLFLAGS) -fvisibility=default
|
2012-07-12 07:15:08 -06:00
|
|
|
libtest_la_SOURCES = \
|
|
|
|
$(libxkbcommon_la_SOURCES) \
|
2012-10-26 07:05:04 -06:00
|
|
|
test/common.c \
|
|
|
|
test/test.h
|
2012-05-18 17:35:15 -06:00
|
|
|
|
2012-08-30 11:23:35 -06:00
|
|
|
AM_TESTS_ENVIRONMENT = \
|
2012-10-12 02:15:43 -06:00
|
|
|
XKB_LOG_LEVEL=debug; export XKB_LOG_LEVEL; \
|
|
|
|
XKB_LOG_VERBOSITY=10; export XKB_LOG_VERBOSITY; \
|
2012-09-21 10:57:37 -06:00
|
|
|
$(XORG_MALLOC_DEBUG_ENV)
|
2012-03-30 17:44:39 -06:00
|
|
|
|
|
|
|
TESTS = \
|
2012-08-02 19:32:30 -06:00
|
|
|
test/keysym \
|
2012-03-30 17:44:39 -06:00
|
|
|
test/filecomp \
|
2012-05-18 17:35:15 -06:00
|
|
|
test/context \
|
2012-05-25 10:05:39 -06:00
|
|
|
test/rules-file \
|
2012-04-10 12:20:27 -06:00
|
|
|
test/stringcomp \
|
2013-03-11 05:53:39 -06:00
|
|
|
test/buffercomp \
|
2012-07-22 10:38:14 -06:00
|
|
|
test/log
|
2012-07-12 07:15:08 -06:00
|
|
|
TESTS_LDADD = libtest.la
|
2012-03-30 17:44:39 -06:00
|
|
|
|
2012-08-02 19:32:30 -06:00
|
|
|
test_keysym_LDADD = $(TESTS_LDADD)
|
2012-03-30 17:44:39 -06:00
|
|
|
test_filecomp_LDADD = $(TESTS_LDADD)
|
2012-05-17 17:56:36 -06:00
|
|
|
test_rulescomp_LDADD = $(TESTS_LDADD) -lrt
|
2012-03-30 17:44:39 -06:00
|
|
|
test_context_LDADD = $(TESTS_LDADD)
|
2012-05-18 17:35:15 -06:00
|
|
|
test_rules_file_CFLAGS = $(AM_CFLAGS) -Wno-declaration-after-statement
|
2012-08-28 10:07:07 -06:00
|
|
|
test_rules_file_LDADD = $(TESTS_LDADD) -lrt
|
2012-05-29 08:08:35 -06:00
|
|
|
test_stringcomp_LDADD = $(TESTS_LDADD)
|
2013-03-11 05:53:39 -06:00
|
|
|
test_buffercomp_LDADD = $(TESTS_LDADD)
|
2012-07-22 10:38:14 -06:00
|
|
|
test_log_LDADD = $(TESTS_LDADD)
|
2012-08-29 02:54:05 -06:00
|
|
|
test_rmlvo_to_kccgst_LDADD = $(TESTS_LDADD)
|
2012-09-19 07:44:15 -06:00
|
|
|
test_print_compiled_keymap_LDADD = $(TESTS_LDADD)
|
2012-10-24 15:27:40 -06:00
|
|
|
test_bench_key_proc_LDADD = $(TESTS_LDADD) -lrt
|
2012-03-30 17:44:39 -06:00
|
|
|
|
2012-04-07 17:20:39 -06:00
|
|
|
check_PROGRAMS = \
|
|
|
|
$(TESTS) \
|
2012-09-19 07:44:15 -06:00
|
|
|
test/rmlvo-to-kccgst \
|
2012-10-24 15:27:40 -06:00
|
|
|
test/print-compiled-keymap \
|
|
|
|
test/bench-key-proc
|
2012-03-30 17:44:39 -06:00
|
|
|
|
2013-03-02 10:01:18 -07:00
|
|
|
if BUILD_LINUX_TESTS
|
|
|
|
TESTS += \
|
|
|
|
test/state \
|
2013-03-27 16:40:58 -06:00
|
|
|
test/keyseq \
|
|
|
|
test/rulescomp
|
2013-03-02 10:01:18 -07:00
|
|
|
|
|
|
|
test_keyseq_LDADD = $(TESTS_LDADD)
|
|
|
|
test_state_LDADD = $(TESTS_LDADD)
|
|
|
|
test_interactive_LDADD = $(TESTS_LDADD)
|
|
|
|
|
|
|
|
check_PROGRAMS += \
|
|
|
|
test/interactive
|
|
|
|
|
|
|
|
endif BUILD_LINUX_TESTS
|
|
|
|
|
2013-08-29 10:07:25 -06:00
|
|
|
EXTRA_DIST += \
|
2012-10-26 07:05:04 -06:00
|
|
|
test/data
|
2012-05-09 06:33:04 -06:00
|
|
|
|
|
|
|
# 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.
|
2012-05-20 11:51:50 -06:00
|
|
|
X11_INCLUDEDIR = /usr/include/X11
|
|
|
|
KEYSYMDEFS = \
|
|
|
|
$(X11_INCLUDEDIR)/keysymdef.h \
|
|
|
|
$(X11_INCLUDEDIR)/XF86keysym.h \
|
|
|
|
$(X11_INCLUDEDIR)/Sunkeysym.h \
|
|
|
|
$(X11_INCLUDEDIR)/DECkeysym.h \
|
|
|
|
$(X11_INCLUDEDIR)/HPkeysym.h
|
2012-05-09 06:33:04 -06:00
|
|
|
update-keysyms:
|
2012-09-11 09:49:04 -06:00
|
|
|
echo -en '#ifndef _XKBCOMMON_KEYSYMS_H\n#define _XKBCOMMON_KEYSYMS_H\n\n' > $(top_srcdir)/xkbcommon/xkbcommon-keysyms.h
|
|
|
|
echo -en '/* This file is autogenerated from Makefile.am; please do not commit directly. */\n\n' >> $(top_srcdir)/xkbcommon/xkbcommon-keysyms.h
|
|
|
|
echo -en '#define XKB_KEY_NoSymbol 0x000000 /* Special KeySym */\n\n' >> $(top_srcdir)/xkbcommon/xkbcommon-keysyms.h
|
2012-10-26 07:00:33 -06:00
|
|
|
sed -e '/XK_Ydiaeresis\s*0x100000ee/d' \
|
|
|
|
-e '/#define _/d' \
|
|
|
|
-e 's/#define\s*\(\w*\)XK_/#define XKB_KEY_\1/' \
|
|
|
|
-e '/\(#ifdef\|#ifndef\|#endif\)/d' $(KEYSYMDEFS) >> $(top_srcdir)/xkbcommon/xkbcommon-keysyms.h
|
2012-09-11 09:49:04 -06:00
|
|
|
echo -en '\n\n#endif\n' >> $(top_srcdir)/xkbcommon/xkbcommon-keysyms.h
|
2012-10-17 11:52:47 -06:00
|
|
|
echo -en '/* This file is autogenerated from Makefile.am; please do not commit directly. */\n\n' > $(top_srcdir)/src/ks_tables.h
|
|
|
|
LC_CTYPE=C python $(top_srcdir)/makekeys.py $(top_srcdir)/xkbcommon/xkbcommon-keysyms.h >> $(top_srcdir)/src/ks_tables.h
|
2012-05-14 05:33:29 -06:00
|
|
|
|
Replace flex scanner with a hand-written one
The scanner is very similar in structure to the one in xkbcomp/rules.c.
It avoids copying and has nicer error reporting.
It uses gperf to generate a hashtable for the keywords, which gives a
nice speed boost (compared to the naive strcasecmp method at least). But
since there's hardly a reason to regenerate it every time and require
people to install gperf, the output (keywords.c) is added here as well.
Here are some stats from test/rulescomp:
Before:
compiled 1000 keymaps in 4.052939625s
==22063== total heap usage: 101,101 allocs, 101,101 frees, 11,840,834 bytes allocated
After:
compiled 1000 keymaps in 3.519665434s
==26505== total heap usage: 99,945 allocs, 99,945 frees, 7,033,608 bytes allocated
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-12 02:40:02 -06:00
|
|
|
# Run this if you add/remove a new keyword to the xkbcomp scanner,
|
|
|
|
# or just want to regenerate the gperf file.
|
|
|
|
update-keywords:
|
|
|
|
$(AM_V_GEN)gperf < $(top_srcdir)/src/xkbcomp/keywords.gperf > $(top_srcdir)/src/xkbcomp/keywords.c
|
|
|
|
|
2012-05-14 05:33:29 -06:00
|
|
|
# Android stuff
|
|
|
|
|
|
|
|
Android_build.mk: Makefile $(BUILT_SOURCES)
|
|
|
|
androgenizer \
|
|
|
|
-:PROJECT libxkbcommon \
|
|
|
|
-:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
|
|
|
|
\
|
|
|
|
-:STATIC libxkbcommon \
|
|
|
|
-:TAGS eng debug \
|
|
|
|
-:SOURCES $(filter-out %.l %.y,$(libxkbcommon_la_SOURCES)) $(BUILT_SOURCES) \
|
|
|
|
-:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $(AM_CFLAGS) \
|
2013-08-02 01:21:52 -06:00
|
|
|
-:LDFLAGS $(AM_LDFLAGS) \
|
2012-05-14 05:33:29 -06:00
|
|
|
\
|
|
|
|
-:PASSTHROUGH 'libxkbcommon-clean: clean-libxkbcommon' \
|
|
|
|
> $@
|