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.master
parent
7417310403
commit
1ff77ecd36
|
@ -1,2 +1,2 @@
|
|||
x11includedir = $(includedir)/X11
|
||||
x11include_HEADERS = X11/XkbCommon.h
|
||||
x11includedir = $(includedir)/extensions/X11
|
||||
x11include_HEADERS = X11/extensions/XKBcommon.h
|
||||
|
|
|
@ -14,7 +14,7 @@ $(builddir)/makekeys/makekeys$(EXEEXT):
|
|||
|
||||
lib_LTLIBRARIES = libxkbcommon.la
|
||||
libxkbcommon_la_SOURCES = \
|
||||
XkbCommonInt.h \
|
||||
XKBcommonint.h \
|
||||
ks_tables.h \
|
||||
alloc.c \
|
||||
galloc.c \
|
||||
|
|
|
@ -26,8 +26,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
#include "X11/XkbCommon.h"
|
||||
#include "XkbCommonInt.h"
|
||||
#include "X11/extensions/XKBcommon.h"
|
||||
#include "XKBcommonint.h"
|
||||
#include <X11/X.h>
|
||||
#include <X11/Xdefs.h>
|
||||
#include <X11/extensions/XKB.h>
|
||||
|
|
|
@ -26,8 +26,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
#include "X11/XkbCommon.h"
|
||||
#include "XkbCommonInt.h"
|
||||
#include "X11/extensions/XKBcommon.h"
|
||||
#include "XKBcommonint.h"
|
||||
#include <X11/X.h>
|
||||
#include <X11/Xdefs.h>
|
||||
#include <X11/extensions/XKB.h>
|
||||
|
|
|
@ -30,7 +30,7 @@ authorization from the authors.
|
|||
#endif
|
||||
#include <X11/X.h>
|
||||
#include <X11/keysymdef.h>
|
||||
#include "X11/XkbCommon.h"
|
||||
#include "X11/extensions/XKBcommon.h"
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include <X11/XkbCommon.h>
|
||||
#include "X11/extensions/XKBcommon.h"
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
|
Loading…
Reference in New Issue