summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-09-10 18:26:52 +0000
committerDavid Robillard <d@drobilla.net>2012-09-10 18:26:52 +0000
commit7c8c9b5919dea59e80de091a904462d566f0bc19 (patch)
tree9e0074609c1f004a9cb109cd89f2406af8dba1bb
parente32948349c9efd6f8c266a41636fd09dd8a18b00 (diff)
downloadsuil-7c8c9b5919dea59e80de091a904462d566f0bc19.tar.gz
suil-7c8c9b5919dea59e80de091a904462d566f0bc19.tar.bz2
suil-7c8c9b5919dea59e80de091a904462d566f0bc19.zip
Support building against parallel debuggable libraries via pkg-config.
git-svn-id: http://svn.drobilla.net/lad/trunk/suil@4766 a436a847-0d15-0410-975c-d299462d15a1
-rwxr-xr-xwafbin72589 -> 73083 bytes
-rw-r--r--wscript32
2 files changed, 12 insertions, 20 deletions
diff --git a/waf b/waf
index 3088b02..8eb18a9 100755
--- a/waf
+++ b/waf
Binary files differ
diff --git a/wscript b/wscript
index b74917d..915154d 100644
--- a/wscript
+++ b/wscript
@@ -2,28 +2,21 @@
import os
import subprocess
import sys
-
-from waflib.extras import autowaf as autowaf
import waflib.Options as Options
+import waflib.extras.autowaf as autowaf
-# Version of this package (even if built as a child)
-SUIL_VERSION = '0.6.5'
-SUIL_MAJOR_VERSION = '0'
-
-# Library version (UNIX style major, minor, micro)
+# Library and package version (UNIX style major, minor, micro)
# major increment <=> incompatible changes
# minor increment <=> compatible changes (additions)
# micro increment <=> no interface changes
-# Suil uses the same version number for both library and package
-SUIL_LIB_VERSION = SUIL_VERSION
-
-# Variables for 'waf dist'
-APPNAME = 'suil'
-VERSION = SUIL_VERSION
+SUIL_VERSION = '0.6.5'
+SUIL_MAJOR_VERSION = '0'
-# Mandatory variables
-top = '.'
-out = 'build'
+# Mandatory waf variables
+APPNAME = 'suil' # Package name for waf dist
+VERSION = SUIL_VERSION # Package version for waf dist
+top = '.' # Source directory
+out = 'build' # Build directory
def options(opt):
opt.load('compiler_c')
@@ -86,8 +79,7 @@ def configure(conf):
autowaf.define(conf, 'SUIL_MODULE_PREFIX', 'lib')
autowaf.define(conf, 'SUIL_MODULE_EXT', '.so')
- conf.env.LIB_SUIL = ['suil-%s' % SUIL_MAJOR_VERSION]
-
+ autowaf.set_lib_env(conf, 'suil', SUIL_VERSION)
conf.write_config_header('suil_config.h', remove=False)
autowaf.display_msg(conf, "Gtk2 Support",
@@ -127,7 +119,7 @@ def build(bld):
includes = ['.'],
defines = ['SUIL_SHARED', 'SUIL_INTERNAL'],
name = 'libsuil',
- vnum = SUIL_LIB_VERSION,
+ vnum = SUIL_VERSION,
install_path = '${LIBDIR}',
cflags = cflags,
lib = lib,
@@ -142,7 +134,7 @@ def build(bld):
includes = ['.'],
defines = ['SUIL_INTERNAL'],
name = 'libsuil_static',
- vnum = SUIL_LIB_VERSION,
+ vnum = SUIL_VERSION,
install_path = '${LIBDIR}',
cflags = cflags,
lib = lib,