winemp3: Renamed the dlls/msacm/winemp3 directory to dlls/winemp3.acm.

configure.ac

@@ -1539,7 +1539,6 @@ dlls/monodebg.vxd/Makefile
 dlls/mpr/Makefile
 dlls/msacm/Makefile
 dlls/msacm/tests/Makefile
-dlls/msacm/winemp3/Makefile
 dlls/msadp32.acm/Makefile
 dlls/mscms/Makefile
 dlls/mscms/tests/Makefile
@@ -1644,6 +1643,7 @@ dlls/w32skrnl/Makefile
 dlls/winecrt0/Makefile
 dlls/wined3d/Makefile
 dlls/winedos/Makefile
+dlls/winemp3.acm/Makefile
 dlls/wineps/Makefile
 dlls/wininet/Makefile
 dlls/wininet/tests/Makefile

dlls/Makefile.in

@@ -80,7 +80,6 @@ BASEDIRS = \
 	monodebg.vxd \
 	mpr \
 	msacm \
-	msacm/winemp3 \
 	msadp32.acm \
 	mscms \
 	msdmo \
@@ -155,6 +154,7 @@ BASEDIRS = \
 	vwin32.vxd \
 	w32skrnl \
 	winedos \
+	winemp3.acm \
 	wineps \
 	wininet \
 	winmm \
@@ -278,7 +278,6 @@ SYMLINKS_SO = \
 	wineaudioio.drv.so \
 	wineesd.drv.so \
 	winejack.drv.so \
-	winemp3.acm.so \
 	winenas.drv.so \
 	wineoss.drv.so \
 	wineps.drv.so \
@@ -350,9 +349,6 @@ wineesd.drv.so: winmm/wineesd/wineesd.drv.so
 winejack.drv.so: winmm/winejack/winejack.drv.so
 	$(RM) $@ && $(LN_S) winmm/winejack/winejack.drv.so $@
 
-winemp3.acm.so: msacm/winemp3/winemp3.acm.so
-	$(RM) $@ && $(LN_S) msacm/winemp3/winemp3.acm.so $@
-
 winenas.drv.so: winmm/winenas/winenas.drv.so
 	$(RM) $@ && $(LN_S) winmm/winenas/winenas.drv.so $@
 
@@ -1096,7 +1092,7 @@ wined3d/wined3d.dll.so: wined3d
 winedos/winedos.dll.so: winedos
 winmm/wineesd/wineesd.drv.so: winmm/wineesd
 winmm/winejack/winejack.drv.so: winmm/winejack
-msacm/winemp3/winemp3.acm.so: msacm/winemp3
+winemp3.acm/winemp3.acm.so: winemp3.acm
 winmm/winenas/winenas.drv.so: winmm/winenas
 winmm/wineoss/wineoss.drv.so: winmm/wineoss
 wineps/wineps.drv.so: wineps

dlls/winemp3.acm/Makefile.in

@@ -1,5 +1,5 @@
 TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../../..
+TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winemp3.acm