From d6cc6ca2c104bbddc35e0f8b5c23f873665ea6b0 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 3 Jul 2009 15:47:43 +0200
Subject: [PATCH] kernel32: Compile .mc files to resources as independent
 files.

---
 Make.rules.in             |  5 +++--
 dlls/kernel32/Makefile.in |  6 +++---
 dlls/kernel32/kernel.rc   | 29 -----------------------------
 3 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 dlls/kernel32/kernel.rc

diff --git a/Make.rules.in b/Make.rules.in
index 7f72099f03f..2b83943117d 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -118,7 +118,8 @@ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl=
 CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:%=dlldata.c) \
                 $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) $(MC_SRCS:.mc=.mc.rc)
 
-OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(RC_SRCS:.rc=.res) $(EXTRA_OBJS)
+OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) \
+       $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.mc.res) $(EXTRA_OBJS)
 
 LINTS  = $(C_SRCS:.c=.ln)
 
@@ -318,7 +319,7 @@ $(MC_SRCS:.mc=.mc.rc): $(WMC)
 
 $(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb): $(WIDL)
 
-$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC)
+$(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.mc.res) $(RC_SRCS16:.rc=.res): $(WRC)
 
 $(SUBDIRS): dummy
 	@cd $@ && $(MAKE)
diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in
index d299df9b8fa..30fddb6d5e4 100644
--- a/dlls/kernel32/Makefile.in
+++ b/dlls/kernel32/Makefile.in
@@ -76,7 +76,9 @@ C_SRCS16 = \
 	registry16.c \
 	toolhelp16.c
 
-RC_SRCS = kernel.rc
+RC_SRCS = \
+	locale_rc.rc \
+	version.rc
 
 RC_SRCS16 = \
 	version16.rc
@@ -95,8 +97,6 @@ EXTRASUBDIRS = nls
 
 @MAKE_DLL_RULES@
 
-kernel.res: $(MC_SRCS:.mc=.mc.rc)
-
 relay16asm.o: $(WINEBUILD)
 	$(WINEBUILD) $(WINEBUILDFLAGS) -o $@ --relay16
 
diff --git a/dlls/kernel32/kernel.rc b/dlls/kernel32/kernel.rc
deleted file mode 100644
index 30d1dcaa8cd..00000000000
--- a/dlls/kernel32/kernel.rc
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2000 Dave Pickles
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "locale_rc.rc"
-
-#include "nls/winerr_deu.mc.rc"
-#include "nls/winerr_enu.mc.rc"
-#include "nls/winerr_fra.mc.rc"
-#include "nls/winerr_kor.mc.rc"
-#include "nls/winerr_nld.mc.rc"
-#include "nls/winerr_nor.mc.rc"
-#include "nls/winerr_plk.mc.rc"
-
-#include "version.rc"
-- 
2.11.4.GIT