X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Ftaglib%2Fwscript;h=a6994d63911f76d46dacb532453573bf1e868579;hb=1bd34a34f77e480e2eae469ea4727893c5f97172;hp=8b15a78ed19b6c32aa0201b18aa7fea0b5943eeb;hpb=3804e3bc497f68d4b68f51794815db3ffe5e7a91;p=ardour.git

diff --git a/libs/taglib/wscript b/libs/taglib/wscript
index 8b15a78ed1..a6994d6391 100644
--- a/libs/taglib/wscript
+++ b/libs/taglib/wscript
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-import autowaf
+from waflib.extras import autowaf as autowaf
 import glob
 import os
 
@@ -17,63 +17,58 @@ APPNAME = 'libtaglib'
 VERSION = LIBTAGLIB_VERSION
 
 # Mandatory variables
-srcdir = '.'
-blddir = 'build'
+top = '.'
+out = 'build'
 
-path_prefix = 'libs/taglib/'
-
-def set_options(opt):
-	autowaf.set_options(opt)
+def options(opt):
+    autowaf.set_options(opt)
 
 def configure(conf):
-	autowaf.configure(conf)
-	conf.check_tool('compiler_cxx')
+    conf.load('compiler_cxx')
+    autowaf.configure(conf)
 
 def build(bld):
-	# Library
-	obj = bld.new_task_gen('cxx', 'shlib')
-	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(path_prefix, '') ]
+    # Library
+    obj = bld(features = 'cxx cxxshlib')
+    sources = bld.path.ant_glob('taglib/*.cpp')
+    sources += bld.path.ant_glob('taglib/flac/*.cpp')
+    sources += bld.path.ant_glob('taglib/mpc/*.cpp')
+    sources += bld.path.ant_glob('taglib/mpeg/*.cpp')
+    sources += bld.path.ant_glob('taglib/mpeg/id3v1/*.cpp')
+    sources += bld.path.ant_glob('taglib/mpeg/id3v2/*.cpp')
+    sources += bld.path.ant_glob('taglib/mpeg/id3v2/frames/*.cpp')
+    sources += bld.path.ant_glob('taglib/ogg/*.cpp')
+    sources += bld.path.ant_glob('taglib/ogg/vorbis/*.cpp')
+    sources += bld.path.ant_glob('taglib/ogg/speex/*.cpp')
+    sources += bld.path.ant_glob('taglib/ogg/flac/*.cpp')
+    sources += bld.path.ant_glob('taglib/trueaudio/*.cpp')
+    sources += bld.path.ant_glob('taglib/wavpack/*.cpp')
+    sources += bld.path.ant_glob('taglib/ape/*.cpp')
+    sources += bld.path.ant_glob('taglib/toolkit/*.cpp')
+    obj.source = sources
 
-	include_dirs = '''
-		taglib
-		taglib/toolkit
-		taglib/flac
-		taglib/ape
-		taglib/mpc
-		taglib/mpeg
-		taglib/mpeg/id3v1
-		taglib/mpeg/id3v2
-		taglib/wavpack
-		taglib/trueaudio
-		taglib/ogg
-		taglib/ogg/vorbis
-		taglib/ogg/speex
-		taglib/ogg/flac
-	'''.split()
-	obj.export_incdirs = ['.', 'taglib', 'taglib/toolkit']
-	obj.includes     = include_dirs
-	obj.name         = 'libtaglib'
-	obj.target       = 'taglib'
-	obj.vnum         = LIBTAGLIB_LIB_VERSION
-	obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    include_dirs = '''
+            taglib
+            taglib/toolkit
+            taglib/flac
+            taglib/ape
+            taglib/mpc
+            taglib/mpeg
+            taglib/mpeg/id3v1
+            taglib/mpeg/id3v2
+            taglib/wavpack
+            taglib/trueaudio
+            taglib/ogg
+            taglib/ogg/vorbis
+            taglib/ogg/speex
+            taglib/ogg/flac
+    '''.split()
+    obj.export_includes = ['.', 'taglib', 'taglib/toolkit']
+    obj.includes     = include_dirs
+    obj.name         = 'libtaglib'
+    obj.target       = 'taglib'
+    obj.vnum         = LIBTAGLIB_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
 
 def shutdown():
-	autowaf.shutdown()
-
+    autowaf.shutdown()