summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-04-28 20:45:30 +0000
committerDavid Robillard <d@drobilla.net>2011-04-28 20:45:30 +0000
commitf93a5981436c231de688a8342d52948d59ae8ce2 (patch)
tree7b134b3004d7b456514965d760cb5c8fb9c3b30c
parentc9e107258772bced1ccce15574d05ac4e4ddfdf8 (diff)
downloadsuil-f93a5981436c231de688a8342d52948d59ae8ce2.tar.gz
suil-f93a5981436c231de688a8342d52948d59ae8ce2.tar.bz2
suil-f93a5981436c231de688a8342d52948d59ae8ce2.zip
Support parallel installation of different major versions
git-svn-id: http://svn.drobilla.net/lad/trunk/suil@3214 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--suil.pc.in6
-rwxr-xr-xwafbin87718 -> 87343 bytes
-rw-r--r--wscript11
3 files changed, 10 insertions, 7 deletions
diff --git a/suil.pc.in b/suil.pc.in
index 683b340..bf64c5c 100644
--- a/suil.pc.in
+++ b/suil.pc.in
@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-Name: libsuil
+Name: Suil
Version: @SUIL_VERSION@
Description: LV2 plugin UI hosting library
-Libs: -L${libdir} -lsuil
-Cflags: -I${includedir}
+Libs: -L${libdir} -lsuil-@SUIL_MAJOR_VERSION@
+Cflags: -I${includedir}/suil-@SUIL_MAJOR_VERSION@
diff --git a/waf b/waf
index 86ffb67..0b6e94c 100755
--- a/waf
+++ b/waf
Binary files differ
diff --git a/wscript b/wscript
index 638ce0a..041563b 100644
--- a/wscript
+++ b/wscript
@@ -7,7 +7,8 @@ from waflib.extras import autowaf as autowaf
import waflib.Logs as Logs, waflib.Options as Options
# Version of this package (even if built as a child)
-SUIL_VERSION = '0.2.0'
+SUIL_VERSION = '0.2.0'
+SUIL_MAJOR_VERSION = '0'
# Library version (UNIX style major, minor, micro)
# major increment <=> incompatible changes
@@ -55,10 +56,12 @@ def configure(conf):
def build(bld):
# C Headers
- bld.install_files('${INCLUDEDIR}/suil', bld.path.ant_glob('suil/*.h'))
+ includedir = '${INCLUDEDIR}/suil-%s/suil' % SUIL_MAJOR_VERSION
+ bld.install_files(includedir, bld.path.ant_glob('suil/*.h'))
# Pkgconfig file
- autowaf.build_pc(bld, 'SUIL', SUIL_VERSION, [])
+ autowaf.build_pc(bld, 'SUIL', SUIL_VERSION, SUIL_MAJOR_VERSION, [],
+ {'SUIL_MAJOR_VERSION' : SUIL_MAJOR_VERSION})
cflags = [ '-DSUIL_SHARED',
'-DSUIL_INTERNAL' ]
@@ -71,7 +74,7 @@ def build(bld):
obj = bld(features = 'c cshlib',
export_includes = ['.'],
source = 'src/host.c src/instance.c',
- target = 'suil',
+ target = 'suil-%s' % SUIL_MAJOR_VERSION,
includes = ['.'],
name = 'libsuil',
vnum = SUIL_LIB_VERSION,