From 9771ad8ca79220b0892c1e1f20cf8dd37804c13f Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 18 Jan 2011 16:56:02 +0100
Subject: [PATCH] makefiles: Generate .res files directly from message files.

---
 .gitignore           | 16 ----------------
 Make.rules.in        | 15 +++++++--------
 tools/make_makefiles |  1 -
 tools/makedep.c      |  2 +-
 4 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 87aad300ada..cbc189daaec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,22 +57,6 @@ dlls/jscript/jscript_classes.h
 dlls/jscript/jsglobal.tlb
 dlls/jscript/parser.tab.c
 dlls/jscript/parser.tab.h
-dlls/kernel32/nls/winerr_dan.mc.rc
-dlls/kernel32/nls/winerr_deu.mc.rc
-dlls/kernel32/nls/winerr_enu.mc.rc
-dlls/kernel32/nls/winerr_fra.mc.rc
-dlls/kernel32/nls/winerr_ita.mc.rc
-dlls/kernel32/nls/winerr_jpn.mc.rc
-dlls/kernel32/nls/winerr_kor.mc.rc
-dlls/kernel32/nls/winerr_lth.mc.rc
-dlls/kernel32/nls/winerr_nld.mc.rc
-dlls/kernel32/nls/winerr_nor.mc.rc
-dlls/kernel32/nls/winerr_plk.mc.rc
-dlls/kernel32/nls/winerr_ptb.mc.rc
-dlls/kernel32/nls/winerr_ptg.mc.rc
-dlls/kernel32/nls/winerr_rus.mc.rc
-dlls/kernel32/nls/winerr_sve.mc.rc
-dlls/kernel32/nls/winerr_ukr.mc.rc
 dlls/libd3dcompiler.def
 dlls/libd3dx9.def
 dlls/libkernel.def
diff --git a/Make.rules.in b/Make.rules.in
index f5b245616e7..f44bc55feb2 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -26,11 +26,10 @@ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl=
 
 CLEAN_FILES   = *.o *.a *.so *.ln *.res *.fake *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej *.flc core
 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) $(PO_SRCS:%=rsrc.pot)
+                $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) $(PO_SRCS:%=rsrc.pot)
 
 OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) \
-       $(IDL_R_SRCS:.idl=_r.res) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.mc.res) $(EXTRA_OBJS)
+       $(IDL_R_SRCS:.idl=_r.res) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS)
 
 CROSSOBJS = $(OBJS:.o=.cross.o)
 LINTS  = $(C_SRCS:.c=.ln)
@@ -42,7 +41,7 @@ filter: dummy
 
 # Implicit rules
 
-.SUFFIXES: .mc .rc .mc.rc .res .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c _r.res .cross.o @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp
+.SUFFIXES: .mc .rc .res .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c _r.res .cross.o @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp
 
 .c.o:
 	$(CC) -c $(ALLCFLAGS) -o $@ $<
@@ -59,8 +58,8 @@ filter: dummy
 .l.yy.c:
 	$(FLEX) $(LEXFLAGS) -o$@ $<
 
-.mc.mc.rc:
-	$(LDPATH) $(WMC) -i -U -H /dev/null -o $@ $<
+.mc.res:
+	$(LDPATH) $(WMC) -U -O res -o $@ $<
 
 .rc.res:
 	$(LDPATH) $(WRC) $(RCFLAGS) -o $@ $<
@@ -182,8 +181,8 @@ all: @MAINTAINER_MODE@ $(PO_SRCS:%=rsrc.pot)
 rsrc.pot: $(WRC)
 	$(LDPATH) $(WRC) $(RCFLAGS) -O pot -o $@ $(PO_SRCS)
 
-$(MC_SRCS:.mc=.mc.rc): $(WMC)
-$(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.mc.res): $(WRC)
+$(MC_SRCS:.mc=.res): $(WMC)
+$(RC_SRCS:.rc=.res): $(WRC)
 $(PO_SRCS:.rc=.res): $(ALL_PO_FILES)
 
 # Misc. rules
diff --git a/tools/make_makefiles b/tools/make_makefiles
index 97c8d402054..991ef4b7122 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -109,7 +109,6 @@ my @ignore_srcs = (
     [ 'BISON_SRCS',   '\.y',   '.tab.c' ],
     [ 'BISON_SRCS',   '\.y',   '.tab.h' ],
     [ 'LEX_SRCS',     '\.l',   '.yy.c' ],
-    [ 'MC_SRCS',      '\.mc',  '.mc.rc' ],
     [ 'IDL_TLB_SRCS', '\.idl', '.tlb' ],
     [ 'IDL_H_SRCS',   '\.idl', '.h' ],
     [ 'IDL_C_SRCS',   '\.idl', '.h' ],
diff --git a/tools/makedep.c b/tools/makedep.c
index 27eb1e5b63c..0d592a0ce55 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -858,7 +858,7 @@ static int output_src( FILE *file, INCL_FILE *pFile, int *column )
         }
         else if (!strcmp( ext, "mc" ))  /* message file */
         {
-            *column += fprintf( file, "%s.mc.rc: %s", obj, pFile->filename );
+            *column += fprintf( file, "%s.res: %s", obj, pFile->filename );
         }
         else if (!strcmp( ext, "idl" ))  /* IDL file */
         {
-- 
2.11.4.GIT