[gtk-vnc] build: move keycodemapdb submodule

[Daniel P. Berrange <dberrange src gnome org>]

commit cf273e4c34f8f6dc8ab8dfef0e9a269cdfb673d9
Author: Daniel P. Berrangé <berrange redhat com>
Date:   Mon Aug 5 16:31:15 2019 +0100

    build: move keycodemapdb submodule
    
    Move the submodule into the subprojects directory to match what meson
    expects.
    
    Signed-off-by: Daniel P. Berrangé <berrange redhat com>

 .gitmodules                       |  2 +-
 src/Makefile.am                   | 20 ++++++++++----------
 {src => subprojects}/keycodemapdb |  0
 3 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index 4a02907..ea2d9ad 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/keycodemapdb"]
-       path = src/keycodemapdb
+       path = subprojects/keycodemapdb
        url = https://gitlab.com/keycodemap/keycodemapdb.git
diff --git a/src/Makefile.am b/src/Makefile.am
index 6bd08b3..5c3f6d0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -173,8 +173,8 @@ nodist_libgtk_vnc_2_0_la_SOURCES = $(nodist_gtk_vnc_SOURCES)
 nodist_libgtk_vnc_2_0_la_HEADERS = $(nodist_gtk_vnc_HDRS)
 
 
-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
 
 EXTRA_DIST += $(KEYMAP_CSV) $(KEYMAP_GEN)
 
@@ -187,32 +187,32 @@ KEYMAPS = \
        vncdisplaykeymap_win322qnum.c \
        vncdisplaykeymap_x112qnum.c
 
-$(KEYMAPS): $(srcdir)/$(KEYMAP_GEN) $(srcdir)/$(KEYMAP_CSV)
+$(KEYMAPS): $(KEYMAP_GEN) $(KEYMAP_CSV)
 BUILT_SOURCES += $(KEYMAPS)
 CLEANFILES = $(KEYMAPS)
 
 vncdisplaykeymap.c: $(KEYMAPS)
 
 vncdisplaykeymap_xorgevdev2qnum.c:
-       $(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname keymap_xorgevdev2qnum code-map 
$(srcdir)/$(KEYMAP_CSV) xorgevdev qnum > $@ || rm $@
+       $(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname keymap_xorgevdev2qnum code-map 
$(KEYMAP_CSV) xorgevdev qnum > $@ || rm $@
 
 vncdisplaykeymap_xorgkbd2qnum.c:
-       $(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname keymap_xorgkbd2qnum code-map 
$(srcdir)/$(KEYMAP_CSV) xorgkbd qnum > $@ || rm $@
+       $(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname keymap_xorgkbd2qnum code-map $(KEYMAP_CSV) 
xorgkbd qnum > $@ || rm $@
 
 vncdisplaykeymap_xorgxquartz2qnum.c:
-       $(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname keymap_xorgxquartz2qnum code-map 
$(srcdir)/$(KEYMAP_CSV) xorgxquartz qnum > $@ || rm $@
+       $(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname keymap_xorgxquartz2qnum code-map 
$(KEYMAP_CSV) xorgxquartz qnum > $@ || rm $@
 
 vncdisplaykeymap_xorgxwin2qnum.c:
-       $(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname keymap_xorgxwin2qnum code-map 
$(srcdir)/$(KEYMAP_CSV) xorgxwin qnum > $@ || rm $@
+       $(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname keymap_xorgxwin2qnum code-map $(KEYMAP_CSV) 
xorgxwin qnum > $@ || rm $@
 
 vncdisplaykeymap_osx2qnum.c:
-       $(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname keymap_osx2qnum code-map 
$(srcdir)/$(KEYMAP_CSV) osx qnum > $@ || rm $@
+       $(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname keymap_osx2qnum code-map $(KEYMAP_CSV) osx 
qnum > $@ || rm $@
 
 vncdisplaykeymap_win322qnum.c:
-       $(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname keymap_win322qnum code-map 
$(srcdir)/$(KEYMAP_CSV) win32 qnum > $@ || rm $@
+       $(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname keymap_win322qnum code-map $(KEYMAP_CSV) 
win32 qnum > $@ || rm $@
 
 vncdisplaykeymap_x112qnum.c:
-       $(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname keymap_x112qnum code-map 
$(srcdir)/$(KEYMAP_CSV) x11 qnum > $@ || rm $@
+       $(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname keymap_x112qnum code-map $(KEYMAP_CSV) x11 
qnum > $@ || rm $@
 
 vncdisplayenums.c: vncdisplay.h
        $(AM_V_GEN)glib-mkenums    --fhead "#include <glib-object.h>\n" \
diff --git a/src/keycodemapdb b/subprojects/keycodemapdb
similarity index 100%
rename from src/keycodemapdb
rename to subprojects/keycodemapdb