StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
libxkbcommon/src/Makefile.am

31 lines
694 B
Makefile
Raw Normal View History

config: makekeys prog should stand alone in the makekeys directory 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-09 14:22:17 -07:00
SUBDIRS = xkbcomp
Initial implementation of keysym handlers 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-01-20 08:46:12 -07:00
config: makekeys prog should stand alone in the makekeys directory 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-09 14:22:17 -07:00
AM_CPPFLAGS = -I$(top_srcdir)/include
Use XKB alloc macros internally These are used throughout the XKB code, but are defined in XKBsrv.h, which we'd like to avoid. Internal definitions for True/False have also been added since they're in Xlib.h
2009-03-19 16:10:14 -06:00
AM_CFLAGS = $(X11_CFLAGS) $(CWARNFLAGS) $(XMALLOC_ZERO_CFLAGS)
Generate keysym tables from X and XF86 keysym definitions The keysym hash table ks_tables.h is generated by makekeys from keysymdef.h and XF86keysym.h.
2009-01-14 19:00:10 -07:00
Initial implementation of keysym handlers 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-01-20 08:46:12 -07:00
lib_LTLIBRARIES = libxkbcommon.la
Don't check for xlib, we don't need it
2010-10-21 19:34:41 -06:00
libxkbcommon_la_LIBADD = xkbcomp/libxkbcomp.la
Link with -no-undefined Use -no-undefined to assure libtool that the libxkbcommon library has no unresolved symbols at link time, so that libtool will build a shared library on platforms require that all symbols are resolved when the library is linked. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2010-10-26 09:21:28 -06:00
libxkbcommon_la_LDFLAGS = -no-undefined
Initial implementation of keysym handlers 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-01-20 08:46:12 -07:00
libxkbcommon_la_SOURCES = \
Rename headers to XKBcommon* and install in extensions directory Following the kbproto convention, the headers will be named XKBcommon.h and XKBcommonint.h. Furthermore, they'll be installed in X11/extensions directory with the rest of the XKB headers.
2009-03-05 19:20:15 -07:00
XKBcommonint.h \
Add XkbDescRec initializers and destructors Copies the code to initialize and destroy an XkbDescRec from libX11. The original code is in libX11/src/xkb/XKBAlloc.c libX11/src/xkb/XKBGAlloc.c libX11/src/xkb/XKBMAlloc.c
2009-03-19 17:57:01 -06:00
alloc.c \
Borrow atom implementation from libxkbfile We need an atom implementation not relying on XInternAtom and friends. The original code is in libxkbfile/src/xkbatom.c
2009-03-25 20:00:49 -06:00
atom.c \
Add geometry Compute API from XKBlib A small needed subset from libX11/src/xkb/XKBGeom.c.
2009-03-28 17:08:46 -06:00
galloc.c \
geom.c \
Move *Text APIs into libxkbcommon These seem like they might be generally useful, and more will be needed from xkbfile.
2009-03-28 07:32:08 -06:00
keysym.c \
Add XKBlib API to support keytypes Added common variants of XkbComputeEffectiveMap, XkbInitCanonicalKeyTypes and all their needed functions. A couple functions that were in alloc.c moved to malloc.c to mirror the libX11 sources better. Original code in libX11/src/xkb/XKBMalloc.c libX11/src/xkb/XKBMisc.c libX11/src/xkb/XKB.c
2009-03-28 18:55:46 -06:00
malloc.c \
Add rules rules file parsing from xkbfile Copy over the Xkb_RF* rules parsing functions from xkbfile's maprules.c. Eventually, this will be tied into xkbcomp's path searching utilities so you don't need to supply a full path to the rules file. Also, it this should eventually incorporate the server's RMLVOSet.
2009-03-29 12:25:44 -06:00
maprules.c \
Add XKBlib API to support keytypes Added common variants of XkbComputeEffectiveMap, XkbInitCanonicalKeyTypes and all their needed functions. A couple functions that were in alloc.c moved to malloc.c to mirror the libX11 sources better. Original code in libX11/src/xkb/XKBMalloc.c libX11/src/xkb/XKBMisc.c libX11/src/xkb/XKB.c
2009-03-28 18:55:46 -06:00
misc.c \
text.c \
Remove all non-public API from XKBcommon.h header The noble intention was to expose all the new API and new generic types in the split out kbproto headers through XKBcommon.h. It turns out that would be a massive amount of work in the server. Someday, but first just wedging in XkbCompileKeymap* would be good. Most of the API is in new internal xkb*.h headers. In order to allow the XKBcommon.h header to be used from the server, we can't pull in other headers from kbproto since the server has its own copies. However, types that are different (XkbDescRec, XkbAction) still have Xkbc equivalents here, and I think they should be used in the server.
2009-04-08 08:46:25 -06:00
xkb.c \
xkballoc.h \
xkbgeom.h \
xkbmisc.h \
xkbrules.h
config: makekeys prog should stand alone in the makekeys directory 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-09 14:22:17 -07:00
BUILT_SOURCES = ks_tables.h
CLEANFILES = $(BUILT_SOURCES)
config: add keysymdef and xf86keysym as dependencies of ks_tables.h This would cover the scenario where these headers file are updated, for example, a new version is installed. Running 'make' again on libxkbcommon should rebuild ks_tables.h. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-09 14:28:52 -07:00
ks_tables.h: $(top_builddir)/makekeys/makekeys$(EXEEXT) $(KEYSYMDEF_H) $(XF86KEYSYM_H)
config: makekeys prog should stand alone in the makekeys directory 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-09 14:22:17 -07:00
$(AM_V_GEN)cat $(KEYSYMDEF_H) $(XF86KEYSYM_H) | $(top_builddir)/makekeys/makekeys$(EXEEXT) > $@