X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fclearlooks-newer%2Fwscript;h=6ef94e3afff6d5e2b2931684d5d21b38fda0b38d;hb=60a045271e7d2236569ab4efb065f4110a7cb4e9;hp=b3ba10c5e2309f29d1585c65b01c977775b0b45d;hpb=4769db412dffcee699116a63fc714f88513fa0c6;p=ardour.git

diff --git a/libs/clearlooks-newer/wscript b/libs/clearlooks-newer/wscript
index b3ba10c5e2..6ef94e3aff 100644
--- a/libs/clearlooks-newer/wscript
+++ b/libs/clearlooks-newer/wscript
@@ -1,22 +1,22 @@
 #!/usr/bin/env python
-import autowaf
+from waflib.extras import autowaf as autowaf
 import os
 import sys
 
-srcdir = '.'
-blddir = 'build'
+top = '.'
+out = 'build'
 
 path_prefix = 'libs/clearlooks-newer'
 
-def set_options(opt):
+def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
+    conf.load('compiler_c')
     autowaf.configure(conf)
-    conf.check_tool('compiler_cc')
 
 def build(bld):
-    obj = bld.new_task_gen('cc', 'shlib')
+    obj = bld(features = 'c cshlib')
     obj.source = '''
     animation.c
     cairo-support.c
@@ -35,13 +35,16 @@ def build(bld):
     obj.target = 'clearlooks'
     obj.uselib = 'GTK'
     obj.includes = '.'
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'engines')
+    autowaf.ensure_visible_symbols (obj, True)
 
     if sys.platform == 'darwin':
         # Bit of a hack: make a symlink to the .dylib that meets GTK's criteria for finding it (namely that the library must be a *.so
         # and that it must reside in a directory called `engines')
-        obj = bld.new_task_gen(target = 'engines', rule = 'mkdir -p ${TGT} && rm -f ${TGT}/libclearlooks.so && ln -s ../libclearlooks.dylib ${TGT}/libclearlooks.so')
-
+        obj = bld(target = 'engines', rule = 'mkdir -p ${TGT} && rm -f ${TGT}/libclearlooks.so && ln -s ../libclearlooks.dylib ${TGT}/libclearlooks.so')
+    else:
+        # this is a hack so that running ./ardev will work, since it sets GTK_PATH to include this dir and GTK will search {thisdir}/engines
+        obj = bld(target = 'engines', rule = 'mkdir -p ${TGT} && rm -f ${TGT}/libclearlooks.so && ln -s ../libclearlooks.so ${TGT}/libclearlooks.so')
 
 def shutdown():
     autowaf.shutdown()