winenas: Renamed the dlls/winmm/winenas directory to dlls/winenas.drv.

Makefile.in

@@ -390,6 +390,7 @@ ALL_MAKEFILES = \
 	dlls/winejack.drv/Makefile \
 	dlls/winejoystick.drv/Makefile \
 	dlls/winemp3.acm/Makefile \
+	dlls/winenas.drv/Makefile \
 	dlls/wineps.drv/Makefile \
 	dlls/winequartz.drv/Makefile \
 	dlls/winex11.drv/Makefile \
@@ -397,7 +398,6 @@ ALL_MAKEFILES = \
 	dlls/wininet/tests/Makefile \
 	dlls/winmm/Makefile \
 	dlls/winmm/tests/Makefile \
-	dlls/winmm/winenas/Makefile \
 	dlls/winmm/wineoss/Makefile \
 	dlls/winnls32/Makefile \
 	dlls/winspool.drv/Makefile \
@@ -716,6 +716,7 @@ dlls/wineesd.drv/Makefile: dlls/wineesd.drv/Makefile.in dlls/Makedll.rules
 dlls/winejack.drv/Makefile: dlls/winejack.drv/Makefile.in dlls/Makedll.rules
 dlls/winejoystick.drv/Makefile: dlls/winejoystick.drv/Makefile.in dlls/Makedll.rules
 dlls/winemp3.acm/Makefile: dlls/winemp3.acm/Makefile.in dlls/Makedll.rules
+dlls/winenas.drv/Makefile: dlls/winenas.drv/Makefile.in dlls/Makedll.rules
 dlls/wineps.drv/Makefile: dlls/wineps.drv/Makefile.in dlls/Makedll.rules
 dlls/winequartz.drv/Makefile: dlls/winequartz.drv/Makefile.in dlls/Makedll.rules
 dlls/winex11.drv/Makefile: dlls/winex11.drv/Makefile.in dlls/Makedll.rules
@@ -723,7 +724,6 @@ dlls/wininet/Makefile: dlls/wininet/Makefile.in dlls/Makedll.rules
 dlls/wininet/tests/Makefile: dlls/wininet/tests/Makefile.in dlls/Maketest.rules
 dlls/winmm/Makefile: dlls/winmm/Makefile.in dlls/Makedll.rules
 dlls/winmm/tests/Makefile: dlls/winmm/tests/Makefile.in dlls/Maketest.rules
-dlls/winmm/winenas/Makefile: dlls/winmm/winenas/Makefile.in dlls/Makedll.rules
 dlls/winmm/wineoss/Makefile: dlls/winmm/wineoss/Makefile.in dlls/Makedll.rules
 dlls/winnls32/Makefile: dlls/winnls32/Makefile.in dlls/Makedll.rules
 dlls/winspool.drv/Makefile: dlls/winspool.drv/Makefile.in dlls/Makedll.rules

configure.ac

@@ -1761,6 +1761,7 @@ dlls/wineesd.drv/Makefile
 dlls/winejack.drv/Makefile
 dlls/winejoystick.drv/Makefile
 dlls/winemp3.acm/Makefile
+dlls/winenas.drv/Makefile
 dlls/wineps.drv/Makefile
 dlls/winequartz.drv/Makefile
 dlls/winex11.drv/Makefile
@@ -1768,7 +1769,6 @@ dlls/wininet/Makefile
 dlls/wininet/tests/Makefile
 dlls/winmm/Makefile
 dlls/winmm/tests/Makefile
-dlls/winmm/winenas/Makefile
 dlls/winmm/wineoss/Makefile
 dlls/winnls32/Makefile
 dlls/winspool.drv/Makefile

dlls/Makefile.in

@@ -191,10 +191,10 @@ BASEDIRS = \
 	winejack.drv \
 	winejoystick.drv \
 	winemp3.acm \
+	winenas.drv \
 	wineps.drv \
 	wininet \
 	winmm \
-	winmm/winenas \
 	winmm/wineoss \
 	winnls32 \
 	winspool.drv \
@@ -344,7 +344,6 @@ WIN16_FILES = \
 
 SYMLINKS_SO = \
 	@WIN16_FILES@ \
-	winenas.drv.so \
 	wineoss.drv.so
 
 # Main target
@@ -359,9 +358,6 @@ symlinks: $(BUILDSUBDIRS)
 
 # Map symlink name to the corresponding library
 
-winenas.drv.so: winmm/winenas/winenas.drv.so
-	$(RM) $@ && $(LN_S) winmm/winenas/winenas.drv.so $@
-
 wineoss.drv.so: winmm/wineoss/wineoss.drv.so
 	$(RM) $@ && $(LN_S) winmm/wineoss/wineoss.drv.so $@
 
@@ -950,7 +946,6 @@ $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__install-lib__): $(IMPOR
 
 # Map library name to the corresponding directory
 
-winmm/winenas/winenas.drv.so: winmm/winenas
 winmm/wineoss/wineoss.drv.so: winmm/wineoss
 dxerr8/libdxerr8.a: dxerr8
 dxerr9/libdxerr9.a: dxerr9

dlls/winenas.drv/Makefile.in

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