diff options
| author | David Robillard <d@drobilla.net> | 2011-03-15 22:41:56 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-03-15 22:41:56 +0000 |
| commit | 355ce81bf6f4fe1b0c155a1f7420bc0d450a5dfc (patch) | |
| tree | 6dc6766d17a3130834fc99bec2b5f6c5f7f7d7ef /src | |
| parent | 91aa0bcb72b365392a9352d7e82e9dc6058b39a8 (diff) | |
| download | ingen-355ce81bf6f4fe1b0c155a1f7420bc0d450a5dfc.tar.gz ingen-355ce81bf6f4fe1b0c155a1f7420bc0d450a5dfc.tar.bz2 ingen-355ce81bf6f4fe1b0c155a1f7420bc0d450a5dfc.zip | |
Remove autowaf external (broken intermediary revision).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3095 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/wscript | 2 | ||||
| -rw-r--r-- | src/engine/wscript | 10 | ||||
| -rw-r--r-- | src/gui/wscript | 4 | ||||
| -rw-r--r-- | src/ingen/wscript | 2 | ||||
| -rw-r--r-- | src/module/wscript | 2 | ||||
| -rw-r--r-- | src/serialisation/wscript | 2 | ||||
| -rw-r--r-- | src/shared/wscript | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/src/client/wscript b/src/client/wscript index 8a4540d0..a5120d13 100644 --- a/src/client/wscript +++ b/src/client/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf def build(bld): # Headers diff --git a/src/engine/wscript b/src/engine/wscript index 0cbd060c..47a55079 100644 --- a/src/engine/wscript +++ b/src/engine/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf def build(bld): # Headers @@ -59,7 +59,7 @@ def build(bld): internals/Trigger.cpp ''' - if bld.env['HAVE_SLV2'] == 1: + if bld.is_defined('HAVE_SLV2'): core_source += ' LV2Info.cpp LV2Plugin.cpp LV2Node.cpp ' obj = bld(features = 'cxx cxxshlib') @@ -73,7 +73,7 @@ def build(bld): core_libs = 'GLIBMM GTHREAD LV2CORE SLV2 RAUL SORD' autowaf.use_lib(bld, obj, core_libs) - if bld.env['HAVE_SOUP'] == 1: + if bld.is_defined('HAVE_SOUP'): obj = bld(features = 'cxx cxxshlib') obj.source = ''' EventSource.cpp @@ -88,7 +88,7 @@ def build(bld): obj.install_path = '${LIBDIR}' autowaf.use_lib(bld, obj, core_libs + ' SOUP') - if bld.env['HAVE_LIBLO'] == 1: + if bld.is_defined('HAVE_LIBLO'): obj = bld(features = 'cxx cxxshlib') obj.source = ''' EventSource.cpp @@ -104,7 +104,7 @@ def build(bld): obj.install_path = '${LIBDIR}' autowaf.use_lib(bld, obj, core_libs + ' LIBLO') - if bld.env['HAVE_JACK'] == 1: + if bld.is_defined('HAVE_JACK'): obj = bld(features = 'cxx cxxshlib') obj.source = 'JackDriver.cpp ingen_jack.cpp' obj.export_includes = ['.'] diff --git a/src/gui/wscript b/src/gui/wscript index c6cc4e7a..226a0d08 100644 --- a/src/gui/wscript +++ b/src/gui/wscript @@ -1,6 +1,6 @@ #!/usr/bin/env python -import autowaf -import Utils +from waflib.extras import autowaf as autowaf +import waflib.Utils as Utils def build(bld): # Headers diff --git a/src/ingen/wscript b/src/ingen/wscript index 08d793eb..56b1b3dd 100644 --- a/src/ingen/wscript +++ b/src/ingen/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf def build(bld): obj = bld(features = 'c cxx cxxprogram') diff --git a/src/module/wscript b/src/module/wscript index 41cc752b..20ef57ef 100644 --- a/src/module/wscript +++ b/src/module/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf def build(bld): # Headers diff --git a/src/serialisation/wscript b/src/serialisation/wscript index 4e38bed5..54ec7228 100644 --- a/src/serialisation/wscript +++ b/src/serialisation/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf def build(bld): # Headers diff --git a/src/shared/wscript b/src/shared/wscript index 07a851bb..067c1335 100644 --- a/src/shared/wscript +++ b/src/shared/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf def build(bld): # Headers |