Module: wine Branch: refs/heads/master Commit: 853d193782055703e316a82ce88e31196839c8ba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=853d193782055703e316a82c...
Author: Alexandre Julliard julliard@winehq.org Date: Sat Jul 29 11:45:24 2006 +0200
Make.rules: Replace RC_TLB by IDL_TLB_SRCS as tlb files can be used for other things than resources.
---
Make.rules.in | 6 +++--- dlls/stdole2.tlb/Makefile.in | 2 +- dlls/stdole32.tlb/Makefile.in | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Make.rules.in b/Make.rules.in index 4facbe5..ee8754b 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -169,7 +169,7 @@ # Rules for resources $(RC_BINARIES): $(BIN2RES) $(RC_BINSRC) $(BIN2RES) -f -o $@ $(SRCDIR)/$(RC_BINSRC)
-$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC) $(RC_BINARIES) $(RC_TLB) +$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC) $(RC_BINARIES) $(IDL_TLB_SRCS:.idl=.tlb)
# Rules for makefile
@@ -221,7 +221,7 @@ # Rules for cleaning testclean:: $(SUBDIRS:%=%/__testclean__)
clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__) - $(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) $(MC_SRCS:.mc=.mc.rc) $(IDL_SRCS:.idl=.h) $(PROGRAMS) $(RC_BINARIES) $(RC_TLB) $(MANPAGES) + $(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) $(MC_SRCS:.mc=.mc.rc) $(IDL_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) $(PROGRAMS) $(RC_BINARIES) $(MANPAGES)
.PHONY: clean testclean $(SUBDIRS:%=%/__clean__) $(SUBDIRS:%=%/__testclean__) $(EXTRASUBDIRS:%=%/__clean__)
@@ -270,7 +270,7 @@ # Misc. rules
$(IDL_SRCS:.idl=.h): $(WIDL)
-$(RC_TLB:.idl=.tlb): $(WIDL) +$(IDL_TLB_SRCS:.idl=.tlb): $(WIDL)
$(SUBDIRS): dummy @cd $@ && $(MAKE) diff --git a/dlls/stdole2.tlb/Makefile.in b/dlls/stdole2.tlb/Makefile.in index d09ab61..802243c 100644 --- a/dlls/stdole2.tlb/Makefile.in +++ b/dlls/stdole2.tlb/Makefile.in @@ -6,7 +6,7 @@ MODULE = stdole2.tlb IMPORTS = kernel32
RC_SRCS = rsrc.rc -RC_TLB = std_ole_v2.tlb +IDL_TLB_SRCS = std_ole_v2.idl
@MAKE_DLL_RULES@
diff --git a/dlls/stdole32.tlb/Makefile.in b/dlls/stdole32.tlb/Makefile.in index 3ca6149..7cd0882 100644 --- a/dlls/stdole32.tlb/Makefile.in +++ b/dlls/stdole32.tlb/Makefile.in @@ -6,7 +6,7 @@ MODULE = stdole32.tlb IMPORTS = kernel32
RC_SRCS = rsrc.rc -RC_TLB = std_ole_v1.tlb +IDL_TLB_SRCS = std_ole_v1.idl
@MAKE_DLL_RULES@