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

configure.ac

@@ -1538,7 +1538,6 @@ dlls/mmdevldr.vxd/Makefile
 dlls/monodebg.vxd/Makefile
 dlls/mpr/Makefile
 dlls/msacm/Makefile
-dlls/msacm/msg711/Makefile
 dlls/msacm/tests/Makefile
 dlls/msacm/winemp3/Makefile
 dlls/msadp32.acm/Makefile
@@ -1546,6 +1545,7 @@ dlls/mscms/Makefile
 dlls/mscms/tests/Makefile
 dlls/msdmo/Makefile
 dlls/msftedit/Makefile
+dlls/msg711.acm/Makefile
 dlls/mshtml/Makefile
 dlls/mshtml/tests/Makefile
 dlls/msi/Makefile

dlls/Makefile.in

@@ -80,12 +80,12 @@ BASEDIRS = \
 	monodebg.vxd \
 	mpr \
 	msacm \
-	msacm/msg711 \
 	msacm/winemp3 \
 	msadp32.acm \
 	mscms \
 	msdmo \
 	msftedit \
+	msg711.acm \
 	mshtml \
 	msi \
 	msimg32 \
@@ -269,7 +269,6 @@ SYMLINKS_SO = \
 	mciwave.drv.so \
 	msacm.drv.so \
 	msacm32.dll.so \
-	msg711.acm.so \
 	msisys.ocx.so \
 	riched32.dll.so \
 	twain_32.dll.so \
@@ -324,9 +323,6 @@ msacm.drv.so: winmm/wavemap/msacm.drv.so
 msacm32.dll.so: msacm/msacm32.dll.so
 	$(RM) $@ && $(LN_S) msacm/msacm32.dll.so $@
 
-msg711.acm.so: msacm/msg711/msg711.acm.so
-	$(RM) $@ && $(LN_S) msacm/msg711/msg711.acm.so $@
-
 msisys.ocx.so: msisys/msisys.ocx.so
 	$(RM) $@ && $(LN_S) msisys/msisys.ocx.so $@
 
@@ -1023,7 +1019,7 @@ msadp32.acm/msadp32.acm.so: msadp32.acm
 mscms/mscms.dll.so: mscms
 msdmo/msdmo.dll.so: msdmo
 msftedit/msftedit.dll.so: msftedit
-msacm/msg711/msg711.acm.so: msacm/msg711
+msg711.acm/msg711.acm.so: msg711.acm
 mshtml/mshtml.dll.so: mshtml
 msi/msi.dll.so: msi
 msimg32/msimg32.dll.so: msimg32

dlls/msg711.acm/Makefile.in

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