--- a/bakeconf.xml Fri Nov 23 10:33:37 2012 +0100
+++ b/bakeconf.xml Fri Nov 23 11:04:01 2012 +0100
@@ -6,9 +6,9 @@
<attribute name="url" value="http://code.nsnam.org/furbani/ns-3-dce"/>
<attribute name="module_directory" value="dce"/>
</source>
- <depends_on name="readversiondef" optional="False"/>
<depends_on name="ns-3-dev-dce" optional="False"/>
<depends_on name="iperf" optional="True"/>
+ <depends_on name="iperf" optional="ccnx"/>
<build type="waf" objdir="build">
<attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --verbose"/>
<attribute name="post_installation" value="export DCE_PATH=$INSTALLDIR/bin:$INSTALLDIR/bin_dce;export DCE_ROOT=$INSTALLDIR;export LD_LIBRARY_PATH=$INSTALLDIR/lib:$INSTALLDIR/bin:$SRCDIR/../ns-3-dev-dce/build;$INSTALLDIR/bin/ns3test-dce --verbose"/>
@@ -37,6 +37,18 @@
</build>
</module>
+ <module name="ccnx">
+ <source type="archive">
+ <attribute name="url" value="http://www.ccnx.org/releases/ccnx-0.6.2.tar.gz"/>
+ <attribute name="extract_directory" value="ccnx-0.6.2"/>
+ </source>
+ <build type="make" objdir="yes">
+ <attribute name="pre_installation" value="cd $SRCDIR;INSTALL_BASE=$INSTALLDIR ./configure"/>
+ <attribute name="build_arguments" value="MORE_LDLIBS=-pie"/>
+ <attribute name="new_variable" value="INSTALL_BASE=$INSTALLDIR" />
+ </build>
+ </module>
+
<module name="iperf">
<source type="archive">
<attribute name="url" value="http://iperf.fr/download/iperf_2.0.5/iperf-2.0.5-source.tar.gz"/>
@@ -61,15 +73,6 @@
</build>
</module>
- <module name="readversiondef">
- <source type="mercurial">
- <attribute name="url" value="http://code.nsnam.org/mathieu/readversiondef"/>
- </source>
- <build type="make" objdir="yes">
- <attribute name="install_arguments" value="install PREFIX=$INSTALLDIR"/>
- </build>
- </module>
-
<module name="ns-3-dev-dce">
<source type="mercurial">
<attribute name="url" value="http://code.nsnam.org/ns-3-dev"/>