[vlc-commits] msw: collect files in a single directory (fixes #10900)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Mar 20 20:50:09 2014 +0200| [f319b959d1337851812d5f524fd6dd69d1d134d8] | committer: Rémi Denis-Courmont

msw: collect files in a single directory (fixes #10900)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f319b959d1337851812d5f524fd6dd69d1d134d8
---

 modules/video_output/Modules.am                    |   10 +++++-----
 modules/video_output/msw/events.c                  |    2 +-
 modules/{control => video_output/msw}/win32touch.c |    0
 modules/{control => video_output/msw}/win32touch.h |    0
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index 90ff5bd..b116b2f 100644
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -131,7 +131,7 @@ endif
 ### Win32 ###
 libdirect2d_plugin_la_SOURCES = msw/direct2d.c \
 	msw/common.c msw/common.h msw/events.c msw/events.h \
-	../control/win32touch.c ../control/win32touch.h
+	msw/win32touch.c msw/win32touch.h
 libdirect2d_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DMODULE_NAME_IS_direct2d
 libdirect2d_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
@@ -141,7 +141,7 @@ EXTRA_LTLIBRARIES += libdirect2d_plugin.la
 
 libdirect3d_plugin_la_SOURCES = msw/direct3d.c \
 	msw/common.c msw/common.h msw/events.c msw/events.h msw/builtin_shaders.h \
-	../control/win32touch.c ../control/win32touch.h
+	msw/win32touch.c msw/win32touch.h
 libdirect3d_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DMODULE_NAME_IS_direct3d
 libdirect3d_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
@@ -151,7 +151,7 @@ EXTRA_LTLIBRARIES += libdirect3d_plugin.la
 
 libdirectdraw_plugin_la_SOURCES = msw/directx.c \
 	msw/common.c msw/common.h msw/events.c msw/events.h \
-	../control/win32touch.c ../control/win32touch.h
+	msw/win32touch.c msw/win32touch.h
 libdirectdraw_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DMODULE_NAME_IS_directdraw
 libdirectdraw_plugin_la_LIBADD = -luser32 -lgdi32 -lole32 -luuid
@@ -161,7 +161,7 @@ endif
 
 libglwin32_plugin_la_SOURCES = msw/glwin32.c opengl.c opengl.h \
 	msw/common.c msw/common.h msw/events.c msw/events.h \
-	../control/win32touch.c ../control/win32touch.h
+	msw/win32touch.c msw/win32touch.h
 libglwin32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DMODULE_NAME_IS_glwin32
 libglwin32_plugin_la_LIBADD = -lopengl32 -lgdi32 -lole32 -luuid
@@ -171,7 +171,7 @@ EXTRA_LTLIBRARIES += libglwin32_plugin.la
 
 libwingdi_plugin_la_SOURCES = msw/wingdi.c \
 	msw/common.c msw/common.h msw/events.c msw/events.h \
-	../control/win32touch.c ../control/win32touch.h
+	msw/win32touch.c msw/win32touch.h
 libwingdi_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DMODULE_NAME_IS_wingdi
 libwingdi_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
index d91a2a0..a1fe018 100644
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include "../../control/win32touch.h"
+#include "win32touch.h"
 
 #include <vlc_common.h>
 #include <vlc_vout_display.h>
diff --git a/modules/control/win32touch.c b/modules/video_output/msw/win32touch.c
similarity index 100%
rename from modules/control/win32touch.c
rename to modules/video_output/msw/win32touch.c
diff --git a/modules/control/win32touch.h b/modules/video_output/msw/win32touch.h
similarity index 100%
rename from modules/control/win32touch.h
rename to modules/video_output/msw/win32touch.h