X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Ftaglib%2Fwscript;h=8b15a78ed19b6c32aa0201b18aa7fea0b5943eeb;hb=3c1e12e7ac2a1cde32e94ca22a656f32bdf5021a;hp=f463ff2ae4b27196b9a11cf9cafe476bd42c1e66;hpb=5fe34018143a49d084a8fcdabf7e66e4fac85026;p=ardour.git

diff --git a/libs/taglib/wscript b/libs/taglib/wscript
index f463ff2ae4..8b15a78ed1 100644
--- a/libs/taglib/wscript
+++ b/libs/taglib/wscript
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 import autowaf
 import glob
+import os
 
 # Version of this package (even if built as a child)
 LIBTAGLIB_VERSION = '0.0.0'
@@ -19,37 +20,37 @@ VERSION = LIBTAGLIB_VERSION
 srcdir = '.'
 blddir = 'build'
 
+path_prefix = 'libs/taglib/'
+
 def set_options(opt):
 	autowaf.set_options(opt)
 
 def configure(conf):
 	autowaf.configure(conf)
-	autowaf.check_tool(conf, 'compiler_cxx')
-	conf.write_config_header('config.h')
+	conf.check_tool('compiler_cxx')
 
 def build(bld):
 	# Library
 	obj = bld.new_task_gen('cxx', 'shlib')
-	prefix = 'libs/taglib/'
-	sources = glob.glob(prefix + 'taglib/*.cpp')
-	sources += glob.glob(prefix + 'libs//taglib/flac/*.cpp')
-	sources += glob.glob(prefix + 'taglib/mpc/*.cpp')
-	sources += glob.glob(prefix + 'taglib/mpeg/*.cpp')
-	sources += glob.glob(prefix + 'taglib/mpeg/id3v1/*.cpp')
-	sources += glob.glob(prefix + 'taglib/mpeg/id3v2/*.cpp')
-	sources += glob.glob(prefix + 'taglib/mpeg/id3v2/frames/*.cpp')
-	sources += glob.glob(prefix + 'taglib/ogg/*.cpp')
-	sources += glob.glob(prefix + 'taglib/ogg/vorbis/*.cpp')
-	sources += glob.glob(prefix + 'taglib/ogg/speex/*.cpp')
-	sources += glob.glob(prefix + 'taglib/ogg/flac/*.cpp')
-	sources += glob.glob(prefix + 'taglib/trueaudio/*.cpp')
-	sources += glob.glob(prefix + 'taglib/wavpack/*.cpp')
-	sources += glob.glob(prefix + 'taglib/ape/*.cpp')
-	sources += glob.glob(prefix + 'taglib/toolkit/*.cpp')
+	sources = glob.glob(path_prefix + 'taglib/*.cpp')
+	sources += glob.glob(path_prefix + 'taglib/flac/*.cpp')
+	sources += glob.glob(path_prefix + 'taglib/mpc/*.cpp')
+	sources += glob.glob(path_prefix + 'taglib/mpeg/*.cpp')
+	sources += glob.glob(path_prefix + 'taglib/mpeg/id3v1/*.cpp')
+	sources += glob.glob(path_prefix + 'taglib/mpeg/id3v2/*.cpp')
+	sources += glob.glob(path_prefix + 'taglib/mpeg/id3v2/frames/*.cpp')
+	sources += glob.glob(path_prefix + 'taglib/ogg/*.cpp')
+	sources += glob.glob(path_prefix + 'taglib/ogg/vorbis/*.cpp')
+	sources += glob.glob(path_prefix + 'taglib/ogg/speex/*.cpp')
+	sources += glob.glob(path_prefix + 'taglib/ogg/flac/*.cpp')
+	sources += glob.glob(path_prefix + 'taglib/trueaudio/*.cpp')
+	sources += glob.glob(path_prefix + 'taglib/wavpack/*.cpp')
+	sources += glob.glob(path_prefix + 'taglib/ape/*.cpp')
+	sources += glob.glob(path_prefix + 'taglib/toolkit/*.cpp')
 	obj.source = []
 	for i in sources:
-		obj.source += [ i.replace(prefix, '') ]
-	
+		obj.source += [ i.replace(path_prefix, '') ]
+
 	include_dirs = '''
 		taglib
 		taglib/toolkit
@@ -66,13 +67,13 @@ def build(bld):
 		taglib/ogg/speex
 		taglib/ogg/flac
 	'''.split()
-	obj.export_incdirs = include_dirs
+	obj.export_incdirs = ['.', 'taglib', 'taglib/toolkit']
 	obj.includes     = include_dirs
 	obj.name         = 'libtaglib'
 	obj.target       = 'taglib'
 	obj.vnum         = LIBTAGLIB_LIB_VERSION
-	obj.install_path = ''
-	
+	obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+
 def shutdown():
 	autowaf.shutdown()