merge with HEAD
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Mon, 11 Jun 2007 17:47:49 +0200
changeset 754 627d129f300d
parent 753 683626e722bd (current diff)
parent 698 0e3564aa9d31 (diff)
child 755 64403472ab29
merge with HEAD
SConstruct
--- a/AUTHORS	Wed Jun 06 10:54:58 2007 +0200
+++ b/AUTHORS	Mon Jun 11 17:47:49 2007 +0200
@@ -1,5 +1,5 @@
 Raj Bhattarcharjea (raj.b@gatech.edu)
-Gustavo Carneiro (gjcarneiro@gmail.com)
+Gustavo Carneiro (gjc@inescporto.pt, gjcarneiro@gmail.com)
 Craig Dowell (craigdo@ee.washington.edu)
 Tom Henderson (tomhend@u.washington.edu)
 Mathieu Lacage (mathieu.lacage@sophia.inria.fr)
--- a/README	Wed Jun 06 10:54:58 2007 +0200
+++ b/README	Mon Jun 11 17:47:49 2007 +0200
@@ -166,6 +166,5 @@
 familiar with it.
 
 If you have successfully installed mercurial, you can get
-a copy of the development version with the following
-command:
+a copy of the development version with the following command:
 "hg clone http://code.nsnam.org/ns-3-dev"
--- a/SConstruct	Wed Jun 06 10:54:58 2007 +0200
+++ b/SConstruct	Mon Jun 11 17:47:49 2007 +0200
@@ -24,6 +24,27 @@
 ns3.add_extra_dist ('AUTHORS')
 ns3.add_extra_dist ('VERSION')
 
+ns3.add_extra_dist('doc/build-waf.txt')
+ns3.add_extra_dist('ns3/_placeholder_')
+for wscript in [
+    "src/core/wscript",
+    "src/node/wscript",
+    "src/devices/p2p/wscript",
+    "src/common/wscript",
+    "src/applications/wscript",
+    "src/simulator/wscript",
+    "src/internet-node/wscript",
+    "src/wscript",
+    "utils/wscript",
+    "samples/wscript",
+    "examples/wscript",
+    "wscript",
+    ]:
+    ns3.add_extra_dist(wscript)
+ns3.add_extra_dist('waf')
+ns3.add_extra_dist('waf.bat')
+
+
 
 #
 # The Core module