[retro-gtk/wip/aplazas/c-port: 31/34] build: Move C files out of subdirs in retro-gtk

[Adrien Plazas <aplazas src gnome org>]

commit 03d01ce1ee62242b7a07e8a885303564e4b6c2a0
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Tue Sep 26 06:15:41 2017 +0200

    build: Move C files out of subdirs in retro-gtk

 retro-gtk/Makefile.am                         |    8 +++-----
 retro-gtk/retro-core.c                        |    2 +-
 retro-gtk/{input => }/retro-keyboard-key.c    |    0
 retro-gtk/{input => }/retro-keyboard-key.h    |    0
 retro-gtk/{video => }/retro-video-converter.c |    0
 5 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/retro-gtk/Makefile.am b/retro-gtk/Makefile.am
index 2f41301..7b31e4d 100644
--- a/retro-gtk/Makefile.am
+++ b/retro-gtk/Makefile.am
@@ -53,7 +53,6 @@ retro_gtk_public_h_sources = \
        $(NULL)
 
 retro_gtk_private_h_sources = \
-       input/retro-keyboard-key.h \
        libretro-environment.h \
        retro-cairo-display.h \
        retro-controller-iterator-private.h \
@@ -62,6 +61,7 @@ retro_gtk_private_h_sources = \
        retro-disk-control-callback.h \
        retro-game-info.h \
        retro-input-descriptor.h \
+       retro-keyboard-key.h \
        retro-module.h \
        retro-option.h \
        retro-options.h \
@@ -73,8 +73,6 @@ retro_gtk_private_h_sources = \
        $(NULL)
 
 libretro_gtk_la_SOURCES = \
-       input/retro-keyboard-key.c \
-       \
        retro.vala \
        retro-analog-id.c \
        retro-analog-index.c \
@@ -88,6 +86,7 @@ libretro_gtk_la_SOURCES = \
        retro-input-descriptor.c \
        retro-input-device.c \
        retro-joypad-id.c \
+       retro-keyboard-key.c \
        retro-lightgun-id.c \
        retro-log.c \
        retro-main-loop.c \
@@ -102,11 +101,10 @@ libretro_gtk_la_SOURCES = \
        retro-pixel-format.c \
        retro-pointer-id.c \
        retro-rumble-effect.c \
+       retro-video-converter.c \
        retro-video-filter.c \
        retro-core.c \
        retro-environment.c \
-       \
-       video/retro-video-converter.c \
        $(NULL)
 
 libretro_gtk_la_LDFLAGS =
diff --git a/retro-gtk/retro-core.c b/retro-gtk/retro-core.c
index 625d0af..1c72165 100644
--- a/retro-gtk/retro-core.c
+++ b/retro-gtk/retro-core.c
@@ -4,7 +4,7 @@
 
 #include <string.h>
 #include "retro-controller-iterator-private.h"
-#include "input/retro-keyboard-key.h"
+#include "retro-keyboard-key.h"
 
 #define RETRO_CORE_ERROR (retro_core_error_quark ())
 
diff --git a/retro-gtk/input/retro-keyboard-key.c b/retro-gtk/retro-keyboard-key.c
similarity index 100%
rename from retro-gtk/input/retro-keyboard-key.c
rename to retro-gtk/retro-keyboard-key.c
diff --git a/retro-gtk/input/retro-keyboard-key.h b/retro-gtk/retro-keyboard-key.h
similarity index 100%
rename from retro-gtk/input/retro-keyboard-key.h
rename to retro-gtk/retro-keyboard-key.h
diff --git a/retro-gtk/video/retro-video-converter.c b/retro-gtk/retro-video-converter.c
similarity index 100%
rename from retro-gtk/video/retro-video-converter.c
rename to retro-gtk/retro-video-converter.c