Start to separate KERNEL out of libwine.

Make.rules.in

@@ -104,6 +104,7 @@ DLLS = \
 	imagehlp \
 	imm32 \
 	joystick.drv \
+	kernel32 \
 	lz32 \
 	mcianim.drv \
 	mciavi.drv \

Makefile.in

@@ -31,6 +31,7 @@ LIBSUBDIRS = \
 	dlls/advapi32 \
 	dlls/crtdll \
 	dlls/display \
+	dlls/kernel \
 	dlls/mouse \
 	dlls/ntdll \
 	files \

configure

@@ -6207,6 +6207,7 @@ dlls/gdi/Makefile
 dlls/icmp/Makefile
 dlls/imagehlp/Makefile
 dlls/imm32/Makefile
+dlls/kernel/Makefile
 dlls/lzexpand/Makefile
 dlls/mouse/Makefile
 dlls/mpr/Makefile
@@ -6441,6 +6442,7 @@ dlls/gdi/Makefile
 dlls/icmp/Makefile
 dlls/imagehlp/Makefile
 dlls/imm32/Makefile
+dlls/kernel/Makefile
 dlls/lzexpand/Makefile
 dlls/mouse/Makefile
 dlls/mpr/Makefile

configure.in

@@ -1001,6 +1001,7 @@ dlls/gdi/Makefile
 dlls/icmp/Makefile
 dlls/imagehlp/Makefile
 dlls/imm32/Makefile
+dlls/kernel/Makefile
 dlls/lzexpand/Makefile
 dlls/mouse/Makefile
 dlls/mpr/Makefile

dlls/Makefile.in

@@ -24,6 +24,7 @@ DLLFILES = \
 	icmp/libicmp.@LIBEXT@ \
 	imagehlp/libimagehlp.@LIBEXT@ \
 	imm32/libimm32.@LIBEXT@ \
+	kernel/libkernel32.@LIBEXT@ \
 	lzexpand/liblz32.@LIBEXT@ \
 	mpr/libmpr.@LIBEXT@ \
 	msacm/libmsacm.@LIBEXT@ \
@@ -72,11 +73,14 @@ DLLFILES = \
 # extra names for dlls containing multiple spec files
 EXTRADLLNAMES = \
 	avifile \
+	comm \
 	commdlg \
 	compobj \
 	ddeml \
+	dispdib \
 	dplay \
 	gdi \
+	kernel \
 	keyboard \
 	lzexpand \
 	mmsystem \
@@ -93,13 +97,17 @@ EXTRADLLNAMES = \
 	shell \
 	shlwapi \
 	storage \
+	system \
+	toolhelp \
 	typelib \
 	user \
 	ver \
 	w32sys \
 	win32s16 \
 	winaspi \
-	winsock
+	winsock \
+	wow32 \
+	wprocs
 
 SUBDIRS = \
 	avifil32 \
@@ -114,6 +122,7 @@ SUBDIRS = \
 	icmp \
 	imagehlp \
 	imm32 \
+	kernel \
 	lzexpand \
 	mpr \
 	msacm \
@@ -182,7 +191,7 @@ libdplayx.@LIBEXT@ libdplay.@LIBEXT@: dplayx/libdplayx.@LIBEXT@
 libdsound.@LIBEXT@: dsound/libdsound.@LIBEXT@
 	$(RM) $@ && $(LN_S) dsound/libdsound.@LIBEXT@ $@
 
-libgdi32.@LIBEXT@ libgdi.@LIBEXT@: gdi/libgdi32.@LIBEXT@
+libgdi32.@LIBEXT@ libgdi.@LIBEXT@ libdispdib.@LIBEXT@: gdi/libgdi32.@LIBEXT@
 	$(RM) $@ && $(LN_S) gdi/libgdi32.@LIBEXT@ $@
 
 libicmp.@LIBEXT@: icmp/libicmp.@LIBEXT@
@@ -194,6 +203,9 @@ libimagehlp.@LIBEXT@: imagehlp/libimagehlp.@LIBEXT@
 libimm32.@LIBEXT@: imm32/libimm32.@LIBEXT@
 	$(RM) $@ && $(LN_S) imm32/libimm32.@LIBEXT@ $@
 
+libkernel32.@LIBEXT@ libwow32.@LIBEXT@ libcomm.@LIBEXT@ libkernel.@LIBEXT@ libsystem.@LIBEXT@ libtoolhelp.@LIBEXT@ libwprocs.@LIBEXT@: kernel/libkernel32.@LIBEXT@
+	$(RM) $@ && $(LN_S) kernel/libkernel32.@LIBEXT@ $@
+
 libjoystick.drv.@LIBEXT@: winmm/joystick/libjoystick.drv.@LIBEXT@
 	$(RM) $@ && $(LN_S) winmm/joystick/libjoystick.drv.@LIBEXT@ $@
 

dlls/kernel/.cvsignore

@@ -0,0 +1,9 @@
+Makefile
+comm.spec.c
+kernel.spec.c
+kernel32.spec.c
+libkernel32.so.1.0
+system.spec.c
+toolhelp.spec.c
+wow32.spec.c
+wprocs.spec.c

dlls/kernel/Makefile.in

@@ -0,0 +1,20 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = kernel32
+SOVERSION = 1.0
+ALTNAMES  = wow32 comm kernel system toolhelp wprocs
+
+SPEC_SRCS = \
+	kernel32.spec \
+	wow32.spec \
+	comm.spec \
+	kernel.spec \
+	system.spec \
+	toolhelp.spec \
+	wprocs.spec
+
+@MAKE_DLL_RULES@
+
+### Dependencies:

if1632/.cvsignore

@@ -1,4 +1,3 @@
-*.spec.c
 Makefile
 call16.s
 thunk.glue.c

if1632/Makefile.in

@@ -5,14 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = if1632
 
-SPEC_SRCS = \
-	comm.spec \
-	dispdib.spec \
-	kernel.spec \
-	system.spec \
-	toolhelp.spec \
-	wprocs.spec
-
 C_SRCS = \
 	builtin.c \
 	dummy.c \

relay32/.cvsignore

@@ -1,4 +1,2 @@
 Makefile
 call32.s
-kernel32.spec.c
-wow32.spec.c

relay32/Makefile.in

@@ -5,10 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = relay32
 
-SPEC_SRCS = \
-	kernel32.spec \
-	wow32.spec
-
 C_SRCS = \
 	builtin32.c \
 	relay386.c \