--- a/dceConf.xml	Mon Jul 09 16:02:00 2012 +0200
+++ b/dceConf.xml	Wed Jul 18 15:26:45 2012 +0200
@@ -7,10 +7,27 @@
       </source>
        <depends_on name="readversiondef" optional="False"/>
        <depends_on name="ns-3-dev-dce" optional="False"/>
+      <build type="waf" objdir="yes" sourcedir="dce">
+	<attribute name="configure_arguments" value="configure --prefix=`pwd`/../build --verbose"/>
+	<attribute name="post_installation" value="BASEDCE=`pwd`/..;DCE_PATH=$BASEDCE/build/bin_dce:$BASEDCE/build/bin:$BASE/build/bin;DCE_ROOT=$HOME/dce_root:$BASEDCE/build;LD_LIBRARY_PATH=$SAVE_LDLP:`pwd`/../build/lib:`pwd`/build/bin:`pwd`/../build/lib:`pwd`/../../ns-3-dev-dce/build;../build/bin/ns3test-dce --verbose"/>
+      </build>
+    </module>
+
+    <module name="dce-linux">
+      <source type="mercurial" sourcedir="dce1">
+	<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-linux" optional="False"/>
-      <build type="waf" objdir="yes">
-	<attribute name="configure_arguments" value="configure --prefix=`pwd`/../build --enable-kernel-stack=`pwd/../ns-3-linux --verbose"/>
+       <depends_on name="ns-3-dev-dce" optional="False"/>
+
+      <build type="waf" objdir="yes" sourcedir="dce">
+	<attribute name="configure_arguments" value="configure --prefix=`pwd`/../build --enable-kernel-stack=`pwd`/../ns-3-linux --verbose"/>
 	<attribute name="post_installation" value="BASEDCE=`pwd`/..;DCE_PATH=$BASEDCE/build/bin_dce:$BASEDCE/build/bin:$BASE/build/bin;DCE_ROOT=$HOME/dce_root:$BASEDCE/build;LD_LIBRARY_PATH=$SAVE_LDLP:`pwd`/../build/lib:`pwd`/build/bin:`pwd`/../build/lib:`pwd`/../../ns-3-dev-dce/build;../build/bin/ns3test-dce --verbose"/>
+        <attribute name="v_PATH" value="$OBJDIR/../../readversiondef;`pwd`;`pwd`/../build/bin" />
+        <attribute name="v_LD_LIBRARY" value="$OBJDIR/..;`pwd`;`pwd`/../ns-3-dev-dce/build" />
+        <attribute name="v_PKG_CONFIG" value="`pwd`/../ns-3-dev-dce/build/lib/pkgconfig;$OBJDIR/../../ns-3-dev-dce/build/lib/pkgconfig" />
       </build>
     </module>
 
@@ -29,7 +46,7 @@
 	<attribute name="revision" value="49dadc40be43"/>
       </source>
       <build type="waf" objdir="yes">
-	<attribute name="patch" value="../dce-ns3/utils/packet-socket-upgrade-exp.patch"/>
+	<attribute name="patch" value="../dce/utils/packet-socket-upgrade-exp.patch"/>
 	<attribute name="configure_arguments" value="configure --prefix=`pwd`/../build --enable-tests"/>
       </build>
     </module>