summaryrefslogtreecommitdiff
path: root/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
2012-05-11Add xkbcommon-keysyms.h to Makefile.amDaniel Stone1-1/+2
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-09Merge remote-tracking branch 'krh/keysyms'Daniel Stone1-1/+9
Conflicts: src/keysym.c src/misc.c src/text.h src/xkbcomp/expr.c src/xkbcomp/parser.y src/xkbcomp/parseutils.c src/xkbcomp/symbols.c Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-09Use our own keysymsKristian Høgsberg1-1/+1
2012-05-09Add XKB version of X11 keysymsKristian Høgsberg1-0/+8
With this we're now completely standalone. add vendor keysyms
2012-05-09makekeys: fix cross-compilationPekka Paalanen1-7/+5
makekeys must be built with the build-native compiler, not with $(CC) which is the cross-compiler. The only sane way to achieve this seems to be to use a separate Makefile.am for it. This patch fixes the problem apparently caused by: commit b5efe41f190cbb76eb1ca8ddf0c96990ddb83704 Author: Ran Benita <ran234@gmail.com> Date: Sat Mar 24 04:48:31 2012 +0200 Make build non-recursive There is no such thing as makekeys_makekeys_CC in automake. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-05-09Make build directory includes more explicitDaniel Stone1-1/+1
We depend on parser.h which is generated by flex during the build, so use an explicit $(top_builddir) rather than a relative path. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-08Add pre-defined names databaseDaniel Stone1-1/+3
xkbcommon-names.h right now just contains a set of hardcoded modifier strings that are most commonly used for the usual modifiers. Provide definitions of these so people don't have to worry about typoing a string or mixing up Mod1 and Mod4. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-08Reintroduce $(builddir)/src/xkbcomp includeDaniel Stone1-0/+1
This is required for parser.h, which is autogenerated and thus only in the build directory. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-08Rename XKBcommonint.h to xkb-priv.h and use itRan Benita1-6/+6
Make the files in the src/* directory use their own header or a consilidated private header. This makes the file dependencies clearer. Also drop the pointless "xkb" file name prefix, add split a few declarations to their own files (atom.h and text.h). Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-08Rename xkbcomp/misc.h to xkbcomp-priv.h and use itRan Benita1-8/+7
The include dependencies were quite convoluted, where you change the order and get a ton of errors. Instead, change one file to act as the internal interface for the xkbcomp files, and make every file use it. Also drop the pointless "xkb" prefix to file names. Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-01Merge src/alloc.c and src/malloc.cRan Benita1-1/+0
The two files do exactly the same sort of things, without any discernible reason for splitting them. Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Updated for xkb_desc -> xkb_keymap changes.]
2012-04-09Overhaul test suiteRan Benita1-2/+26
Rewrite all of the current tests in the following ways: - Instead of the current mix of C and shell, just use single-process pure C file per test. All of the .sh files are removed, but everything that was tested is ported. - Instead of handling the test logs ourselves, use Automake's "parallel-test" mechanism. This will create a single log file for each test with it's stdout+stderr, and a top level "test-suite.log" file for all the failed tests. - The "parallel-tests" directive also makes the test run in parallel, so "make check" runs faster. - Also use the "color-tests" directive to have the "make check" output colorized. Who doesn't like to see PASS in green? - All of the test data files are moved into the test/data subdirectory. That way we can just put the directory in EXTRA_DIST and forget about it. - The test/Makefile.am file is consolidated into the main Makefile.am, for a completely non-recursive build. Right now the tests are completely independent and just use simple assert()'s. More sophistication can be added as needed. It should also be noted that it's still possible to use shell, python, etc. if a test wants more flexibility than C can provide, just do as before. Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Updated for xkb_keymap changes.]
2012-04-09Implicitly include config.h in all filesRan Benita1-1/+2
The definitions in config.h should be available in all files an implementation detail; it can be included through the build system instead of having each file pull it every time. This is especially helpful with AC_USE_SYSTEM_EXTENSIONS, as _GNU_SOURCE and friends can have an effect by merely being defined, which can lead to some confusion if its effective for only half the files. And we don't really support a build _without_ config.h; so, one less thing to worry about. Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-09Set xorg-macros CFLAGS correctlyRan Benita1-4/+5
A previous commit messed up all warning flags. Oops. Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-27Add new context APIDaniel Stone1-0/+1
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-27Fix distcheck with non-recursive MakefilesDaniel Stone1-5/+12
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-27Make build non-recursiveRan Benita1-2/+74
Unify all the different Makefile.am into a single short top level one (the test/Makefile.am file is left intact though). This makes the build system simpler to look and should encourage unifying more currently-disparate code. Some further motivation can be found in this page: http://www.flameeyes.eu/autotools-mythbuster/automake/nonrecursive.html Signed-off-by: Ran Benita <ran234@gmail.com>
2010-12-18config: makekeys prog should stand alone in the makekeys directoryGaetan Nadon1-1/+2
This program is a utility to generated a header file. The header file it generates should not be located in the directory where this utility program is compiled. Move the /makekeys dir as a sibling of /src. This reduces the number of bi-directional relationships between directories. Make corresponding makefiles simplifications. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-08config: add the INSTALL target for installation instructionsGaetan Nadon1-4/+5
Acked-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-07config: remove m4/.gitignore now that toplevel one handles it allGaetan Nadon1-2/+0
The -Im4 in Makefile.am will have to wait until the day there is an m4 macro checked-in git in the m4 directory. This does not prevent libtool to install its macros in m4. Acked-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-11-11build: use AC_CONFIG_MACRO_DIR as per libtoolize warningJan Engelhardt1-0/+2
libtoolize: Consider adding "AC_CONFIG_MACRO_DIR([m4])" to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. libtoolize: Consider adding "-I m4" to ACLOCAL_AMFLAGS in Makefile.am. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
2009-04-01Add xkbcommon pkg-config fileDan Nicholson1-0/+3
2009-03-19Testing harness for keysym functionsDan Nicholson1-1/+1
A test program and script have been added for checking the XkbCommon keysym functions. This has already highlighted an error in handling of keysyms from XF86keysym.h.
2009-03-19Initial implementation of keysym handlersDan Nicholson1-1/+1
Add the xkbcommon implementations of XKeysymToString and XStringToKeysym. These symbols have the namespace prefix of Xkbc and are declared in X11/XkbCommon.h. The implementation is taken directly from Xlib, but does not include the XKeysymDB parsing and hashing yet (if it ever will). A couple type conversions were needed to keep from using Xlib.h. See original files: libX11/src/KeysymStr.c libX11/src/StrKeysym.c
2009-03-19Add makekeys for creating keysym hash tablesDan Nicholson1-0/+2
The makekeys utility is used to generate the keysym hash tables during the build. We try to detect a build machine native compiler so the tables can be generated when cross compiling.
2009-03-19Initial autotools commitDan Nicholson1-0/+10
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 07:53:34 +0000