ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Force all the tools to be rebuilt before make depend, otherwise make 

will try to do that from the include directory.
This commit is contained in:
Alexandre Julliard 2004-10-07 03:12:44 +00:00
parent 998863bf63
commit 3a3307d4b2
2 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Make.rules.in
View File

@ -169,11 +169,6 @@ $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC) $(RC_BINARIES)
$(MODULE).dbg.c: $(C_SRCS) $(C_SRCS16) $(WINEBUILD) $(MODULE).dbg.c: $(C_SRCS) $(C_SRCS16) $(WINEBUILD)
$(WINEBUILD) $(DEFS) -o $@ --debug -C$(SRCDIR) $(C_SRCS) $(C_SRCS16) $(WINEBUILD) $(DEFS) -o $@ --debug -C$(SRCDIR) $(C_SRCS) $(C_SRCS16)
# Rule to rebuild the tools
$(MAKEDEP):
cd $(TOOLSDIR)/tools && $(MAKE) `basename $@`
# Rules for makefile # Rules for makefile
Makefile: Makefile.in $(TOPSRCDIR)/configure Makefile: Makefile.in $(TOPSRCDIR)/configure
@ -202,10 +197,10 @@ winapi_check:: dummy
# Rules for dependencies # Rules for dependencies
$(SUBDIRS:%=%/__depend__): $(MAKEDEP) dummy $(SUBDIRS:%=%/__depend__): dummy
cd `dirname $@` && $(MAKE) depend cd `dirname $@` && $(MAKE) depend
depend: $(MAKEDEP) $(IDL_SRCS:.idl=.h) $(SUBDIRS:%=%/__depend__) depend: $(IDL_SRCS:.idl=.h) $(SUBDIRS:%=%/__depend__)
$(MAKEDEP) $(INCLUDES) -C$(SRCDIR) $(C_SRCS) $(C_SRCS16) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(IDL_SRCS) $(EXTRA_SRCS) $(MAKEDEP) $(INCLUDES) -C$(SRCDIR) $(C_SRCS) $(C_SRCS16) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(IDL_SRCS) $(EXTRA_SRCS)
.PHONY: depend $(SUBDIRS:%=%/__depend__) .PHONY: depend $(SUBDIRS:%=%/__depend__)

15
Makefile.in
View File

@ -121,20 +121,7 @@ fonts/__install__ loader/__install__ server/__install__: libs tools
programs/__install__: libs tools include/__install__ dlls/__install-lib__ programs/__install__: libs tools include/__install__ dlls/__install-lib__
tools/__install__: tools tools/__install__: tools
# Dependencies rules $(SUBDIRS:%=%/__depend__): tools include
$(SUBDIRS:%=%/__depend__): idl
idl: $(WIDL) dummy
cd include && $(MAKE) all
$(WIDL): $(TOOLSDIR)/libs/libwpp.a $(TOOLSDIR)/libs/libwine_port.a
cd $(TOOLSDIR)/tools/widl && $(MAKE) `basename $@`
$(TOOLSDIR)/libs/libwpp.a $(TOOLSDIR)/libs/libwine_port.a:
cd $(TOOLSDIR)/libs && $(MAKE) `basename $@`
.PHONY: idl
# Test rules # Test rules