From ef9f4046c9df47385db627044ed75c27f6896e20 Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
Date: Wed, 2 Jun 2010 12:27:53 -0700
Subject: [PATCH] Better 'make' output

Removes 'make all-debug' since it is unnecessary now.
---
 Makefile |  4 ----
 wscript  | 14 +++++++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 3547b43e78..eaf8b5e3f0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,8 @@
 WAF=python tools/waf-light
 
 all:
-	echo $(WAF)
 	@$(WAF) build
 
-all-debug:
-	@$(WAF) -v build
-
 all-progress:
 	@$(WAF) -p build
 
diff --git a/wscript b/wscript
index 6b0b8735e4..c338ad4b68 100644
--- a/wscript
+++ b/wscript
@@ -16,6 +16,7 @@ srcdir = '.'
 blddir = 'build'
 
 
+
 jobs=1
 if os.environ.has_key('JOBS'):
   jobs = int(os.environ['JOBS'])
@@ -237,7 +238,16 @@ def build_v8(bld):
   bld.install_files('${PREFIX}/include/node/', 'deps/v8/include/*.h')
 
 def build(bld):
+  ## This snippet is to show full commands as WAF executes
+  import Build
+  old = Build.BuildContext.exec_command
+  def exec_command(self, cmd, **kw):
+    if isinstance(cmd, list): print(" ".join(cmd))
+    return old(self, cmd, **kw)
+  Build.BuildContext.exec_command = exec_command
+
   Options.options.jobs=jobs
+
   print "DEST_OS: " + bld.env['DEST_OS']
   print "DEST_CPU: " + bld.env['DEST_CPU']
   print "Parallel Jobs: " + str(Options.options.jobs)
@@ -403,14 +413,12 @@ def build(bld):
     src/node_events.h
   """)
 
-  # Only install the man page if it exists. 
+  # Only install the man page if it exists.
   # Do 'make doc install' to build and install it.
   if os.path.exists('doc/node.1'):
     bld.install_files('${PREFIX}/share/man/man1/', 'doc/node.1')
 
   bld.install_files('${PREFIX}/bin/', 'bin/*', chmod=0755)
-
-  # Why am I using two lines? Because WAF SUCKS.
   bld.install_files('${PREFIX}/lib/node/wafadmin', 'tools/wafadmin/*.py')
   bld.install_files('${PREFIX}/lib/node/wafadmin/Tools', 'tools/wafadmin/Tools/*.py')