diff options
| author | David Robillard <d@drobilla.net> | 2008-10-02 04:30:24 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-10-02 04:30:24 +0000 |
| commit | 0da0c8f334f441261e8e113c583413a9d9122248 (patch) | |
| tree | 85bec9d45b7206e27164d7a2296b17611847376e | |
| parent | 2c75e89c7b5f2b42597b7d2e6ef49109eca6616c (diff) | |
| download | ingen-0da0c8f334f441261e8e113c583413a9d9122248.tar.gz ingen-0da0c8f334f441261e8e113c583413a9d9122248.tar.bz2 ingen-0da0c8f334f441261e8e113c583413a9d9122248.zip | |
Build against local libraries with uselib_local instead of CFLAGS kludges.
Fix parallel building (because waf knows about lib dependencies now).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1587 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | src/client/wscript | 3 | ||||
| -rw-r--r-- | src/engine/wscript | 3 | ||||
| -rw-r--r-- | src/gui/wscript | 5 | ||||
| -rw-r--r-- | src/ingen/wscript | 3 | ||||
| -rw-r--r-- | src/module/wscript | 3 | ||||
| -rw-r--r-- | src/serialisation/wscript | 3 | ||||
| -rw-r--r-- | src/shared/wscript | 3 |
7 files changed, 15 insertions, 8 deletions
diff --git a/src/client/wscript b/src/client/wscript index 319da3fb..66358799 100644 --- a/src/client/wscript +++ b/src/client/wscript @@ -1,5 +1,6 @@ #!/usr/bin/env python import Params +import autowaf def build(bld): obj = bld.create_obj('cpp', 'shlib') @@ -30,6 +31,6 @@ def build(bld): obj.includes = ['..', '../common'] obj.name = 'libingen_client' obj.target = 'ingen_client' - obj.uselib = 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM SOUP XML2 SIGCPP' obj.inst_dir = 'lib/ingen' + autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM SOUP XML2 SIGCPP') diff --git a/src/engine/wscript b/src/engine/wscript index cd7527c1..33809ab0 100644 --- a/src/engine/wscript +++ b/src/engine/wscript @@ -1,5 +1,6 @@ #!/usr/bin/env python import Params +import autowaf def build(bld): obj = bld.create_obj('cpp', 'shlib') @@ -81,6 +82,6 @@ def build(bld): obj.includes = ['..', '../common', './events'] obj.name = 'libingen_engine' obj.target = 'ingen_engine' - obj.uselib = 'GLIBMM GTHREAD LV2CORE SLV2 JACK LIBLO RAUL REDLANDMM SOUP' obj.inst_dir = 'lib/ingen' + autowaf.use_lib(bld, obj, 'GLIBMM GTHREAD LV2CORE SLV2 JACK LIBLO RAUL REDLANDMM SOUP') diff --git a/src/gui/wscript b/src/gui/wscript index 4965f257..60136171 100644 --- a/src/gui/wscript +++ b/src/gui/wscript @@ -1,5 +1,6 @@ #!/usr/bin/env python import Params +import autowaf def build(bld): obj = bld.create_obj('cpp', 'shlib') @@ -47,7 +48,7 @@ def build(bld): obj.target = 'ingen_gui' obj.inst_dir = 'lib/ingen' obj.uselib_local = 'libingen_shared' - obj.uselib = ''' + autowaf.use_lib(bld, obj, ''' CURL FLOWCANVAS GLADEMM @@ -61,7 +62,7 @@ def build(bld): SLV2 SOUP XML2 - ''' + ''') # GUI runtime files install_files(Params.g_options.datadir, '', 'ingen_gui.glade') diff --git a/src/ingen/wscript b/src/ingen/wscript index f9315bc1..6c791008 100644 --- a/src/ingen/wscript +++ b/src/ingen/wscript @@ -1,4 +1,5 @@ #!/usr/bin/env python +import autowaf def build(bld): obj = bld.create_obj('cpp', 'program') @@ -6,6 +7,6 @@ def build(bld): obj.source = 'main.cpp cmdline.c' obj.includes = ['../common', '../'] obj.defines = 'VERSION=\\\"' + bld.env()['INGEN_VERSION'] + '\\\"' - obj.uselib = 'GTHREAD GLIBMM REDLANDMM RAUL LV2CORE SLV2 INGEN LIBLO' obj.uselib_local = 'libingen_module libingen_shared' + autowaf.use_lib(bld, obj, 'GTHREAD GLIBMM REDLANDMM RAUL LV2CORE SLV2 INGEN LIBLO') diff --git a/src/module/wscript b/src/module/wscript index 5394bed7..e97ceb9a 100644 --- a/src/module/wscript +++ b/src/module/wscript @@ -1,5 +1,6 @@ #!/usr/bin/env python import Params +import autowaf def build(bld): obj = bld.create_obj('cpp', 'shlib') @@ -12,5 +13,5 @@ def build(bld): obj.name = 'libingen_module' obj.target = 'ingen_module' obj.vnum = '0.0.0' - obj.uselib = 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM' + autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM') diff --git a/src/serialisation/wscript b/src/serialisation/wscript index e7c0c0ab..3eeccf25 100644 --- a/src/serialisation/wscript +++ b/src/serialisation/wscript @@ -1,5 +1,6 @@ #!/usr/bin/env python import Params +import autowaf def build(bld): obj = bld.create_obj('cpp', 'shlib') @@ -11,6 +12,6 @@ def build(bld): obj.includes = ['..', '../common'] obj.name = 'libingen_serialisation' obj.target = 'ingen_serialisation' - obj.uselib = 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM' obj.inst_dir = 'lib/ingen' + autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM') diff --git a/src/shared/wscript b/src/shared/wscript index 120208ac..790b703c 100644 --- a/src/shared/wscript +++ b/src/shared/wscript @@ -1,5 +1,6 @@ #!/usr/bin/env python import Params +import autowaf def build(bld): obj = bld.create_obj('cpp', 'shlib') @@ -15,5 +16,5 @@ def build(bld): obj.name = 'libingen_shared' obj.target = 'ingen_shared' obj.vnum = '0.0.0' - obj.uselib = 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM' + autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM') |