[gtk-vnc] build: rename included keycodemapdb files to have .h ext
- From: Daniel P. Berrange <dberrange src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-vnc] build: rename included keycodemapdb files to have .h ext
- Date: Tue, 6 Aug 2019 13:38:12 +0000 (UTC)
commit 8e25d1b910479dd662f1de6c77a6d77431e8834f
Author: Daniel P. Berrangé <berrange redhat com>
Date: Mon Aug 5 16:32:21 2019 +0100
build: rename included keycodemapdb files to have .h ext
These files are not headers, they are source that is included from other
source files.
Signed-off-by: Daniel P. Berrangé <berrange redhat com>
src/Makefile.am | 28 ++++++++++++++--------------
src/vncdisplaykeymap.c | 14 +++++++-------
2 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 5c3f6d0..5d81c1f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -179,13 +179,13 @@ KEYMAP_CSV = $(top_srcdir)/subprojects/keycodemapdb/data/keymaps.csv
EXTRA_DIST += $(KEYMAP_CSV) $(KEYMAP_GEN)
KEYMAPS = \
- vncdisplaykeymap_xorgevdev2qnum.c \
- vncdisplaykeymap_xorgkbd2qnum.c \
- vncdisplaykeymap_xorgxquartz2qnum.c \
- vncdisplaykeymap_xorgxwin2qnum.c \
- vncdisplaykeymap_osx2qnum.c \
- vncdisplaykeymap_win322qnum.c \
- vncdisplaykeymap_x112qnum.c
+ vncdisplaykeymap_xorgevdev2qnum.h \
+ vncdisplaykeymap_xorgkbd2qnum.h \
+ vncdisplaykeymap_xorgxquartz2qnum.h \
+ vncdisplaykeymap_xorgxwin2qnum.h \
+ vncdisplaykeymap_osx2qnum.h \
+ vncdisplaykeymap_win322qnum.h \
+ vncdisplaykeymap_x112qnum.h
$(KEYMAPS): $(KEYMAP_GEN) $(KEYMAP_CSV)
BUILT_SOURCES += $(KEYMAPS)
@@ -193,25 +193,25 @@ CLEANFILES = $(KEYMAPS)
vncdisplaykeymap.c: $(KEYMAPS)
-vncdisplaykeymap_xorgevdev2qnum.c:
+vncdisplaykeymap_xorgevdev2qnum.h:
$(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname keymap_xorgevdev2qnum code-map
$(KEYMAP_CSV) xorgevdev qnum > $@ || rm $@
-vncdisplaykeymap_xorgkbd2qnum.c:
+vncdisplaykeymap_xorgkbd2qnum.h:
$(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname keymap_xorgkbd2qnum code-map $(KEYMAP_CSV)
xorgkbd qnum > $@ || rm $@
-vncdisplaykeymap_xorgxquartz2qnum.c:
+vncdisplaykeymap_xorgxquartz2qnum.h:
$(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname keymap_xorgxquartz2qnum code-map
$(KEYMAP_CSV) xorgxquartz qnum > $@ || rm $@
-vncdisplaykeymap_xorgxwin2qnum.c:
+vncdisplaykeymap_xorgxwin2qnum.h:
$(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname keymap_xorgxwin2qnum code-map $(KEYMAP_CSV)
xorgxwin qnum > $@ || rm $@
-vncdisplaykeymap_osx2qnum.c:
+vncdisplaykeymap_osx2qnum.h:
$(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname keymap_osx2qnum code-map $(KEYMAP_CSV) osx
qnum > $@ || rm $@
-vncdisplaykeymap_win322qnum.c:
+vncdisplaykeymap_win322qnum.h:
$(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname keymap_win322qnum code-map $(KEYMAP_CSV)
win32 qnum > $@ || rm $@
-vncdisplaykeymap_x112qnum.c:
+vncdisplaykeymap_x112qnum.h:
$(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname keymap_x112qnum code-map $(KEYMAP_CSV) x11
qnum > $@ || rm $@
vncdisplayenums.c: vncdisplay.h
diff --git a/src/vncdisplaykeymap.c b/src/vncdisplaykeymap.c
index 5c05438..4b31e7d 100644
--- a/src/vncdisplaykeymap.c
+++ b/src/vncdisplaykeymap.c
@@ -39,7 +39,7 @@
#if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WAYLAND)
/* Wayland or Xorg Linux + evdev (offset evdev keycodes) */
-#include "vncdisplaykeymap_xorgevdev2qnum.c"
+#include "vncdisplaykeymap_xorgevdev2qnum.h"
#endif
#ifdef GDK_WINDOWING_X11
@@ -49,11 +49,11 @@
#include <string.h>
/* Xorg Linux + kbd (offset + mangled XT keycodes) */
-#include "vncdisplaykeymap_xorgkbd2qnum.c"
+#include "vncdisplaykeymap_xorgkbd2qnum.h"
/* Xorg OS-X aka XQuartz (offset OS-X keycodes) */
-#include "vncdisplaykeymap_xorgxquartz2qnum.c"
+#include "vncdisplaykeymap_xorgxquartz2qnum.h"
/* Xorg Cygwin aka XWin (offset + mangled XT keycodes) */
-#include "vncdisplaykeymap_xorgxwin2qnum.c"
+#include "vncdisplaykeymap_xorgxwin2qnum.h"
/* Gtk2 compat */
#ifndef GDK_IS_X11_DISPLAY
@@ -63,7 +63,7 @@
#ifdef GDK_WINDOWING_WIN32
/* Win32 native virtual keycodes */
-#include "vncdisplaykeymap_win322qnum.c"
+#include "vncdisplaykeymap_win322qnum.h"
/* Gtk2 compat */
#ifndef GDK_IS_WIN32_DISPLAY
@@ -73,7 +73,7 @@
#ifdef GDK_WINDOWING_BROADWAY
/* X11 keysyms */
-#include "vncdisplaykeymap_x112qnum.c"
+#include "vncdisplaykeymap_x112qnum.h"
/* Gtk2 compat */
#ifndef GDK_IS_BROADWAY_DISPLAY
@@ -84,7 +84,7 @@
#ifdef GDK_WINDOWING_QUARTZ
/* OS-X native keycodes */
-#include "vncdisplaykeymap_osx2qnum.c"
+#include "vncdisplaykeymap_osx2qnum.h"
/* Gtk2 compat */
#ifndef GDK_IS_QUARTZ_DISPLAY
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]