Commit de078696 authored by Alexandre Julliard's avatar Alexandre Julliard

Moved winsock implementation to dlls/winsock.

parent bade58f2
...@@ -78,6 +78,7 @@ LIBSUBDIRS = \ ...@@ -78,6 +78,7 @@ LIBSUBDIRS = \
dlls/winmm/midimap \ dlls/winmm/midimap \
dlls/winmm/wavemap \ dlls/winmm/wavemap \
dlls/winmm/wineoss \ dlls/winmm/wineoss \
dlls/winsock \
dlls/winspool \ dlls/winspool \
dlls/wnaspi32 \ dlls/wnaspi32 \
files \ files \
...@@ -192,6 +193,7 @@ LIBOBJS = \ ...@@ -192,6 +193,7 @@ LIBOBJS = \
dlls/winmm/midimap/midimap.drv.o \ dlls/winmm/midimap/midimap.drv.o \
dlls/winmm/wavemap/msacm.drv.o \ dlls/winmm/wavemap/msacm.drv.o \
dlls/winmm/wineoss/wineoss.drv.o \ dlls/winmm/wineoss/wineoss.drv.o \
dlls/winsock/winsock.o \
dlls/winspool/winspool.o \ dlls/winspool/winspool.o \
dlls/wnaspi32/wnaspi32.o \ dlls/wnaspi32/wnaspi32.o \
files/files.o \ files/files.o \
......
...@@ -6122,6 +6122,7 @@ dlls/winmm/mciwave/Makefile ...@@ -6122,6 +6122,7 @@ dlls/winmm/mciwave/Makefile
dlls/winmm/midimap/Makefile dlls/winmm/midimap/Makefile
dlls/winmm/wavemap/Makefile dlls/winmm/wavemap/Makefile
dlls/winmm/wineoss/Makefile dlls/winmm/wineoss/Makefile
dlls/winsock/Makefile
dlls/winspool/Makefile dlls/winspool/Makefile
dlls/wnaspi32/Makefile dlls/wnaspi32/Makefile
documentation/Makefile documentation/Makefile
...@@ -6332,6 +6333,7 @@ dlls/winmm/mciwave/Makefile ...@@ -6332,6 +6333,7 @@ dlls/winmm/mciwave/Makefile
dlls/winmm/midimap/Makefile dlls/winmm/midimap/Makefile
dlls/winmm/wavemap/Makefile dlls/winmm/wavemap/Makefile
dlls/winmm/wineoss/Makefile dlls/winmm/wineoss/Makefile
dlls/winsock/Makefile
dlls/winspool/Makefile dlls/winspool/Makefile
dlls/wnaspi32/Makefile dlls/wnaspi32/Makefile
documentation/Makefile documentation/Makefile
......
...@@ -950,6 +950,7 @@ dlls/winmm/mciwave/Makefile ...@@ -950,6 +950,7 @@ dlls/winmm/mciwave/Makefile
dlls/winmm/midimap/Makefile dlls/winmm/midimap/Makefile
dlls/winmm/wavemap/Makefile dlls/winmm/wavemap/Makefile
dlls/winmm/wineoss/Makefile dlls/winmm/wineoss/Makefile
dlls/winsock/Makefile
dlls/winspool/Makefile dlls/winspool/Makefile
dlls/wnaspi32/Makefile dlls/wnaspi32/Makefile
documentation/Makefile documentation/Makefile
......
...@@ -38,6 +38,7 @@ SUBDIRS = \ ...@@ -38,6 +38,7 @@ SUBDIRS = \
windebug \ windebug \
wing \ wing \
winmm \ winmm \
winsock \
winspool \ winspool \
wnaspi32 wnaspi32
......
Makefile
*.spec.c
*.spec.glue.s
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:
...@@ -20,7 +20,6 @@ SPEC_SRCS = \ ...@@ -20,7 +20,6 @@ SPEC_SRCS = \
toolhelp.spec \ toolhelp.spec \
user.spec \ user.spec \
wineps.spec \ wineps.spec \
winsock.spec \
wprocs.spec wprocs.spec
C_SRCS = \ C_SRCS = \
......
...@@ -26,8 +26,6 @@ C_SRCS = \ ...@@ -26,8 +26,6 @@ C_SRCS = \
tweak.c \ tweak.c \
version.c \ version.c \
w32scomb.c \ w32scomb.c \
winsock.c \
winsock_async.c \
wsprintf.c \ wsprintf.c \
xmalloc.c xmalloc.c
......
...@@ -11,8 +11,7 @@ SPEC_SRCS = \ ...@@ -11,8 +11,7 @@ SPEC_SRCS = \
gdi32.spec \ gdi32.spec \
kernel32.spec \ kernel32.spec \
user32.spec \ user32.spec \
wow32.spec \ wow32.spec
wsock32.spec
C_SRCS = \ C_SRCS = \
builtin32.c \ builtin32.c \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment