[buildj] Adding waf 1.6 support

[Alberto Ruiz <aruiz src gnome org>]

commit 88c28b333d885c34221a4b2ef7798acb294eb145
Author: Alberto Ruiz <aruiz gnome org>
Date:   Wed Sep 29 00:02:19 2010 +0100

    Adding waf 1.6 support

 buildj.py      |   16 ++++++++--------
 extra_tools.py |   38 --------------------------------------
 waf            |  Bin 89767 -> 0 bytes
 waf-1.6p2      |  Bin 0 -> 72778 bytes
 wscript        |    3 +--
 5 files changed, 9 insertions(+), 48 deletions(-)
---
diff --git a/buildj.py b/buildj.py
index e91ea6e..5be4df2 100644
--- a/buildj.py
+++ b/buildj.py
@@ -6,15 +6,15 @@ WAF_TOOLS = {'cc':   'compiler_cc',
              'vala': 'compiler_cc vala'}
 
 # (Tool,Type) -> Waf features map
-FEATURES_MAP = {('cc', 'program'):     'cc cprogram',
-                ('cc', 'sharedlib'):   'cc cshlib',
-                ('cc', 'staticlib'):   'cc cstaticlib',
+FEATURES_MAP = {('cc', 'program'):     'c cprogram',
+                ('cc', 'sharedlib'):   'c cshlib',
+                ('cc', 'staticlib'):   'c cstlib',
                 ('c++', 'program'):    'cxx cprogram',
-                ('c++', 'sharedlib'):  'cxx cshlib',
-                ('c++', 'staticlib'):  'cxx cstaticlib',
-                ('vala', 'program'):   'cc cprogram',
-                ('vala', 'sharedlib'): 'cc cshlib',
-                ('vala', 'staticlib'): 'cc cstaticlib'}
+                ('c++', 'sharedlib'):  'cxxshlib',
+                ('c++', 'staticlib'):  'cxxstlib',
+                ('vala', 'program'):   'c cprogram',
+                ('vala', 'sharedlib'): 'c cshlib',
+                ('vala', 'staticlib'): 'c cstlib'}
 
 CC_TOOLCHAIN = {'ADDR2LINE': 'addr2line',
                 'AS': 'as', 'CC': 'gcc', 'CPP': 'cpp',
diff --git a/waf-1.6p2 b/waf-1.6p2
new file mode 100755
index 0000000..bcd2715
Binary files /dev/null and b/waf-1.6p2 differ
diff --git a/wscript b/wscript
index 48001d3..7a304e3 100644
--- a/wscript
+++ b/wscript
@@ -2,7 +2,6 @@ import os
 import Utils
 import Options
 from buildj import *
-#import extra_tools
 
 APPNAME = None
 VERSION = None
@@ -52,7 +51,7 @@ def set_crosscompile_env (prefix, env={}):
 #TODO: Cache json values? Worth it?
 #TODO: Allow definition of different json filename
 
-def set_options (opt):
+def options (opt):
 	project = parse_project_file ()
 
 	#BuilDj options