winsock: Renamed the winsock directory to ws2_32.

configure.ac

@@ -1659,8 +1659,6 @@ dlls/winmm/winejack/Makefile
 dlls/winmm/winenas/Makefile
 dlls/winmm/wineoss/Makefile
 dlls/winnls32/Makefile
-dlls/winsock/Makefile
-dlls/winsock/tests/Makefile
 dlls/winspool/Makefile
 dlls/winspool/tests/Makefile
 dlls/wintab32/Makefile
@@ -1668,6 +1666,8 @@ dlls/wintrust/Makefile
 dlls/wldap32/Makefile
 dlls/wnaspi32/Makefile
 dlls/wow32/Makefile
+dlls/ws2_32/Makefile
+dlls/ws2_32/tests/Makefile
 dlls/wsock32/Makefile
 dlls/wtsapi32/Makefile
 dlls/x11drv/Makefile

dlls/.gitignore

@@ -21,7 +21,6 @@ libkernel32.def
 libmsacm32.def
 libmsvfw32.def
 libuser32.def
-libws2_32.def
 lzexpand.dll16
 mmsystem.dll16
 mouse.drv16

dlls/Makefile.in

@@ -169,13 +169,13 @@ BASEDIRS = \
 	winmm/winenas \
 	winmm/wineoss \
 	winnls32 \
-	winsock \
 	winspool \
 	wintab32 \
 	wintrust \
 	wldap32 \
 	wnaspi32 \
 	wow32 \
+	ws2_32 \
 	wsock32 \
 	wtsapi32
 
@@ -1034,8 +1034,8 @@ winaspi.dll16 : wnaspi32.dll.so
 wow32.dll.so: wow32/wow32.dll.so
 	$(RM) $@ && $(LN_S) wow32/wow32.dll.so $@
 
-ws2_32.dll.so: winsock/ws2_32.dll.so
+ws2_32.dll.so: ws2_32/ws2_32.dll.so
-	$(RM) $@ && $(LN_S) winsock/ws2_32.dll.so $@
+	$(RM) $@ && $(LN_S) ws2_32/ws2_32.dll.so $@
 
 winsock.dll16 : ws2_32.dll.so
 	echo "ws2_32.dll" >$@
@@ -1076,7 +1076,6 @@ IMPORT_SYMLINKS = \
 	libmsacm32.$(IMPLIBEXT) \
 	libmsvfw32.$(IMPLIBEXT) \
 	libuser32.$(IMPLIBEXT) \
-	libws2_32.$(IMPLIBEXT) \
 	libdxerr8.a \
 	libdxerr9.a \
 	libdxguid.a \
@@ -1194,7 +1193,7 @@ IMPORT_LIBS = \
 	wldap32/libwldap32.$(IMPLIBEXT) \
 	wnaspi32/libwnaspi32.$(IMPLIBEXT) \
 	wow32/libwow32.$(IMPLIBEXT) \
-	winsock/libws2_32.$(IMPLIBEXT) \
+	ws2_32/libws2_32.$(IMPLIBEXT) \
 	wsock32/libwsock32.$(IMPLIBEXT) \
 	wtsapi32/libwtsapi32.$(IMPLIBEXT)
 
@@ -1524,8 +1523,8 @@ wnaspi32/libwnaspi32.$(IMPLIBEXT): wnaspi32/wnaspi32.spec $(WINEBUILD)
 wow32/libwow32.$(IMPLIBEXT): wow32/wow32.spec $(WINEBUILD)
 	@cd wow32 && $(MAKE) libwow32.$(IMPLIBEXT)
 
-winsock/libws2_32.$(IMPLIBEXT): winsock/ws2_32.spec $(WINEBUILD)
+ws2_32/libws2_32.$(IMPLIBEXT): ws2_32/ws2_32.spec $(WINEBUILD)
-	@cd winsock && $(MAKE) libws2_32.$(IMPLIBEXT)
+	@cd ws2_32 && $(MAKE) libws2_32.$(IMPLIBEXT)
 
 wsock32/libwsock32.$(IMPLIBEXT): wsock32/wsock32.spec $(WINEBUILD)
 	@cd wsock32 && $(MAKE) libwsock32.$(IMPLIBEXT)
@@ -1551,9 +1550,6 @@ libmsvfw32.$(IMPLIBEXT): msvideo/libmsvfw32.$(IMPLIBEXT)
 libuser32.$(IMPLIBEXT): user/libuser32.$(IMPLIBEXT)
 	$(RM) $@ && $(LN_S) user/libuser32.$(IMPLIBEXT) $@
 
-libws2_32.$(IMPLIBEXT): winsock/libws2_32.$(IMPLIBEXT)
-	$(RM) $@ && $(LN_S) winsock/libws2_32.$(IMPLIBEXT) $@
-
 $(BUILDSUBDIRS): $(IMPORT_LIBS)
 $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__install-lib__): $(IMPORT_LIBS)
 
@@ -1727,7 +1723,7 @@ wintrust/wintrust.dll.so: wintrust
 wldap32/wldap32.dll.so: wldap32
 wnaspi32/wnaspi32.dll.so: wnaspi32
 wow32/wow32.dll.so: wow32
-winsock/ws2_32.dll.so: winsock
+ws2_32/ws2_32.dll.so: ws2_32
 wsock32/wsock32.dll.so: wsock32
 wtsapi32/wtsapi32.dll.so: wtsapi32
 dxerr8/libdxerr8.a: dxerr8

programs/winetest/Makefile.in

@@ -189,7 +189,7 @@ winmm_test.exe$(DLLEXT): $(DLLDIR)/winmm/tests/winmm_test.exe$(DLLEXT)
 	cp $(DLLDIR)/winmm/tests/winmm_test.exe$(DLLEXT) $@ && $(STRIP) $@
 winspool.drv_test.exe$(DLLEXT): $(DLLDIR)/winspool/tests/winspool.drv_test.exe$(DLLEXT)
 	cp $(DLLDIR)/winspool/tests/winspool.drv_test.exe$(DLLEXT) $@ && $(STRIP) $@
-ws2_32_test.exe$(DLLEXT): $(DLLDIR)/winsock/tests/ws2_32_test.exe$(DLLEXT)
+ws2_32_test.exe$(DLLEXT): $(DLLDIR)/ws2_32/tests/ws2_32_test.exe$(DLLEXT)
-	cp $(DLLDIR)/winsock/tests/ws2_32_test.exe$(DLLEXT) $@ && $(STRIP) $@
+	cp $(DLLDIR)/ws2_32/tests/ws2_32_test.exe$(DLLEXT) $@ && $(STRIP) $@
 
 ### Dependencies: