msacm32.drv: Renamed msacm.drv to msacm32.drv, and moved the directory to the top-level.

configure.ac

@@ -1608,6 +1608,7 @@ dlls/mmdevldr.vxd/Makefile
 dlls/monodebg.vxd/Makefile
 dlls/mpr/Makefile
 dlls/mprapi/Makefile
+dlls/msacm32.drv/Makefile
 dlls/msacm32/Makefile
 dlls/msacm32/tests/Makefile
 dlls/msadp32.acm/Makefile
@@ -1723,7 +1724,6 @@ dlls/wininet/tests/Makefile
 dlls/winmm/Makefile
 dlls/winmm/joystick/Makefile
 dlls/winmm/tests/Makefile
-dlls/winmm/wavemap/Makefile
 dlls/winmm/winealsa/Makefile
 dlls/winmm/winearts/Makefile
 dlls/winmm/wineaudioio/Makefile

dlls/Makefile.in

@@ -84,6 +84,7 @@ BASEDIRS = \
 	mpr \
 	mprapi \
 	msacm32 \
+	msacm32.drv \
 	msadp32.acm \
 	mscms \
 	msdmo \
@@ -165,7 +166,6 @@ BASEDIRS = \
 	wininet \
 	winmm \
 	winmm/joystick \
-	winmm/wavemap \
 	winmm/winealsa \
 	winmm/winearts \
 	winmm/wineaudioio \
@@ -270,7 +270,6 @@ SYMLINKS_SO = \
 	gdi32.dll.so \
 	joystick.drv.so \
 	kernel32.dll.so \
-	msacm.drv.so \
 	msisys.ocx.so \
 	user32.dll.so \
 	winealsa.drv.so \
@@ -310,9 +309,6 @@ joystick.drv.so: winmm/joystick/joystick.drv.so
 kernel32.dll.so: kernel/kernel32.dll.so
 	$(RM) $@ && $(LN_S) kernel/kernel32.dll.so $@
 
-msacm.drv.so: winmm/wavemap/msacm.drv.so
-	$(RM) $@ && $(LN_S) winmm/wavemap/msacm.drv.so $@
-
 msisys.ocx.so: msisys/msisys.ocx.so
 	$(RM) $@ && $(LN_S) msisys/msisys.ocx.so $@
 
@@ -922,7 +918,6 @@ ddraw/ddraw.dll.so: ddraw
 gdi/gdi32.dll.so: gdi
 winmm/joystick/joystick.drv.so: winmm/joystick
 kernel/kernel32.dll.so: kernel
-winmm/wavemap/msacm.drv.so: winmm/wavemap
 msisys/msisys.ocx.so: msisys
 user/user32.dll.so: user
 winmm/winealsa/winealsa.drv.so: winmm/winealsa

dlls/winmm/wavemap/Makefile.in → dlls/msacm32.drv/Makefile.in

 TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../../..
+TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = msacm.drv
+MODULE    = msacm32.drv
 IMPORTS   = msacm32 winmm user32 kernel32
 
 C_SRCS = \

dlls/winmm/winemm.h

@@ -29,7 +29,7 @@
 #include "mmddk.h"
 
 #define WINE_DEFAULT_WINMM_DRIVER     "oss"
-#define WINE_DEFAULT_WINMM_MAPPER     "msacm.drv"
+#define WINE_DEFAULT_WINMM_MAPPER     "msacm32.drv"
 #define WINE_DEFAULT_WINMM_MIDI       "midimap.dll"
 
 typedef enum {