finish unfinished work at basing all install paths on the program name

[ardour.git] / libs / audiographer / wscript

diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript
index 9e2d1c4c3c70a82584eafcb105ec4f1d147e5414..d7f4eda0d19669fcd64aca47b9e42fc912aef967 100644 (file)
--- a/libs/audiographer/wscript
+++ b/libs/audiographer/wscript
@@ -59,7 +59,8 @@ def build(bld):
         'src/general/sample_format_converter.cc',
         'src/routines.cc',
         'src/debug_utils.cc',
-        'src/general/broadcast_info.cc'
+        'src/general/broadcast_info.cc',
+        'src/general/normalizer.cc'
         ]
     if bld.is_defined('HAVE_SAMPLERATE'):
         audiographer_sources += [ 'src/general/sr_converter.cc' ]
@@ -67,11 +68,7 @@ def build(bld):
     if bld.is_defined ('INTERNAL_SHARED_LIBS'):
         audiographer              = bld.shlib(features = 'c cxx cshlib cxxshlib', source=audiographer_sources)
         # macros for this shared library
-        audiographer.defines      = [ 'LIBAUDIOGRAPHER_DLL=1', 'LIBAUDIOGRAPHER_DLL_EXPORTS=1' ]
-        # macros for this other internal shared libraries that we use
-        audiographer.defines     += [ 'LIBPBD_DLL=1' ]
-        audiographer.cflags       = [ '-fvisibility=hidden' ]
-        audiographer.cxxflags     = [ '-fvisibility=hidden' ]
+        audiographer.defines      = [ 'LIBAUDIOGRAPHER_DLL_EXPORTS=1' ]
     else:
         audiographer              = bld.stlib(features = 'c cxx cstlib cxxstlib', source=libardour_sources)
         audiographer.cxxflags     = [ '-fPIC' ]
@@ -85,7 +82,7 @@ def build(bld):
     audiographer.uselib         = 'GLIB GLIBMM GTHREAD SAMPLERATE SNDFILE'
     audiographer.use            = 'libpbd'
     audiographer.vnum           = AUDIOGRAPHER_LIB_VERSION
-    audiographer.install_path   = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    audiographer.install_path   = os.path.join(bld.env['LIBDIR'])
 
 
     if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):