summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-12-22 00:44:05 +0000
committerCarl Hetherington <cth@carlh.net>2014-12-22 00:44:05 +0000
commitb8521420b8dcb074fe892cb606f10c98588e301a (patch)
tree8374ca98baeb5335f4e26340bc561ebf1f503c71
parent2074fd0b9eafe7f79079f665039e9f554f1445e7 (diff)
More API version fixes.
-rw-r--r--src/wscript8
-rw-r--r--wscript6
2 files changed, 8 insertions, 6 deletions
diff --git a/src/wscript b/src/wscript
index 29b4fd9..a1b9a11 100644
--- a/src/wscript
+++ b/src/wscript
@@ -6,8 +6,8 @@ def build(bld):
else:
obj = bld(features='cxx cxxshlib')
- obj.name = 'libsub-1.0'
- obj.target = 'sub-1.0'
+ obj.name = 'libsub%s' % bld.env.API_VERSION
+ obj.target = 'sub%s' % bld.env.API_VERSION
obj.uselib = 'CXML DCP BOOST_FILESYSTEM BOOST_LOCALE'
obj.export_includes = ['.']
obj.source = """
@@ -54,6 +54,6 @@ def build(bld):
vertical_reference.h
"""
- bld.install_files('${PREFIX}/include/libsub-1.0', headers)
+ bld.install_files('${PREFIX}/include/libsub%s/sub' % bld.env.API_VERSION, headers)
if bld.env.STATIC:
- bld.install_files('${PREFIX}/lib', 'libsub-1.0.a')
+ bld.install_files('${PREFIX}/lib', 'libsub%s.a' % bld.env.API_VERSION)
diff --git a/wscript b/wscript
index 5db9865..95050de 100644
--- a/wscript
+++ b/wscript
@@ -3,6 +3,7 @@ import os
APPNAME = 'libsub'
VERSION = '1.0.0devel'
+API_VERSION = '-1.0'
def options(opt):
opt.load('compiler_cxx')
@@ -20,6 +21,7 @@ def configure(conf):
conf.env.STATIC = conf.options.static
conf.env.TARGET_WINDOWS = conf.options.target_windows
conf.env.DISABLE_TESTS = conf.options.disable_tests
+ conf.env.API_VERSION = API_VERSION
if conf.options.enable_debug:
conf.env.append_value('CXXFLAGS', '-g')
@@ -85,9 +87,9 @@ def build(bld):
else:
boost_lib_suffix = ''
- bld(source='libsub-1.0.pc.in',
+ bld(source='libsub%s.pc.in' % bld.env.API_VERSION,
version=VERSION,
- includedir='%s/include/libsub-1.0' % bld.env.PREFIX,
+ includedir='%s/include/libsub%s' % (bld.env.PREFIX, bld.env.API_VERSION),
libs="-L${libdir} -lsub -lboost_system%s" % boost_lib_suffix,
install_path='${LIBDIR}/pkgconfig')