Module: wine Branch: stable Commit: e279c6e2577c8c259d6dda3a1cfb1a7efa5f9db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e279c6e2577c8c259d6dda3a1c...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Jan 18 16:56:02 2011 +0100
makefiles: Generate .res files directly from message files. (cherry picked from commit 9771ad8ca79220b0892c1e1f20cf8dd37804c13f)
---
.gitignore | 16 ---------------- Make.rules.in | 12 ++++++------ tools/make_makefiles | 1 - tools/makedep.c | 2 +- 4 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/.gitignore b/.gitignore index 4dd2cd7..5303a0c 100644 --- a/.gitignore +++ b/.gitignore @@ -53,22 +53,6 @@ dlls/dxdiagn/fil_data.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/libd3dx9.def dlls/libkernel.def dlls/libwinspool.def diff --git a/Make.rules.in b/Make.rules.in index 3f5d18e..2796800 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -117,10 +117,10 @@ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl= $(IDL_P_SRCS:.idl=.h) $(IDL_S_SRCS:.idl=.h)
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) + $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c)
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) + $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS)
CROSSOBJS = $(OBJS:.o=.cross.o) LINTS = $(C_SRCS:.c=.ln) @@ -136,7 +136,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 .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 .cross.o @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp
.c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< @@ -153,8 +153,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) $(RC) $(RCFLAGS) -fo$@ $< @@ -253,7 +253,7 @@ install install-lib install-dev uninstall::
# Misc. rules
-$(MC_SRCS:.mc=.mc.rc): $(WMC) +$(MC_SRCS:.mc=.res): $(WMC)
$(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb): $(WIDL)
diff --git a/tools/make_makefiles b/tools/make_makefiles index 6806edc..5583c68 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -106,7 +106,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 4fb1ac5..1bff4fb 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -857,7 +857,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 */ {