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

Makefile.in

@@ -387,6 +387,7 @@ ALL_MAKEFILES = \
 	dlls/wined3d/Makefile \
 	dlls/winedos/Makefile \
 	dlls/wineesd.drv/Makefile \
+	dlls/winejack.drv/Makefile \
 	dlls/winejoystick.drv/Makefile \
 	dlls/winemp3.acm/Makefile \
 	dlls/wineps.drv/Makefile \
@@ -396,7 +397,6 @@ ALL_MAKEFILES = \
 	dlls/wininet/tests/Makefile \
 	dlls/winmm/Makefile \
 	dlls/winmm/tests/Makefile \
-	dlls/winmm/winejack/Makefile \
 	dlls/winmm/winenas/Makefile \
 	dlls/winmm/wineoss/Makefile \
 	dlls/winnls32/Makefile \
@@ -713,6 +713,7 @@ dlls/winecrt0/Makefile: dlls/winecrt0/Makefile.in dlls/Makeimplib.rules
 dlls/wined3d/Makefile: dlls/wined3d/Makefile.in dlls/Makedll.rules
 dlls/winedos/Makefile: dlls/winedos/Makefile.in dlls/Makedll.rules
 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/wineps.drv/Makefile: dlls/wineps.drv/Makefile.in dlls/Makedll.rules
@@ -722,7 +723,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/winejack/Makefile: dlls/winmm/winejack/Makefile.in dlls/Makedll.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

configure.ac

@@ -1758,6 +1758,7 @@ dlls/winecrt0/Makefile
 dlls/wined3d/Makefile
 dlls/winedos/Makefile
 dlls/wineesd.drv/Makefile
+dlls/winejack.drv/Makefile
 dlls/winejoystick.drv/Makefile
 dlls/winemp3.acm/Makefile
 dlls/wineps.drv/Makefile
@@ -1767,7 +1768,6 @@ dlls/wininet/Makefile
 dlls/wininet/tests/Makefile
 dlls/winmm/Makefile
 dlls/winmm/tests/Makefile
-dlls/winmm/winejack/Makefile
 dlls/winmm/winenas/Makefile
 dlls/winmm/wineoss/Makefile
 dlls/winnls32/Makefile

dlls/Makefile.in

@@ -188,12 +188,12 @@ BASEDIRS = \
 	winecoreaudio.drv \
 	winedos \
 	wineesd.drv \
+	winejack.drv \
 	winejoystick.drv \
 	winemp3.acm \
 	wineps.drv \
 	wininet \
 	winmm \
-	winmm/winejack \
 	winmm/winenas \
 	winmm/wineoss \
 	winnls32 \
@@ -344,7 +344,6 @@ WIN16_FILES = \
 
 SYMLINKS_SO = \
 	@WIN16_FILES@ \
-	winejack.drv.so \
 	winenas.drv.so \
 	wineoss.drv.so
 
@@ -360,9 +359,6 @@ symlinks: $(BUILDSUBDIRS)
 
 # Map symlink name to the corresponding library
 
-winejack.drv.so: winmm/winejack/winejack.drv.so
-	$(RM) $@ && $(LN_S) winmm/winejack/winejack.drv.so $@
-
 winenas.drv.so: winmm/winenas/winenas.drv.so
 	$(RM) $@ && $(LN_S) winmm/winenas/winenas.drv.so $@
 
@@ -954,7 +950,6 @@ $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__install-lib__): $(IMPOR
 
 # Map library name to the corresponding directory
 
-winmm/winejack/winejack.drv.so: winmm/winejack
 winmm/winenas/winenas.drv.so: winmm/winenas
 winmm/wineoss/wineoss.drv.so: winmm/wineoss
 dxerr8/libdxerr8.a: dxerr8

dlls/winejack.drv/Makefile.in

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