Commit 184e7216 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Frediano Ziglio

Move src/keycodemapdb -> subprojects/keycodemapdb

Follow meson build system conventions.

This will allow meson to handle it as a subproject.
Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Frediano Ziglio's avatarFrediano Ziglio <fziglio@redhat.com>
parent c88523f8
Pipeline #19781 passed with stage
in 15 minutes and 35 seconds
[submodule "spice-common"]
path = subprojects/spice-common
url = ../spice-common.git
[submodule "src/keycodemapdb"]
path = src/keycodemapdb
[submodule "keycodemapdb"]
path = subprojects/keycodemapdb
url = https://gitlab.com/keycodemap/keycodemapdb.git
......@@ -38,12 +38,16 @@ spice_gtk_deps = []
spice_acl_deps = []
#
# Spice common subproject
# Set up subprojects
#
spice_common = subproject('spice-common', default_options : ['generate-code=client'])
spice_gtk_config_data.merge_from(spice_common.get_variable('spice_common_config_data'))
spice_glib_deps += spice_common.get_variable('spice_common_client_dep')
subproject('keycodemapdb')
keymapgen = files('subprojects/keycodemapdb/tools/keymap-gen')
keymapcsv = files('subprojects/keycodemapdb/data/keymaps.csv')
#
# check for system headers
#
......
......@@ -63,8 +63,8 @@ GTK_SYMBOLS_LDFLAGS = -export-symbols ${srcdir}/spice-gtk-sym-file
GTK_SYMBOLS_FILE = spice-gtk-sym-file
endif
KEYMAP_GEN = keycodemapdb/tools/keymap-gen
KEYMAP_CSV = keycodemapdb/data/keymaps.csv
KEYMAP_GEN = $(top_srcdir)/subprojects/keycodemapdb/tools/keymap-gen
KEYMAP_CSV = $(top_srcdir)/subprojects/keycodemapdb/data/keymaps.csv
SPICE_COMMON_CPPFLAGS = \
-DSPICE_COMPILATION \
......@@ -471,28 +471,28 @@ spice-widget-enums.h: spice-widget.h
vncdisplaykeymap.c: $(KEYMAPS)
$(KEYMAPS): $(srcdir)/$(KEYMAP_GEN) $(srcdir)/$(KEYMAP_CSV)
$(KEYMAPS): $(KEYMAP_GEN) $(KEYMAP_CSV)
vncdisplaykeymap_xorgevdev2xtkbd.h:
$(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname keymap_xorgevdev2xtkbd code-map $(srcdir)/$(KEYMAP_CSV) xorgevdev xtkbd > $@ || rm $@
$(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname keymap_xorgevdev2xtkbd code-map $(KEYMAP_CSV) xorgevdev xtkbd > $@ || rm $@
vncdisplaykeymap_xorgkbd2xtkbd.h:
$(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname keymap_xorgkbd2xtkbd code-map $(srcdir)/$(KEYMAP_CSV) xorgkbd xtkbd > $@ || rm $@
$(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname keymap_xorgkbd2xtkbd code-map $(KEYMAP_CSV) xorgkbd xtkbd > $@ || rm $@
vncdisplaykeymap_xorgxquartz2xtkbd.h:
$(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname keymap_xorgxquartz2xtkbd code-map $(srcdir)/$(KEYMAP_CSV) xorgxquartz xtkbd > $@ || rm $@
$(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname keymap_xorgxquartz2xtkbd code-map $(KEYMAP_CSV) xorgxquartz xtkbd > $@ || rm $@
vncdisplaykeymap_xorgxwin2xtkbd.h:
$(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname keymap_xorgxwin2xtkbd code-map $(srcdir)/$(KEYMAP_CSV) xorgxwin xtkbd > $@ || rm $@
$(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname keymap_xorgxwin2xtkbd code-map $(KEYMAP_CSV) xorgxwin xtkbd > $@ || rm $@
vncdisplaykeymap_osx2xtkbd.h:
$(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname keymap_osx2xtkbd code-map $(srcdir)/$(KEYMAP_CSV) osx xtkbd > $@ || rm $@
$(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname keymap_osx2xtkbd code-map $(KEYMAP_CSV) osx xtkbd > $@ || rm $@
vncdisplaykeymap_win322xtkbd.h:
$(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname keymap_win322xtkbd code-map $(srcdir)/$(KEYMAP_CSV) win32 xtkbd > $@ || rm $@
$(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname keymap_win322xtkbd code-map $(KEYMAP_CSV) win32 xtkbd > $@ || rm $@
vncdisplaykeymap_x112xtkbd.h:
$(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname keymap_x112xtkbd code-map $(srcdir)/$(KEYMAP_CSV) x11 xtkbd > $@ || rm $@
$(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname keymap_x112xtkbd code-map $(KEYMAP_CSV) x11 xtkbd > $@ || rm $@
-include $(INTROSPECTION_MAKEFILE)
......
Subproject commit 16e5b0787687d8904dad2c026107409eb9bfcb95
......@@ -287,8 +287,6 @@ if spice_gtk_has_gtk
# keymaps
python = import('python').find_installation()
keymapgen = files('./keycodemapdb/tools/keymap-gen')
keymapcsv = files('./keycodemapdb/data/keymaps.csv')
keymaps = ['xorgevdev',
'xorgkbd',
'xorgxquartz',
......
Subproject commit df4e56f8fab65ba714ec18f4e7338a966a1620ad
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment