smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

remove redundant os.path.join() calls when specifying install path as bld.env['LIBDIR']

Browse source
This commit is contained in:
Paul Davis 2014-04-28 21:18:02 -04:00
parent 058986f77b
commit 1b989a93c2
10 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
headless/wscript
View file

@ -57,7 +57,7 @@ def build(bld):
'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"', 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
] ]
obj.install_path = os.path.join(bld.env['LIBDIR']) obj.install_path = bld.env['LIBDIR']
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL' obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL'
obj.uselib += ' FFTW3F' obj.uselib += ' FFTW3F'
obj.uselib += ' AUDIOUNITS OSX LO ' obj.uselib += ' AUDIOUNITS OSX LO '

4
libs/ardour/wscript
View file

@ -355,7 +355,7 @@ def build(bld):
obj.use.extend(['librubberband', 'libltc_includes', 'libltc']) obj.use.extend(['librubberband', 'libltc_includes', 'libltc'])
obj.vnum = LIBARDOUR_LIB_VERSION obj.vnum = LIBARDOUR_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR']) obj.install_path = bld.env['LIBDIR']
obj.defines += [ obj.defines += [
'PACKAGE="' + I18N_PACKAGE + '"', 'PACKAGE="' + I18N_PACKAGE + '"',
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
@ -569,7 +569,7 @@ def create_ardour_test_program(bld, includes, name, target, sources):
testobj.name = name testobj.name = name
testobj.target = target testobj.target = target
# not sure about install path # not sure about install path
testobj.install_path = os.path.join(bld.env['LIBDIR']) testobj.install_path = bld.env['LIBDIR']
testobj.defines = [ testobj.defines = [
'PACKAGE="libardour3test"', 'PACKAGE="libardour3test"',
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',

2
libs/audiographer/wscript
View file

@ -82,7 +82,7 @@ def build(bld):
audiographer.uselib = 'GLIB GLIBMM GTHREAD SAMPLERATE SNDFILE' audiographer.uselib = 'GLIB GLIBMM GTHREAD SAMPLERATE SNDFILE'
audiographer.use = 'libpbd' audiographer.use = 'libpbd'
audiographer.vnum = AUDIOGRAPHER_LIB_VERSION audiographer.vnum = AUDIOGRAPHER_LIB_VERSION
audiographer.install_path = os.path.join(bld.env['LIBDIR']) audiographer.install_path = bld.env['LIBDIR']
if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'): if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):

2
libs/canvas/wscript
View file

@ -85,7 +85,7 @@ def build(bld):
obj.name = 'libcanvas' obj.name = 'libcanvas'
obj.target = 'canvas' obj.target = 'canvas'
obj.vnum = CANVAS_LIB_VERSION obj.vnum = CANVAS_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR']) obj.install_path = bld.env['LIBDIR']
obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ] obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']: if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:

2
libs/evoral/wscript
View file

@ -73,7 +73,7 @@ def build(bld):
libsmf.uselib = 'GLIB' libsmf.uselib = 'GLIB'
libsmf.cxxflags = [ '-fPIC' ] libsmf.cxxflags = [ '-fPIC' ]
libsmf.cflags = [ '-fPIC' ] libsmf.cflags = [ '-fPIC' ]
libsmf.install_path = os.path.join(bld.env['LIBDIR']) libsmf.install_path = bld.env['LIBDIR']
lib_source = ''' lib_source = '''
src/Control.cpp src/Control.cpp

2
libs/gtkmm2ext/wscript
View file

@ -101,7 +101,7 @@ def build(bld):
obj.uselib = 'GTKMM GTK GTKOSX OSX GDK' obj.uselib = 'GTKMM GTK GTKOSX OSX GDK'
obj.use = [ 'libpbd' ] obj.use = [ 'libpbd' ]
obj.vnum = GTKMM2EXT_LIB_VERSION obj.vnum = GTKMM2EXT_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR']) obj.install_path = bld.env['LIBDIR']
obj.defines += [ obj.defines += [
'PACKAGE="' + I18N_PACKAGE + '"', 'PACKAGE="' + I18N_PACKAGE + '"',
'LOCALEDIR="' + os.path.join( 'LOCALEDIR="' + os.path.join(

2
libs/midi++2/wscript
View file

@ -75,7 +75,7 @@ def build(bld):
obj.uselib = 'GLIBMM SIGCPP XML OSX' obj.uselib = 'GLIBMM SIGCPP XML OSX'
obj.use = 'libpbd libevoral libtimecode' obj.use = 'libpbd libevoral libtimecode'
obj.vnum = LIBMIDIPP_LIB_VERSION obj.vnum = LIBMIDIPP_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR']) obj.install_path = bld.env['LIBDIR']
if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'): if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
# Unit tests # Unit tests

2
libs/qm-dsp/wscript
View file

@ -53,7 +53,7 @@ def build(bld):
obj.name = 'libqmdsp' obj.name = 'libqmdsp'
obj.target = 'qmdsp' obj.target = 'qmdsp'
obj.vnum = QM_DSP_VERSION obj.vnum = QM_DSP_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR']) obj.install_path = bld.env['LIBDIR']
def shutdown(): def shutdown():
autowaf.shutdown() autowaf.shutdown()

2
libs/surfaces/control_protocol/wscript
View file

@ -41,7 +41,7 @@ def build(bld):
obj.target = 'ardourcp' obj.target = 'ardourcp'
obj.use = 'libardour' obj.use = 'libardour'
obj.vnum = LIBARDOUR_CP_LIB_VERSION obj.vnum = LIBARDOUR_CP_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR']) obj.install_path = bld.env['LIBDIR']
def shutdown(): def shutdown():
autowaf.shutdown() autowaf.shutdown()

2
tools/sanity_check/wscript
View file

@ -20,4 +20,4 @@ def build(bld):
obj.source = [ 'main.cpp', 'systemtest.cpp' ] obj.source = [ 'main.cpp', 'systemtest.cpp' ]
obj.target = 'sanityCheck' obj.target = 'sanityCheck'
obj.name = 'sanityCheck' obj.name = 'sanityCheck'
obj.install_path = os.path.join(bld.env['LIBDIR']) obj.install_path = bld.env['LIBDIR']