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.
-x11includedir = $(includedir)/X11
-x11include_HEADERS = X11/XkbCommon.h
+x11includedir = $(includedir)/extensions/X11
+x11include_HEADERS = X11/extensions/XKBcommon.h
lib_LTLIBRARIES = libxkbcommon.la
libxkbcommon_la_SOURCES = \
- XkbCommonInt.h \
+ XKBcommonint.h \
ks_tables.h \
alloc.c \
galloc.c \
#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>
#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>
#endif
#include <X11/X.h>
#include <X11/keysymdef.h>
-#include "X11/XkbCommon.h"
+#include "X11/extensions/XKBcommon.h"
#include <stdlib.h>
#include <string.h>
-#include <X11/XkbCommon.h>
+#include "X11/extensions/XKBcommon.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>