kernel32: Renamed the kernel directory to kernel32.

Also get rid of the kernel/messages subdirectory.

configure.ac

@@ -1461,7 +1461,7 @@ AH_TOP([#define __WINE_CONFIG_H])
 
 WINE_CONFIG_EXTRA_DIR(dlls/gdi/enhmfdrv)
 WINE_CONFIG_EXTRA_DIR(dlls/gdi/mfdrv)
-WINE_CONFIG_EXTRA_DIR(dlls/kernel/messages)
+WINE_CONFIG_EXTRA_DIR(dlls/kernel/nls)
 WINE_CONFIG_EXTRA_DIR(dlls/user/resources)
 WINE_CONFIG_EXTRA_DIR(dlls/wineps.drv/data)
 WINE_CONFIG_EXTRA_DIR(include/wine)
@@ -1575,8 +1575,8 @@ dlls/inseng/Makefile
 dlls/iphlpapi/Makefile
 dlls/iphlpapi/tests/Makefile
 dlls/itss/Makefile
-dlls/kernel/Makefile
-dlls/kernel/tests/Makefile
+dlls/kernel32/Makefile
+dlls/kernel32/tests/Makefile
 dlls/localspl/Makefile
 dlls/lz32/Makefile
 dlls/lz32/tests/Makefile

dlls/.gitignore

@@ -18,7 +18,6 @@
 /keyboard.drv16
 /krnl386.exe16
 /libgdi32.def
-/libkernel32.def
 /libuser32.def
 /libwinspool.def
 /lzexpand.dll16
@@ -100,7 +99,7 @@ icmp/libicmp.def
 imagehlp/libimagehlp.def
 imm32/libimm32.def
 iphlpapi/libiphlpapi.def
-kernel/libkernel32.def
+kernel32/libkernel32.def
 lz32/liblz32.def
 mapi32/libmapi32.def
 mlang/libmlang.def

dlls/Makefile.in

@@ -80,7 +80,7 @@ BASEDIRS = \
 	inseng \
 	iphlpapi \
 	itss \
-	kernel \
+	kernel32 \
 	localspl \
 	lz32 \
 	mapi32 \
@@ -227,7 +227,7 @@ TESTSUBDIRS = \
 	hlink/tests \
 	infosoft/tests \
 	iphlpapi/tests \
-	kernel/tests \
+	kernel32/tests \
 	lz32/tests \
 	mapi32/tests \
 	mlang/tests \
@@ -337,7 +337,6 @@ SYMLINKS_SO = \
 	@WIN16_FILES@ \
 	gdi32.dll.so \
 	joystick.drv.so \
-	kernel32.dll.so \
 	user32.dll.so \
 	winealsa.drv.so \
 	winearts.drv.so \
@@ -366,9 +365,6 @@ gdi32.dll.so: gdi/gdi32.dll.so
 joystick.drv.so: winmm/joystick/joystick.drv.so
 	$(RM) $@ && $(LN_S) winmm/joystick/joystick.drv.so $@
 
-kernel32.dll.so: kernel/kernel32.dll.so
-	$(RM) $@ && $(LN_S) kernel/kernel32.dll.so $@
-
 user32.dll.so: user/user32.dll.so
 	$(RM) $@ && $(LN_S) user/user32.dll.so $@
 
@@ -485,7 +481,6 @@ STATIC_IMPLIBEXT = $(IMPLIBEXT:def=def.a)
 
 IMPORT_SYMLINKS = \
 	libgdi32.$(IMPLIBEXT) \
-	libkernel32.$(IMPLIBEXT) \
 	libuser32.$(IMPLIBEXT) \
 	libwinspool.$(IMPLIBEXT)
 
@@ -541,7 +536,7 @@ IMPORT_LIBS = \
 	imagehlp/libimagehlp.$(IMPLIBEXT) \
 	imm32/libimm32.$(IMPLIBEXT) \
 	iphlpapi/libiphlpapi.$(IMPLIBEXT) \
-	kernel/libkernel32.$(IMPLIBEXT) \
+	kernel32/libkernel32.$(IMPLIBEXT) \
 	lz32/liblz32.$(IMPLIBEXT) \
 	mapi32/libmapi32.$(IMPLIBEXT) \
 	mlang/libmlang.$(IMPLIBEXT) \
@@ -749,8 +744,8 @@ imm32/libimm32.$(IMPLIBEXT): imm32/imm32.spec $(WINEBUILD)
 iphlpapi/libiphlpapi.$(IMPLIBEXT): iphlpapi/iphlpapi.spec $(WINEBUILD)
 	@cd iphlpapi && $(MAKE) libiphlpapi.$(IMPLIBEXT)
 
-kernel/libkernel32.$(IMPLIBEXT): kernel/kernel32.spec $(WINEBUILD)
-	@cd kernel && $(MAKE) libkernel32.$(IMPLIBEXT)
+kernel32/libkernel32.$(IMPLIBEXT): kernel32/kernel32.spec $(WINEBUILD)
+	@cd kernel32 && $(MAKE) libkernel32.$(IMPLIBEXT)
 
 lz32/liblz32.$(IMPLIBEXT): lz32/lz32.spec $(WINEBUILD)
 	@cd lz32 && $(MAKE) liblz32.$(IMPLIBEXT)
@@ -971,9 +966,6 @@ wtsapi32/libwtsapi32.$(IMPLIBEXT): wtsapi32/wtsapi32.spec $(WINEBUILD)
 libgdi32.$(IMPLIBEXT): gdi/libgdi32.$(IMPLIBEXT)
 	$(RM) $@ && $(LN_S) gdi/libgdi32.$(IMPLIBEXT) $@
 
-libkernel32.$(IMPLIBEXT): kernel/libkernel32.$(IMPLIBEXT)
-	$(RM) $@ && $(LN_S) kernel/libkernel32.$(IMPLIBEXT) $@
-
 libuser32.$(IMPLIBEXT): user/libuser32.$(IMPLIBEXT)
 	$(RM) $@ && $(LN_S) user/libuser32.$(IMPLIBEXT) $@
 
@@ -987,7 +979,6 @@ $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__install-lib__): $(IMPOR
 
 gdi/gdi32.dll.so: gdi
 winmm/joystick/joystick.drv.so: winmm/joystick
-kernel/kernel32.dll.so: kernel
 user/user32.dll.so: user
 winmm/winealsa/winealsa.drv.so: winmm/winealsa
 winmm/winearts/winearts.drv.so: winmm/winearts

dlls/kernel32/Makefile.in

@@ -90,11 +90,11 @@ RC_SRCS16 = \
 	version16.rc
 
 MC_SRCS = \
-	messages/winerr_enu.mc
+	nls/winerr_enu.mc
 
 EXTRA_OBJS   = relay16asm.o
 
-EXTRASUBDIRS = messages nls
+EXTRASUBDIRS = nls
 
 @MAKE_DLL_RULES@
 

dlls/kernel32/kernel.rc

@@ -18,6 +18,6 @@
 
 #include "locale_rc.rc"
 
-#include "messages/winerr_enu.mc.rc"
+#include "nls/winerr_enu.mc.rc"
 
 #include "version.rc"