From 79692a3fe814eae7f3566ddc14214abf60f793db Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 12 Feb 2004 23:27:59 +0000
Subject: [PATCH] We don't really need subdirectories in dlls/dinput.

---
 configure                                         | 15 ---------------
 configure.ac                                      |  3 ---
 dlls/dinput/Makefile.in                           | 13 ++++---------
 .../dinput/{joystick/linux.c => joystick_linux.c} |  0
 .../linuxinput.c => joystick_linuxinput.c}        |  0
 dlls/dinput/{keyboard/main.c => keyboard.c}       |  0
 dlls/dinput/{mouse/main.c => mouse.c}             |  0
 7 files changed, 4 insertions(+), 27 deletions(-)
 rename dlls/dinput/{joystick/linux.c => joystick_linux.c} (100%)
 rename dlls/dinput/{joystick/linuxinput.c => joystick_linuxinput.c} (100%)
 rename dlls/dinput/{keyboard/main.c => keyboard.c} (100%)
 rename dlls/dinput/{mouse/main.c => mouse.c} (100%)

diff --git a/configure b/configure
index 44e21f1d136..f574eef3cb1 100755
--- a/configure
+++ b/configure
@@ -19076,12 +19076,6 @@ esac
 
           ac_config_commands="$ac_config_commands dlls/ddraw/dsurface"
 
-          ac_config_commands="$ac_config_commands dlls/dinput/joystick"
-
-          ac_config_commands="$ac_config_commands dlls/dinput/keyboard"
-
-          ac_config_commands="$ac_config_commands dlls/dinput/mouse"
-
           ac_config_commands="$ac_config_commands dlls/gdi/enhmfdrv"
 
           ac_config_commands="$ac_config_commands dlls/gdi/mfdrv"
@@ -19865,9 +19859,6 @@ do
   "dlls/ddraw/direct3d" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/direct3d" ;;
   "dlls/ddraw/dpalette" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/dpalette" ;;
   "dlls/ddraw/dsurface" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/dsurface" ;;
-  "dlls/dinput/joystick" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/dinput/joystick" ;;
-  "dlls/dinput/keyboard" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/dinput/keyboard" ;;
-  "dlls/dinput/mouse" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/dinput/mouse" ;;
   "dlls/gdi/enhmfdrv" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/enhmfdrv" ;;
   "dlls/gdi/mfdrv" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/mfdrv" ;;
   "dlls/kernel/messages" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel/messages" ;;
@@ -20670,12 +20661,6 @@ echo "$as_me: creating dlls/ddraw/direct3d" >&6;} && mkdir "dlls/ddraw/direct3d"
 echo "$as_me: creating dlls/ddraw/dpalette" >&6;} && mkdir "dlls/ddraw/dpalette") ;;
     dlls/ddraw/dsurface ) test -d "dlls/ddraw/dsurface" || ({ echo "$as_me:$LINENO: creating dlls/ddraw/dsurface" >&5
 echo "$as_me: creating dlls/ddraw/dsurface" >&6;} && mkdir "dlls/ddraw/dsurface") ;;
-    dlls/dinput/joystick ) test -d "dlls/dinput/joystick" || ({ echo "$as_me:$LINENO: creating dlls/dinput/joystick" >&5
-echo "$as_me: creating dlls/dinput/joystick" >&6;} && mkdir "dlls/dinput/joystick") ;;
-    dlls/dinput/keyboard ) test -d "dlls/dinput/keyboard" || ({ echo "$as_me:$LINENO: creating dlls/dinput/keyboard" >&5
-echo "$as_me: creating dlls/dinput/keyboard" >&6;} && mkdir "dlls/dinput/keyboard") ;;
-    dlls/dinput/mouse ) test -d "dlls/dinput/mouse" || ({ echo "$as_me:$LINENO: creating dlls/dinput/mouse" >&5
-echo "$as_me: creating dlls/dinput/mouse" >&6;} && mkdir "dlls/dinput/mouse") ;;
     dlls/gdi/enhmfdrv ) test -d "dlls/gdi/enhmfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi/enhmfdrv" >&5
 echo "$as_me: creating dlls/gdi/enhmfdrv" >&6;} && mkdir "dlls/gdi/enhmfdrv") ;;
     dlls/gdi/mfdrv ) test -d "dlls/gdi/mfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi/mfdrv" >&5
diff --git a/configure.ac b/configure.ac
index cace3a6f856..3aea035672e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1431,9 +1431,6 @@ WINE_CONFIG_EXTRA_DIR(dlls/ddraw/ddraw)
 WINE_CONFIG_EXTRA_DIR(dlls/ddraw/direct3d)
 WINE_CONFIG_EXTRA_DIR(dlls/ddraw/dpalette)
 WINE_CONFIG_EXTRA_DIR(dlls/ddraw/dsurface)
-WINE_CONFIG_EXTRA_DIR(dlls/dinput/joystick)
-WINE_CONFIG_EXTRA_DIR(dlls/dinput/keyboard)
-WINE_CONFIG_EXTRA_DIR(dlls/dinput/mouse)
 WINE_CONFIG_EXTRA_DIR(dlls/gdi/enhmfdrv)
 WINE_CONFIG_EXTRA_DIR(dlls/gdi/mfdrv)
 WINE_CONFIG_EXTRA_DIR(dlls/kernel/messages)
diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in
index d3c11909c20..5d1533721be 100644
--- a/dlls/dinput/Makefile.in
+++ b/dlls/dinput/Makefile.in
@@ -9,18 +9,13 @@ EXTRALIBS = -ldxguid -luuid
 C_SRCS = \
 	device.c \
 	dinput_main.c \
-	joystick/linux.c \
-	joystick/linuxinput.c \
-	keyboard/main.c \
-	mouse/main.c
+	joystick_linux.c \
+	joystick_linuxinput.c \
+	keyboard.c \
+	mouse.c
 
 RC_SRCS = version.rc
 
-EXTRASUBDIRS = \
-	joystick \
-	keyboard \
-	mouse
-
 @MAKE_DLL_RULES@
 
 ### Dependencies:
diff --git a/dlls/dinput/joystick/linux.c b/dlls/dinput/joystick_linux.c
similarity index 100%
rename from dlls/dinput/joystick/linux.c
rename to dlls/dinput/joystick_linux.c
diff --git a/dlls/dinput/joystick/linuxinput.c b/dlls/dinput/joystick_linuxinput.c
similarity index 100%
rename from dlls/dinput/joystick/linuxinput.c
rename to dlls/dinput/joystick_linuxinput.c
diff --git a/dlls/dinput/keyboard/main.c b/dlls/dinput/keyboard.c
similarity index 100%
rename from dlls/dinput/keyboard/main.c
rename to dlls/dinput/keyboard.c
diff --git a/dlls/dinput/mouse/main.c b/dlls/dinput/mouse.c
similarity index 100%
rename from dlls/dinput/mouse/main.c
rename to dlls/dinput/mouse.c