bakeconf.xml
changeset 222 8fff0f1298f0
parent 221 ca11e6194e94
child 224 5754d5288c66
--- a/bakeconf.xml	Thu Apr 25 02:35:46 2013 +0200
+++ b/bakeconf.xml	Thu Apr 25 02:42:02 2013 +0200
@@ -716,7 +716,6 @@
       <source type="mercurial">
 	<attribute name="url" value="https://secure.wand.net.nz/mercurial/nsc"/>
       </source>
-      <depends_on name="g++" optional="False"/>
       <!-- problem: scons has no generic command-line support for builddir and installdir -->
       <build type="inline"  classname="NscModuleBuild">
 	<attribute name="supported_os" value="linux;linux2"/>
@@ -756,7 +755,6 @@
 	<attribute name="revision" value="08c391d0660a"/>
       </source>
       <!-- problem: scons has no generic command-line support for builddir and installdir -->
-      <depends_on name="g++" optional="False"/>
       <build type="inline"  classname="NscModuleBuild">
 	<attribute name="supported_os" value="linux;linux2"/>
 	<code>class NscModuleBuild(InlineModuleBuild):
@@ -838,6 +836,7 @@
 	<attribute name="pre_installation" value="cd $SRCDIR;qmake NetAnim.pro or cd $SRCDIR;qmake-qt4 NetAnim.pro or cd $SRCDIR;qmake -spec macx-g++ NetAnim.pro"/>
       </build>
       <depends_on name="qt4" optional="False"/>
+      <depends_on name="g++" optional="False"/>
     </module>
 
    <module name="netanim-3.103">
@@ -849,6 +848,7 @@
         <attribute name="pre_installation" value="cd $SRCDIR;qmake NetAnim.pro or cd $SRCDIR;qmake-qt4 NetAnim.pro or cd $SRCDIR;qmake -spec macx-g++ NetAnim.pro"/>
       </build>
       <depends_on name="qt4" optional="False"/>
+      <depends_on name="g++" optional="False"/>
     </module>
 
   <module name="ns-3-allinone">