Make.rule.in: (resend) Added dlldata support to Make.rules.in

Roy Shea roy at cs.hmc.edu
Thu Oct 18 15:59:00 CDT 2007


This is a resend of:

http://www.winehq.org/pipermail/wine-patches/2007-October/045402.html

with a corrected subject to differentiate this patch from that at:

http://www.winehq.org/pipermail/wine-patches/2007-October/045401.html

Sorry for the confusion,
-Roy "Looking for a hole" Shea


On Thu, Oct 18, 2007 at 01:48:19PM -0700, Roy Shea wrote:
> Expanded depend rule to optionally pass in "-D" option for dlldata.c
> dependency generation.  Added explicit rule for building dlldata.c with
> WIDL.
> 

-------------- next part --------------
 Make.rules.in |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/Make.rules.in b/Make.rules.in
index 757fff5..4c8cf75 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -225,7 +225,12 @@ $(SUBDIRS:%=%/__depend__): dummy
 	@cd `dirname $@` && $(MAKE) depend
 
 depend: $(SUBDIRS:%=%/__depend__) dummy
-	$(MAKEDEP) -C$(SRCDIR) -S$(TOPSRCDIR) -T$(TOPOBJDIR) $(EXTRAINCL) $(DEPEND_SRCS)
+	if test -n "$(DLLDATA_SRCS)" ; \
+	then \
+		$(MAKEDEP) -C$(SRCDIR) -S$(TOPSRCDIR) -T$(TOPOBJDIR) -D"$(DLLDATA_SRCS)" $(EXTRAINCL) $(DEPEND_SRCS); \
+	else \
+		$(MAKEDEP) -C$(SRCDIR) -S$(TOPSRCDIR) -T$(TOPOBJDIR) $(EXTRAINCL) $(DEPEND_SRCS); \
+	fi
 
 .PHONY: depend $(SUBDIRS:%=%/__depend__)
 
@@ -309,6 +314,9 @@ $(MC_SRCS:.mc=.mc.rc): $(WMC)
 
 $(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb): $(WIDL)
 
+dlldata.c:
+	$(WIDL) $(IDLFLAGS) --dlldata-only $(DLLDATA_SRCS:.idl=)
+
 $(SUBDIRS): dummy
 	@cd $@ && $(MAKE)
 


More information about the wine-patches mailing list