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:
@@ -9426,13 +9426,13 @@ distclean: clean
|
|||||||
samples:
|
samples:
|
||||||
(cd samples && $(MAKE) all)
|
(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@ (test -d utils/wxrc && cd utils/wxrc && $(MAKE) all) || true
|
||||||
|
|
||||||
@COND_USE_XRC_1@clean-wxrc:
|
@COND_USE_XRC_1@clean-wxrc:
|
||||||
@COND_USE_XRC_1@ (test -d utils/wxrc && cd utils/wxrc && $(MAKE) clean) || true
|
@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
|
@COND_USE_XRC_1@ (test -d utils/wxrc && cd utils/wxrc && $(MAKE) install) || true
|
||||||
|
|
||||||
install-wxconfig:
|
install-wxconfig:
|
||||||
|
@@ -50,6 +50,16 @@
|
|||||||
conditional and optional subprojects is needed -->
|
conditional and optional subprojects is needed -->
|
||||||
<action id="wxrc" cond="USE_XRC=='1'">
|
<action id="wxrc" cond="USE_XRC=='1'">
|
||||||
<dependency-of>all</dependency-of>
|
<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>
|
<command>
|
||||||
(test -d utils/wxrc && cd utils/wxrc && $(DOLLAR)(MAKE) all) || true
|
(test -d utils/wxrc && cd utils/wxrc && $(DOLLAR)(MAKE) all) || true
|
||||||
</command>
|
</command>
|
||||||
@@ -62,6 +72,7 @@
|
|||||||
</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>
|
||||||
<command>
|
<command>
|
||||||
(test -d utils/wxrc && cd utils/wxrc && $(DOLLAR)(MAKE) install) || true
|
(test -d utils/wxrc && cd utils/wxrc && $(DOLLAR)(MAKE) install) || true
|
||||||
</command>
|
</command>
|
||||||
|
Reference in New Issue
Block a user