prepare meter type unification

[ardour.git] / libs / ardour / wscript

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index b4a50a888b0eca3e2e57296c255e0fbff901466d..78bf01c0629d2b89709df8d7659c4ed897b02388 100644 (file)
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -5,24 +5,11 @@ import os
 import re
 import subprocess
 
-# Version of this package (even if built as a child)
-MAJOR = '3'
-MINOR = '0'
-MICRO = '0'
-LIBARDOUR_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO)
-
-# Library version (UNIX style major, minor, micro)
-# major increment <=> incompatible changes
-# minor increment <=> compatible changes (additions)
-# micro increment <=> no interface changes
-LIBARDOUR_LIB_VERSION = '3.0.0'
-
 # default state file version for this build
 CURRENT_SESSION_FILE_VERSION = 3001
 
 # Variables for 'waf dist'
 APPNAME = 'libardour3'
-VERSION = LIBARDOUR_VERSION
 I18N_PACKAGE = 'ardour3'
 
 # Mandatory variables
@@ -112,10 +99,12 @@ libardour_sources = [
         'io.cc',
         'io_processor.cc',
         'jack_slave.cc',
+        'kmeterdsp.cc',
         'ladspa_plugin.cc',
         'location.cc',
         'location_importer.cc',
         'ltc_slave.cc',
+        'lv2_bundled_search_path.cc',
         'meter.cc',
         'midi_automation_list_binder.cc',
         'midi_buffer.cc',
@@ -204,7 +193,7 @@ libardour_sources = [
         'source_factory.cc',
         'speakers.cc',
         'strip_silence.cc',
-        'svn_revision.cc',
+        'revision.cc',
         'tape_file_matcher.cc',
         'template_utils.cc',
         'tempo.cc',
@@ -240,10 +229,11 @@ def options(opt):
 def configure(conf):
     conf.load('compiler_cxx')
     conf.load('gas')
+    # we don't use hard-coded micro versions with ardour, so hard code it to zero
     autowaf.build_version_files(
         path_prefix + 'ardour/version.h',
         path_prefix + 'version.cc',
-        'libardour3', MAJOR, MINOR, MICRO)
+        'libardour3', conf.env['MAJOR'], conf.env['MINOR'], 0)
     autowaf.configure(conf)
     autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO',
                       atleast_version='0.3.2')
@@ -369,12 +359,23 @@ int main(int argc, char** argv) {
 
 
 def build(bld):
+    # Library version (UNIX style major, minor, micro)
+    # major increment <=> incompatible changes
+    # minor increment <=> compatible changes (additions)
+    # micro increment <=> no interface changes
+    LIBARDOUR_LIB_VERSION = "3.0.0."
+
     # Library
-    obj              = bld(features = 'c cxx cshlib cxxshlib')
-    obj.source       = libardour_sources
+    if bld.is_defined ('INTERNAL_SHARED_LIBS'):
+        obj              = bld.shlib(features = 'c cxx cshlib cxxshlib', source=libardour_sources)
+    else:
+        obj              = bld.stlib(features = 'c cxx cstlib cxxstlib', source=libardour_sources)
+        obj.cxxflags     = [ '-fPIC' ]
+        obj.cflags       = [ '-fPIC' ]
+
     obj.export_includes = ['.']
     obj.includes     = ['.', '../surfaces/control_protocol', '..']
-    obj.name         = 'libardour'
+    obj.name         = 'ardour'
     obj.target       = 'ardour'
     obj.uselib       = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
                         'JACK','SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
@@ -470,10 +471,10 @@ def build(bld):
 # Tests that don't work
 #                test/mantis_3356_test.cc
 
-        testobj.includes     = obj.includes + ['test', '../pbd']
+        testobj.includes     = obj.includes + ['test', '../pbd', '../libltc', '../audiographer']
         testobj.uselib       = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD',
                                 'SAMPLERATE','XML','LRDF','COREAUDIO']
-        testobj.use          = ['libpbd','libmidipp','libardour']
+        testobj.use          = ['libpbd','libmidipp','ardour','libltc','libaudiographer']
         testobj.name         = 'libardour-tests'
         testobj.target       = 'run-tests'
         testobj.install_path = ''
@@ -506,7 +507,7 @@ def build(bld):
         session_load_tester.includes.append ('test')
         session_load_tester.uselib    = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD',
                              'SAMPLERATE','XML','LRDF','COREAUDIO']
-        session_load_tester.use       = ['libpbd','libmidipp','libardour']
+        session_load_tester.use       = ['libpbd','libmidipp','ardour']
         session_load_tester.name      = 'libardour-session-load-tester'
         session_load_tester.target    = 'load-session'
         session_load_tester.install_path = ''
@@ -541,7 +542,7 @@ def build(bld):
             profilingobj.includes.append ('test')
             profilingobj.uselib    = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD',
                              'SAMPLERATE','XML','LRDF','COREAUDIO']
-            profilingobj.use       = ['libpbd','libmidipp','libardour']
+            profilingobj.use       = ['libpbd','libmidipp','ardour']
             profilingobj.name      = 'libardour-profiling'
             profilingobj.target    = p
             profilingobj.install_path = ''