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

configure.ac

@@ -1538,10 +1538,10 @@ dlls/mmdevldr.vxd/Makefile
 dlls/monodebg.vxd/Makefile
 dlls/mpr/Makefile
 dlls/msacm/Makefile
-dlls/msacm/msadp32/Makefile
 dlls/msacm/msg711/Makefile
 dlls/msacm/tests/Makefile
 dlls/msacm/winemp3/Makefile
+dlls/msadp32.acm/Makefile
 dlls/mscms/Makefile
 dlls/mscms/tests/Makefile
 dlls/msdmo/Makefile

dlls/Makefile.in

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

dlls/msadp32.acm/Makefile.in

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