X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=autowaf.py;h=e59c134a4383f5ca8ff6053583ed6df968d46cf2;hb=c7c15fe1bd8c7ffe2275aeb4c6938132b3f909b8;hp=f9b2109806d7041471cd7d97ce7c8e4f28d82c9a;hpb=e4528094c3a82ba8dea38c4afb5bbd3f97003c34;p=ardour.git

diff --git a/autowaf.py b/autowaf.py
index f9b2109806..e59c134a43 100644
--- a/autowaf.py
+++ b/autowaf.py
@@ -81,18 +81,8 @@ def check_header(conf, name, define='', mandatory=False):
 		else:
 			conf.check(header_name=name, mandatory=mandatory)
 
-def check_tool(conf, name):
-	"Check for a tool iff it hasn't been checked for yet"
-	if type(conf.env['AUTOWAF_TOOLS']) != dict:
-		conf.env['AUTOWAF_TOOLS'] = {}
-
-	checked = conf.env['AUTOWAF_TOOLS']
-	if not name in checked:
-		conf.check_tool(name)
-		checked[name] = True
-
 def nameify(name):
-	return name.replace('/', '_').replace('++', 'PP').replace('-', '_')
+	return name.replace('/', '_').replace('++', 'PP').replace('-', '_').replace('.', '_')
 
 def check_pkg(conf, name, **args):
 	if not 'mandatory' in args:
@@ -133,13 +123,14 @@ def configure(conf):
 		conf.env.append_value('CCFLAGS', vals.split())
 		conf.env.append_value('CXXFLAGS', vals.split())
 	conf.line_just = 43
-	check_tool(conf, 'misc')
-	check_tool(conf, 'compiler_cc')
-	check_tool(conf, 'compiler_cxx')
+	conf.check_tool('misc')
+	conf.check_tool('compiler_cc')
+	conf.check_tool('compiler_cxx')
 	conf.env['BUILD_DOCS'] = Options.options.build_docs
 	conf.env['DEBUG'] = Options.options.debug
 	conf.env['STRICT'] = Options.options.strict
 	conf.env['PREFIX'] = os.path.abspath(os.path.expanduser(os.path.normpath(conf.env['PREFIX'])))
+
 	if Options.options.bundle:
 		conf.env['BUNDLE'] = True
 		conf.define('BUNDLE', 1)
@@ -239,7 +230,7 @@ def use_lib(bld, obj, libs):
 			inc_flag = '-iquote ' + os.path.join(abssrcdir, l.lower())
 			for f in ['CCFLAGS', 'CXXFLAGS']:
 				if not inc_flag in bld.env[f]:
-					bld.env.prepend_value(f, inc_flag)
+					bld.env.append_value(f, inc_flag)
 		else:
 			if hasattr(obj, 'uselib'):
 				obj.uselib += ' ' + l
@@ -336,6 +327,7 @@ def build_dox(bld, name, version, srcdir, blddir):
 	}
 	obj.install_path = ''
 	out1 = bld.new_task_gen('command-output')
+	out1.dependencies = [obj]
 	out1.stdout = '/doc/doxygen.out'
 	out1.stdin = '/doc/reference.doxygen' # whatever..
 	out1.command = 'doxygen'