fixed wxrc's dependencies

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2005-03-09 23:01:35 +00:00
parent 54ab3bb8b3
commit 7b3dba4927
2 changed files with 13 additions and 2 deletions

View File

@@ -9426,13 +9426,13 @@ distclean: clean
samples:
(cd samples && $(MAKE) all)
@COND_USE_XRC_1@wxrc:
@COND_USE_XRC_1@wxrc: $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__xmldll___depname) $(__xmllib___depname)
@COND_USE_XRC_1@ (test -d utils/wxrc && cd utils/wxrc && $(MAKE) all) || true
@COND_USE_XRC_1@clean-wxrc:
@COND_USE_XRC_1@ (test -d utils/wxrc && cd utils/wxrc && $(MAKE) clean) || true
@COND_USE_XRC_1@install-wxrc:
@COND_USE_XRC_1@install-wxrc: $(__wxrc___depname)
@COND_USE_XRC_1@ (test -d utils/wxrc && cd utils/wxrc && $(MAKE) install) || true
install-wxconfig:

View File

@@ -50,6 +50,16 @@
conditional and optional subprojects is needed -->
<action id="wxrc" cond="USE_XRC=='1'">
<dependency-of>all</dependency-of>
<!-- some of these are not built in all configurations, <depends>
takes care of ignoring the disabled ones: -->
<depends>monodll</depends>
<depends>monolib</depends>
<depends>basedll</depends>
<depends>baselib</depends>
<depends>xmldll</depends>
<depends>xmllib</depends>
<command>
(test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all) || true
</command>
@@ -62,6 +72,7 @@
</action>
<action id="install-wxrc" cond="USE_XRC=='1'">
<dependency-of>install</dependency-of>
<depends>wxrc</depends>
<command>
(test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) install) || true
</command>