cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test for utils/wxrc/Makefile existence and not utils/wxrc which always exists when building in source directory (#9928)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-08-31 16:29:11 +00:00
parent ef6ece2352
commit 98a04b4a2a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.in
View File

@ -12865,13 +12865,13 @@ samples:
(cd samples && $(MAKE) all) (cd samples && $(MAKE) all)
@COND_USE_XRC_1@wxrc: $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__xmldll___depname) $(__xmllib___depname) @COND_USE_XRC_1@wxrc: $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__xmldll___depname) $(__xmllib___depname)
@COND_USE_XRC_1@ (if test -d utils/wxrc ; then cd utils/wxrc && $(MAKE) all ; fi) @COND_USE_XRC_1@ (if test -f utils/wxrc/Makefile ; then cd utils/wxrc && $(MAKE) all ; fi)
@COND_USE_XRC_1@clean-wxrc: @COND_USE_XRC_1@clean-wxrc:
@COND_USE_XRC_1@ (if test -d utils/wxrc ; then cd utils/wxrc && $(MAKE) clean ; fi) @COND_USE_XRC_1@ (if test -f utils/wxrc/Makefile ; then cd utils/wxrc && $(MAKE) clean ; fi)
@COND_USE_XRC_1@install-wxrc: $(__wxrc___depname) @COND_USE_XRC_1@install-wxrc: $(__wxrc___depname)
@COND_USE_XRC_1@ (if test -d utils/wxrc ; then cd utils/wxrc && $(MAKE) install ; fi) @COND_USE_XRC_1@ (if test -f utils/wxrc/Makefile ; then cd utils/wxrc && $(MAKE) install ; fi)
install-wxconfig: install-wxconfig:
$(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(bindir)

6
build/bakefiles/wx.bkl
View File

@ -61,20 +61,20 @@
<depends>xmllib</depends> <depends>xmllib</depends>
<command> <command>
(if test -d utils/wxrc ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all ; fi) (if test -f utils/wxrc/Makefile ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all ; fi)
</command> </command>
</action> </action>
<action id="clean-wxrc" cond="USE_XRC=='1'"> <action id="clean-wxrc" cond="USE_XRC=='1'">
<dependency-of>clean</dependency-of> <dependency-of>clean</dependency-of>
<command> <command>
(if test -d utils/wxrc ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) clean ; fi) (if test -f utils/wxrc/Makefile ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) clean ; fi)
</command> </command>
</action> </action>
<action id="install-wxrc" cond="USE_XRC=='1'"> <action id="install-wxrc" cond="USE_XRC=='1'">
<dependency-of>install</dependency-of> <dependency-of>install</dependency-of>
<depends>wxrc</depends> <depends>wxrc</depends>
<command> <command>
(if test -d utils/wxrc ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) install ; fi) (if test -f utils/wxrc/Makefile ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) install ; fi)
</command> </command>
</action> </action>