From e8d95c4e7ef0e3934b71f92de02d3f8dc2e6dd5f Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Fri, 18 May 2007 11:13:57 -0700 Subject: [PATCH] Pick up codingstd.txt in dist; point interested waf users to build-waf.txt in the development branch --- SConstruct | 1 + doc/build.txt | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index e6372aac3..5c1c6939b 100644 --- a/SConstruct +++ b/SConstruct @@ -12,6 +12,7 @@ ns3.add_extra_dist(os.path.join('doc', 'main.txt')) ns3.add_extra_dist ('doc/architecture.pdf') ns3.add_extra_dist ('doc/contributing.txt') ns3.add_extra_dist ('doc/build.txt') +ns3.add_extra_dist ('doc/codingstd.txt') ns3.add_extra_dist ('doc/mercurial.txt') ns3.add_extra_dist ('README') ns3.add_extra_dist ('RELEASE_NOTES') diff --git a/doc/build.txt b/doc/build.txt index b23be1e5d..e724529d3 100644 --- a/doc/build.txt +++ b/doc/build.txt @@ -16,8 +16,9 @@ the executable binaries generated link explicitely against the right libraries. This saves you the pain of having to setup environment variables to point to the right libraries. -(Note: An experimental, alternative build system is described -in build-waf.txt) +(Note: An alternative build system (Waf) is being +evaluated in the development branch of ns-3-dev on our server +only (i.e., not in the release tarballs)-- see doc/build-waf.txt) 1) Options ----------