Moved winsock implementation to dlls/winsock.

Makefile.in

@@ -78,6 +78,7 @@ LIBSUBDIRS = \
 	dlls/winmm/midimap \
 	dlls/winmm/wavemap \
 	dlls/winmm/wineoss \
+	dlls/winsock \
 	dlls/winspool \
 	dlls/wnaspi32 \
 	files \
@@ -192,6 +193,7 @@ LIBOBJS = \
 	dlls/winmm/midimap/midimap.drv.o \
 	dlls/winmm/wavemap/msacm.drv.o \
 	dlls/winmm/wineoss/wineoss.drv.o \
+	dlls/winsock/winsock.o \
 	dlls/winspool/winspool.o \
 	dlls/wnaspi32/wnaspi32.o \
 	files/files.o \

configure

@@ -6122,6 +6122,7 @@ dlls/winmm/mciwave/Makefile
 dlls/winmm/midimap/Makefile
 dlls/winmm/wavemap/Makefile
 dlls/winmm/wineoss/Makefile
+dlls/winsock/Makefile
 dlls/winspool/Makefile
 dlls/wnaspi32/Makefile
 documentation/Makefile
@@ -6332,6 +6333,7 @@ dlls/winmm/mciwave/Makefile
 dlls/winmm/midimap/Makefile
 dlls/winmm/wavemap/Makefile
 dlls/winmm/wineoss/Makefile
+dlls/winsock/Makefile
 dlls/winspool/Makefile
 dlls/wnaspi32/Makefile
 documentation/Makefile

configure.in

@@ -950,6 +950,7 @@ dlls/winmm/mciwave/Makefile
 dlls/winmm/midimap/Makefile
 dlls/winmm/wavemap/Makefile
 dlls/winmm/wineoss/Makefile
+dlls/winsock/Makefile
 dlls/winspool/Makefile
 dlls/wnaspi32/Makefile
 documentation/Makefile

dlls/Makefile.in

@@ -38,6 +38,7 @@ SUBDIRS = \
 	windebug \
 	wing \
 	winmm \
+	winsock \
 	winspool \
 	wnaspi32
 

dlls/winsock/.cvsignore

@@ -0,0 +1,3 @@
+Makefile
+*.spec.c
+*.spec.glue.s

dlls/winsock/Makefile.in

@@ -0,0 +1,18 @@
+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = winsock
+
+SPEC_SRCS = winsock.spec wsock32.spec
+
+C_SRCS = \
+	async.c \
+	socket.c
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+### Dependencies:

if1632/Makefile.in

@@ -20,7 +20,6 @@ SPEC_SRCS = \
 	toolhelp.spec \
 	user.spec \
 	wineps.spec \
-	winsock.spec \
 	wprocs.spec
 
 C_SRCS = \

misc/Makefile.in

@@ -26,8 +26,6 @@ C_SRCS = \
 	tweak.c \
 	version.c \
 	w32scomb.c \
-	winsock.c \
-	winsock_async.c \
 	wsprintf.c \
 	xmalloc.c
 

relay32/Makefile.in

@@ -11,8 +11,7 @@ SPEC_SRCS = \
 	gdi32.spec \
 	kernel32.spec \
 	user32.spec \
-	wow32.spec \
-	wsock32.spec
+	wow32.spec
 
 C_SRCS = \
 	builtin32.c \