diff options
-rw-r--r-- | SConstruct | 309 | ||||
-rw-r--r-- | ardour.dox | 2 | ||||
-rw-r--r-- | gtk2_ardour/SConscript | 5 | ||||
-rw-r--r-- | gtk2_ardour/fft_result.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/po/SConscript | 2 | ||||
-rw-r--r-- | gtk2_ardour/route_ui.cc | 2 | ||||
-rw-r--r-- | libs/ardour/SConscript | 2 | ||||
-rw-r--r-- | libs/gtkmm2ext/SConscript | 2 | ||||
-rw-r--r-- | libs/midi++2/SConscript | 2 | ||||
-rw-r--r-- | libs/pbd/.cvsignore (renamed from libs/pbd3/.cvsignore) | 0 | ||||
-rw-r--r-- | libs/pbd/AUTHORS (renamed from libs/pbd3/AUTHORS) | 0 | ||||
-rw-r--r-- | libs/pbd/COPYING (renamed from libs/pbd3/COPYING) | 0 | ||||
-rw-r--r-- | libs/pbd/ChangeLog (renamed from libs/pbd3/ChangeLog) | 0 | ||||
-rw-r--r-- | libs/pbd/NEWS (renamed from libs/pbd3/NEWS) | 0 | ||||
-rw-r--r-- | libs/pbd/README (renamed from libs/pbd3/README) | 0 | ||||
-rw-r--r-- | libs/pbd/SConscript (renamed from libs/pbd3/SConscript) | 36 | ||||
-rw-r--r-- | libs/pbd/base_ui.cc (renamed from libs/pbd3/base_ui.cc) | 0 | ||||
-rw-r--r-- | libs/pbd/basename.cc (renamed from libs/pbd3/basename.cc) | 0 | ||||
-rw-r--r-- | libs/pbd/convert.cc (renamed from libs/pbd3/convert.cc) | 0 | ||||
-rw-r--r-- | libs/pbd/dmalloc.cc (renamed from libs/pbd3/dmalloc.cc) | 0 | ||||
-rw-r--r-- | libs/pbd/error.cc (renamed from libs/pbd3/error.cc) | 0 | ||||
-rw-r--r-- | libs/pbd/gettext.h (renamed from libs/pbd3/gettext.h) | 0 | ||||
-rw-r--r-- | libs/pbd/i18n.h (renamed from libs/pbd3/i18n.h) | 0 | ||||
-rw-r--r-- | libs/pbd/libpbd.pc.in (renamed from libs/pbd3/libpbd.pc.in) | 0 | ||||
-rw-r--r-- | libs/pbd/libpbd.spec.in (renamed from libs/pbd3/libpbd.spec.in) | 0 | ||||
-rw-r--r-- | libs/pbd/mountpoint.cc (renamed from libs/pbd3/mountpoint.cc) | 0 | ||||
-rw-r--r-- | libs/pbd/path.cc (renamed from libs/pbd3/path.cc) | 0 | ||||
-rw-r--r-- | libs/pbd/pathscanner.cc (renamed from libs/pbd3/pathscanner.cc) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/.DS_Store (renamed from libs/pbd3/pbd/.DS_Store) | bin | 6148 -> 6148 bytes | |||
-rw-r--r-- | libs/pbd/pbd/.cvsignore (renamed from libs/pbd3/pbd/.cvsignore) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/abstract_ui.cc (renamed from libs/pbd3/pbd/abstract_ui.cc) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/abstract_ui.h (renamed from libs/pbd3/pbd/abstract_ui.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/base_ui.h (renamed from libs/pbd3/pbd/base_ui.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/basename.h (renamed from libs/pbd3/pbd/basename.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/compose.h (renamed from libs/pbd3/pbd/compose.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/convert.h (renamed from libs/pbd3/pbd/convert.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/error.h (renamed from libs/pbd3/pbd/error.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/failed_constructor.h (renamed from libs/pbd3/pbd/failed_constructor.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/fastlog.h (renamed from libs/pbd3/pbd/fastlog.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/forkexec.h (renamed from libs/pbd3/pbd/forkexec.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/mathfix.h (renamed from libs/pbd3/pbd/mathfix.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/mountpoint.h (renamed from libs/pbd3/pbd/mountpoint.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/path.h (renamed from libs/pbd3/pbd/path.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/pathscanner.h (renamed from libs/pbd3/pbd/pathscanner.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/pool.h (renamed from libs/pbd3/pbd/pool.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/pthread_utils.h (renamed from libs/pbd3/pbd/pthread_utils.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/receiver.h (renamed from libs/pbd3/pbd/receiver.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/restartable_rw.h (renamed from libs/pbd3/pbd/restartable_rw.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/ringbuffer.h (renamed from libs/pbd3/pbd/ringbuffer.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/ringbufferNPT.h (renamed from libs/pbd3/pbd/ringbufferNPT.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/selectable.h (renamed from libs/pbd3/pbd/selectable.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/stacktrace.h (renamed from libs/pbd3/pbd/stacktrace.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/stl_delete.h (renamed from libs/pbd3/pbd/stl_delete.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/stl_functors.h (renamed from libs/pbd3/pbd/stl_functors.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/strsplit.h (renamed from libs/pbd3/pbd/strsplit.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/textreceiver.h (renamed from libs/pbd3/pbd/textreceiver.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/thrown_error.h (renamed from libs/pbd3/pbd/thrown_error.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/tokenizer.h (renamed from libs/pbd3/pbd/tokenizer.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/touchable.h (renamed from libs/pbd3/pbd/touchable.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/transmitter.h (renamed from libs/pbd3/pbd/transmitter.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/undo.h (renamed from libs/pbd3/pbd/undo.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/whitespace.h (renamed from libs/pbd3/pbd/whitespace.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pbd/xml++.h (renamed from libs/pbd3/pbd/xml++.h) | 0 | ||||
-rw-r--r-- | libs/pbd/pool.cc (renamed from libs/pbd3/pool.cc) | 0 | ||||
-rw-r--r-- | libs/pbd/pthread_utils.cc (renamed from libs/pbd3/pthread_utils.cc) | 0 | ||||
-rw-r--r-- | libs/pbd/receiver.cc (renamed from libs/pbd3/receiver.cc) | 0 | ||||
-rw-r--r-- | libs/pbd/stacktrace.cc (renamed from libs/pbd3/stacktrace.cc) | 0 | ||||
-rw-r--r-- | libs/pbd/strsplit.cc (renamed from libs/pbd3/strsplit.cc) | 0 | ||||
-rw-r--r-- | libs/pbd/textreceiver.cc (renamed from libs/pbd3/textreceiver.cc) | 0 | ||||
-rw-r--r-- | libs/pbd/transmitter.cc (renamed from libs/pbd3/transmitter.cc) | 0 | ||||
-rw-r--r-- | libs/pbd/undo.cc (renamed from libs/pbd3/undo.cc) | 0 | ||||
-rw-r--r-- | libs/pbd/whitespace.cc (renamed from libs/pbd3/whitespace.cc) | 0 | ||||
-rw-r--r-- | libs/pbd/xml++.cc (renamed from libs/pbd3/xml++.cc) | 0 | ||||
-rw-r--r-- | libs/surfaces/control_protocol/SConscript | 2 | ||||
-rw-r--r-- | libs/surfaces/generic_midi/SConscript | 2 | ||||
-rw-r--r-- | libs/surfaces/tranzport/SConscript | 2 |
76 files changed, 196 insertions, 178 deletions
diff --git a/SConstruct b/SConstruct index 1dd250edfb..3fff60f04b 100644 --- a/SConstruct +++ b/SConstruct @@ -50,18 +50,25 @@ opts.AddOptions( class LibraryInfo(Environment): def __init__(self,*args,**kw): Environment.__init__ (self,*args,**kw) - + def Merge (self,others): for other in others: self.Append (LIBS = other.get ('LIBS',[])) - self.Append (LIBPATH = other.get ('LIBPATH', [])) + self.Append (LIBPATH = other.get ('LIBPATH', [])) self.Append (CPPPATH = other.get('CPPPATH', [])) self.Append (LINKFLAGS = other.get('LINKFLAGS', [])) self.Replace(LIBPATH = list(Set(self.get('LIBPATH', [])))) self.Replace(CPPPATH = list(Set(self.get('CPPPATH',[])))) #doing LINKFLAGS breaks -framework #doing LIBS break link order dependency - + + def ENV_update(self, src_ENV): + for k in src_ENV.keys(): + if k in self['ENV'].keys() and k in [ 'PATH', 'LD_LIBRARY_PATH', + 'LIB', 'INCLUDE' ]: + self['ENV'][k]=SCons.Util.AppendPath(self['ENV'][k], src_ENV[k]) + else: + self['ENV'][k]=src_ENV[k] env = LibraryInfo (options = opts, CPPPATH = [ '.' ], @@ -72,68 +79,69 @@ env = LibraryInfo (options = opts, DISTCHECKDIR = '#ardour-' + version + '/check' ) +env.ENV_update(os.environ) #---------------------------------------------------------------------- # Builders #---------------------------------------------------------------------- # Handy subst-in-file builder -# +# def do_subst_in_file(targetfile, sourcefile, dict): - """Replace all instances of the keys of dict with their values. - For example, if dict is {'%VERSION%': '1.2345', '%BASE%': 'MyProg'}, - then all instances of %VERSION% in the file will be replaced with 1.2345 etc. - """ - try: - f = open(sourcefile, 'rb') - contents = f.read() - f.close() - except: - raise SCons.Errors.UserError, "Can't read source file %s"%sourcefile - for (k,v) in dict.items(): - contents = re.sub(k, v, contents) - try: - f = open(targetfile, 'wb') - f.write(contents) - f.close() - except: - raise SCons.Errors.UserError, "Can't write target file %s"%targetfile - return 0 # success - + """Replace all instances of the keys of dict with their values. + For example, if dict is {'%VERSION%': '1.2345', '%BASE%': 'MyProg'}, + then all instances of %VERSION% in the file will be replaced with 1.2345 etc. + """ + try: + f = open(sourcefile, 'rb') + contents = f.read() + f.close() + except: + raise SCons.Errors.UserError, "Can't read source file %s"%sourcefile + for (k,v) in dict.items(): + contents = re.sub(k, v, contents) + try: + f = open(targetfile, 'wb') + f.write(contents) + f.close() + except: + raise SCons.Errors.UserError, "Can't write target file %s"%targetfile + return 0 # success + def subst_in_file(target, source, env): - if not env.has_key('SUBST_DICT'): - raise SCons.Errors.UserError, "SubstInFile requires SUBST_DICT to be set." - d = dict(env['SUBST_DICT']) # copy it - for (k,v) in d.items(): - if callable(v): - d[k] = env.subst(v()) - elif SCons.Util.is_String(v): - d[k]=env.subst(v) - else: - raise SCons.Errors.UserError, "SubstInFile: key %s: %s must be a string or callable"%(k, repr(v)) - for (t,s) in zip(target, source): - return do_subst_in_file(str(t), str(s), d) - + if not env.has_key('SUBST_DICT'): + raise SCons.Errors.UserError, "SubstInFile requires SUBST_DICT to be set." + d = dict(env['SUBST_DICT']) # copy it + for (k,v) in d.items(): + if callable(v): + d[k] = env.subst(v()) + elif SCons.Util.is_String(v): + d[k]=env.subst(v) + else: + raise SCons.Errors.UserError, "SubstInFile: key %s: %s must be a string or callable"%(k, repr(v)) + for (t,s) in zip(target, source): + return do_subst_in_file(str(t), str(s), d) + def subst_in_file_string(target, source, env): - """This is what gets printed on the console.""" - return '\n'.join(['Substituting vars from %s into %s'%(str(s), str(t)) - for (t,s) in zip(target, source)]) - + """This is what gets printed on the console.""" + return '\n'.join(['Substituting vars from %s into %s'%(str(s), str(t)) + for (t,s) in zip(target, source)]) + def subst_emitter(target, source, env): - """Add dependency from substituted SUBST_DICT to target. - Returns original target, source tuple unchanged. - """ - d = env['SUBST_DICT'].copy() # copy it - for (k,v) in d.items(): - if callable(v): - d[k] = env.subst(v()) - elif SCons.Util.is_String(v): - d[k]=env.subst(v) - Depends(target, SCons.Node.Python.Value(d)) - # Depends(target, source) # this doesn't help the install-sapphire-linux.sh problem - return target, source - + """Add dependency from substituted SUBST_DICT to target. + Returns original target, source tuple unchanged. + """ + d = env['SUBST_DICT'].copy() # copy it + for (k,v) in d.items(): + if callable(v): + d[k] = env.subst(v()) + elif SCons.Util.is_String(v): + d[k]=env.subst(v) + Depends(target, SCons.Node.Python.Value(d)) + # Depends(target, source) # this doesn't help the install-sapphire-linux.sh problem + return target, source + subst_action = Action (subst_in_file, subst_in_file_string) env['BUILDERS']['SubstInFile'] = Builder(action=subst_action, emitter=subst_emitter) @@ -141,31 +149,31 @@ env['BUILDERS']['SubstInFile'] = Builder(action=subst_action, emitter=subst_emit # internationalization # -# po_helper +# po_builder: builder function to copy po files to the parent directory while updating them # -# this is not a builder. we can't list the .po files as a target, -# because then scons -c will remove them (even Precious doesn't alter -# this). this function is called whenever a .mo file is being -# built, and will conditionally update the .po file if necessary. +# first source: .po file +# second source: .pot file # -def po_helper(po,pot): +def po_builder(target,source,env): + os.spawnvp (os.P_WAIT, 'cp', ['cp', str(source[0]), str(target[0])]) args = [ 'msgmerge', '--update', - po, - pot, + str(target[0]), + str(source[1]) ] - print 'Updating ' + po + print 'Updating ' + str(target[0]) return os.spawnvp (os.P_WAIT, 'msgmerge', args) +po_bld = Builder (action = po_builder) +env.Append(BUILDERS = {'PoBuild' : po_bld}) + # mo_builder: builder function for (binary) message catalogs (.mo) # # first source: .po file -# second source: .pot file # def mo_builder(target,source,env): - po_helper (source[0].get_path(), source[1].get_path()) args = [ 'msgfmt', '-c', '-o', @@ -183,15 +191,15 @@ env.Append(BUILDERS = {'MoBuild' : mo_bld}) # def pot_builder(target,source,env): - args = [ 'xgettext', + args = [ 'xgettext', '--keyword=_', '--keyword=N_', '--from-code=UTF-8', - '-o', target[0].get_path(), + '-o', target[0].get_path(), "--default-domain=" + env['PACKAGE'], '--copyright-holder="Paul Davis"' ] args += [ src.get_path() for src in source ] - + return os.spawnvp (os.P_WAIT, 'xgettext', args) pot_bld = Builder (action = pot_builder) @@ -204,33 +212,33 @@ env.Append(BUILDERS = {'PotBuild' : pot_bld}) def i18n (buildenv, sources, installenv): domain = buildenv['PACKAGE'] potfile = buildenv['POTFILE'] - + installenv.Alias ('potupdate', buildenv.PotBuild (potfile, sources)) - + p_oze = [ os.path.basename (po) for po in glob.glob ('po/*.po') ] languages = [ po.replace ('.po', '') for po in p_oze ] - m_oze = [ po.replace (".po", ".mo") for po in p_oze ] - for mo in m_oze[:]: - po = 'po/' + mo.replace (".mo", ".po") - installenv.Alias ('install', buildenv.MoBuild (mo, [ po, potfile ])) - - for lang in languages[:]: + for po_file in p_oze: + buildenv.PoBuild(po_file, ['po/'+po_file, potfile]) + mo_file = po_file.replace (".po", ".mo") + installenv.Alias ('install', buildenv.MoBuild (mo_file, po_file)) + + for lang in languages: modir = (os.path.join (install_prefix, 'share/locale/' + lang + '/LC_MESSAGES/')) moname = domain + '.mo' installenv.Alias('install', installenv.InstallAs (os.path.join (modir, moname), lang + '.mo')) # # A generic builder for version.cc files -# +# # note: requires that DOMAIN, MAJOR, MINOR, MICRO are set in the construction environment # note: assumes one source files, the header that declares the version variables -# +# def version_builder (target, source, env): text = "int " + env['DOMAIN'] + "_major_version = " + str (env['MAJOR']) + ";\n" text += "int " + env['DOMAIN'] + "_minor_version = " + str (env['MINOR']) + ";\n" text += "int " + env['DOMAIN'] + "_micro_version = " + str (env['MICRO']) + ";\n" - + try: o = file (target[0].get_path(), 'w') o.write (text) @@ -238,14 +246,14 @@ def version_builder (target, source, env): except IOError: print "Could not open", target[0].get_path(), " for writing\n" sys.exit (-1) - + text = "#ifndef __" + env['DOMAIN'] + "_version_h__\n" text += "#define __" + env['DOMAIN'] + "_version_h__\n" text += "extern int " + env['DOMAIN'] + "_major_version;\n" text += "extern int " + env['DOMAIN'] + "_minor_version;\n" text += "extern int " + env['DOMAIN'] + "_micro_version;\n" text += "#endif /* __" + env['DOMAIN'] + "_version_h__ */\n" - + try: o = file (target[1].get_path(), 'w') o.write (text) @@ -253,7 +261,7 @@ def version_builder (target, source, env): except IOError: print "Could not open", target[1].get_path(), " for writing\n" sys.exit (-1) - + return None version_bld = Builder (action = version_builder) @@ -276,8 +284,8 @@ def versioned_builder(target,source,env): except IOError: print "Could not CVS/Entries for reading" return -1 - - last_date = "" + + last_date = "" lines = o.readlines() for line in lines: if line[0:12] == '/SConscript/': @@ -285,20 +293,20 @@ def versioned_builder(target,source,env): last_date = parts[3] break o.close () - + if last_date == "": print "No SConscript CVS update info found - versioned executable cannot be built" return -1 - + tag = time.strftime ('%Y%M%d%H%m', time.strptime (last_date)) print "The current build ID is " + tag - + tagged_executable = source[0].get_path() + '-' + tag - + if os.path.exists (tagged_executable): print "Replacing existing executable with the same build tag." os.unlink (tagged_executable) - + return os.link (source[0].get_path(), tagged_executable) verbuild = Builder (action = versioned_builder) @@ -310,13 +318,13 @@ env.Append (BUILDERS = {'VersionedExecutable' : verbuild}) def distcopy (target, source, env): treedir = str (target[0]) - + try: os.mkdir (treedir) except OSError, (errnum, strerror): if errnum != errno.EEXIST: print 'mkdir ', treedir, ':', strerror - + cmd = 'tar cf - ' # # we don't know what characters might be in the file names @@ -328,7 +336,7 @@ def distcopy (target, source, env): p = os.popen (cmd) return p.close () -def tarballer (target, source, env): +def tarballer (target, source, env): cmd = 'tar -jcf ' + str (target[0]) + ' ' + str(source[0]) + " --exclude '*~'" print 'running ', cmd, ' ... ' p = os.popen (cmd) @@ -359,7 +367,7 @@ if env['VST']: env['VST'] = 0; else: print "OK, VST support will be enabled" - + # ---------------------------------------------------------------------- # Construction environment setup @@ -381,7 +389,7 @@ libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor') libraries['samplerate'] = LibraryInfo() libraries['samplerate'].ParseConfig('pkg-config --cflags --libs samplerate') -if env['FFT_ANALYSIS']: +if env['FFT_ANALYSIS']: libraries['fftw3f'] = LibraryInfo() libraries['fftw3f'].ParseConfig('pkg-config --cflags --libs fftw3f') @@ -420,9 +428,8 @@ libraries['ardour_cp'] = LibraryInfo (LIBS='ardour_cp', LIBPATH='#libs/surfaces/ libraries['ardour'] = LibraryInfo (LIBS='ardour', LIBPATH='#libs/ardour', CPPPATH='#libs/ardour') libraries['midi++2'] = LibraryInfo (LIBS='midi++', LIBPATH='#libs/midi++2', CPPPATH='#libs/midi++2') -libraries['pbd3'] = LibraryInfo (LIBS='pbd', LIBPATH='#libs/pbd3', CPPPATH='#libs/pbd3') +libraries['pbd'] = LibraryInfo (LIBS='pbd', LIBPATH='#libs/pbd', CPPPATH='#libs/pbd') libraries['gtkmm2ext'] = LibraryInfo (LIBS='gtkmm2ext', LIBPATH='#libs/gtkmm2ext', CPPPATH='#libs/gtkmm2ext') -#libraries['cassowary'] = LibraryInfo(LIBS='cassowary', LIBPATH='#libs/cassowary', CPPPATH='#libs/cassowary') # # Check for libusb @@ -434,7 +441,7 @@ if conf.CheckLib ('usb', 'usb_interrupt_write'): have_libusb = True else: have_libusb = False - + libraries['usb'] = conf.Finish () # @@ -451,7 +458,7 @@ libraries['flac'] = conf.Finish () if env['LIBLO']: libraries['lo'] = LibraryInfo () - + conf = Configure (libraries['lo']) if conf.CheckLib ('lo', 'lo_server_new') == False: print "liblo does not appear to be installed." @@ -473,14 +480,14 @@ if conf.CheckLib ('dmallocth', 'dmalloc_shutdown'): have_libdmalloc = True else: have_libdmalloc = False - + libraries['dmalloc'] = conf.Finish () # # # Audio/MIDI library (needed for MIDI, since audio is all handled via JACK) -# +# conf = Configure(env) @@ -498,11 +505,11 @@ elif conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/Co else: print "It appears you don't have the required MIDI libraries installed." sys.exit (1) - + env = conf.Finish() if env['SYSLIBS']: - + libraries['sigc2'] = LibraryInfo() libraries['sigc2'].ParseConfig('pkg-config --cflags --libs sigc++-2.0') libraries['glibmm2'] = LibraryInfo() @@ -521,7 +528,7 @@ if env['SYSLIBS']: # # cannot use system one for the time being # - + libraries['sndfile'] = LibraryInfo(LIBS='libsndfile', LIBPATH='#libs/libsndfile', CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src']) @@ -532,21 +539,21 @@ if env['SYSLIBS']: # libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas') libraries['soundtouch'] = LibraryInfo() libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0') - + coredirs = [ 'templates' ] - + subdirs = [ 'libs/libsndfile', - 'libs/pbd3', + 'libs/pbd', 'libs/midi++2', 'libs/ardour' ] - + if env['VST']: subdirs = ['libs/fst'] + subdirs + ['vst'] - + gtk_subdirs = [ # 'libs/flowcanvas', 'libs/gtkmm2ext', @@ -575,7 +582,7 @@ else: libraries['libgnomecanvasmm'] = LibraryInfo(LIBS='libgnomecanvasmm', LIBPATH='#libs/libgnomecanvasmm', CPPPATH='#libs/libgnomecanvasmm') - + libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch', LIBPATH='#libs/soundtouch', CPPPATH=['#libs', '#libs/soundtouch']) @@ -585,24 +592,23 @@ else: # libraries['libglademm'] = LibraryInfo(LIBS='libglademm', # LIBPATH='#libs/libglademm', # CPPPATH='#libs/libglademm') - + coredirs = [ 'libs/soundtouch', 'templates' ] - + subdirs = [ -# 'libs/cassowary', 'libs/sigc++2', 'libs/libsndfile', - 'libs/pbd3', + 'libs/pbd', 'libs/midi++2', 'libs/ardour' ] - + if env['VST']: subdirs = ['libs/fst'] + subdirs + ['vst'] - + gtk_subdirs = [ 'libs/glibmm2', 'libs/gtkmm2/pango', @@ -627,7 +633,7 @@ if env['SURFACES']: surface_subdirs += [ 'libs/surfaces/tranzport' ] if os.access ('libs/surfaces/sony9pin', os.F_OK): surface_subdirs += [ 'libs/surfaces/sony9pin' ] - + opts.Save('scache.conf', env) Help(opts.GenerateHelpText(env)) @@ -646,7 +652,7 @@ if os.environ.has_key('CXX'): if os.environ.has_key('DISTCC_HOSTS'): env['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS'] env['ENV']['HOME'] = os.environ['HOME'] - + final_prefix = '$PREFIX' install_prefix = '$DESTDIR/$PREFIX' @@ -670,7 +676,7 @@ if have_cxx[0] != 1: exit (1) else: print "Congratulations, you have a functioning C++ compiler." - + env = conf.Finish() # @@ -724,37 +730,37 @@ if config[config_cpu] == 'powerpc' and env['DIST_TARGET'] != 'none': if config[config_arch] == 'apple': opt_flags.extend ([ "-mcpu=7450", "-faltivec"]) else: - opt_flags.extend ([ "-mcpu=7400", "-maltivec", "-mabi=altivec"]) + opt_flags.extend ([ "-mcpu=7400", "-maltivec", "-mabi=altivec"]) else: opt_flags.extend([ "-mcpu=750", "-mmultiple" ]) opt_flags.extend (["-mhard-float", "-mpowerpc-gfxopt"]) elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_64", config[config_cpu]) != None)) and env['DIST_TARGET'] != 'none': - + build_host_supports_sse = 0 debug_flags.append ("-DARCH_X86") opt_flags.append ("-DARCH_X86") - + if config[config_kernel] == 'linux' : - - if env['DIST_TARGET'] != 'i386': - + + if env['DIST_TARGET'] != 'i386': + flag_line = os.popen ("cat /proc/cpuinfo | grep '^flags'").read()[:-1] x86_flags = flag_line.split (": ")[1:][0].split (' ') - + if "mmx" in x86_flags: opt_flags.append ("-mmmx") if "sse" in x86_flags: build_host_supports_sse = 1 if "3dnow" in x86_flags: opt_flags.append ("-m3dnow") - + if config[config_cpu] == "i586": opt_flags.append ("-march=i586") elif config[config_cpu] == "i686": opt_flags.append ("-march=i686") - + if ((env['DIST_TARGET'] == 'i686') or (env['DIST_TARGET'] == 'x86_64')) and build_host_supports_sse: opt_flags.extend (["-msse", "-mfpmath=sse"]) debug_flags.extend (["-msse", "-mfpmath=sse"]) @@ -783,7 +789,7 @@ env.Append(CONFIG_ARCH=config[config_arch]) # -# ARCH="..." overrides all +# ARCH="..." overrides all # if env['ARCH'] != '': @@ -822,34 +828,47 @@ if env['LIBLO']: env.Merge ([ libraries['core'] ]) # -# i18n support +# fix scons nitpickiness on APPLE # -conf = Configure (env) +if env['DIST_TARGET'] == 'panther' or env['DIST_TARGET'] == 'tiger': + env.Append(CCFLAGS="-I/opt/local/include", LINKFLAGS="-L/opt/local/lib") +# +# i18n support +# + +conf = Configure (env) if env['NLS']: + nls_error = 'This system is not configured for internationalized applications. An english-only version will be built:' print 'Checking for internationalization support ...' have_gettext = conf.TryAction(Action('xgettext --version')) if have_gettext[0] != 1: - print 'This system is not configured for internationalized applications (no xgettext command). An english-only version will be built\n' + nls_error += ' No xgettext command.' env['NLS'] = 0 - - if conf.CheckCHeader('libintl.h') == None: - print 'This system is not configured for internationalized applications (no libintl.h). An english-only version will be built\n' - env['NLS'] = 0 - - have_intltool = conf.TryAction(Action('intltool-update --version')) - if have_intltool[0] != 1: - print 'This system is not configured for internationalized applications (no intltool-update command). An english-only version will be built\n' + else: + print "Found xgettext" + + have_msgmerge = conf.TryAction(Action('msgmerge --version')) + if have_msgmerge[0] != 1: + nls_error += ' No msgmerge command.' env['NLS'] = 0 + else: + print "Found msgmerge" - + if not conf.CheckCHeader('libintl.h'): + nls_error += ' No libintl.h.' + env['NLS'] = 0 + + if env['NLS'] == 0: + print nls_error + else: + print "International version will be built." env = conf.Finish() if env['NLS'] == 1: env.Append(CCFLAGS="-DENABLE_NLS") - Export('env install_prefix final_prefix config_prefix final_config_prefix libraries i18n version subst_dict') # @@ -903,18 +922,18 @@ env.Distribute (env['DISTTREE'], glob.glob ('DOCUMENTATION/FAQ*') + glob.glob ('DOCUMENTATION/README*') ) - + srcdist = env.Tarball(env['TARBALL'], env['DISTTREE']) env.Alias ('srctar', srcdist) # -# don't leave the distree around +# don't leave the distree around # env.AddPreAction (env['DISTTREE'], Action ('rm -rf ' + str (File (env['DISTTREE'])))) env.AddPostAction (srcdist, Action ('rm -rf ' + str (File (env['DISTTREE'])))) # # the subdirs -# +# for subdir in coredirs: SConscript (subdir + '/SConscript') @@ -922,7 +941,7 @@ for subdir in coredirs: for sublistdir in [ subdirs, gtk_subdirs, surface_subdirs ]: for subdir in sublistdir: SConscript (subdir + '/SConscript') - + # cleanup env.Clean ('scrub', [ 'scache.conf', '.sconf_temp', '.sconsign.dblite', 'config.log']) diff --git a/ardour.dox b/ardour.dox index 8bd87d6fa3..a72ecbc588 100644 --- a/ardour.dox +++ b/ardour.dox @@ -459,7 +459,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = libs/pbd3 libs/midi++2 libs/ardour libs/gtkmm2ext gtk2_ardour +INPUT = libs/pbd libs/midi++2 libs/ardour libs/gtkmm2ext gtk2_ardour # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index 65f8dfca73..68e07ebd22 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -27,7 +27,7 @@ gtkardour.Merge ([ libraries['ardour_cp'], libraries['gtkmm2ext'], libraries['midi++2'], - libraries['pbd3'], + libraries['pbd'], libraries['gtkmm2'], libraries['glib2'], libraries['libgnomecanvas2'], @@ -255,8 +255,7 @@ else: env.Alias('install', env.InstallAs(os.path.join(install_prefix, 'bin')+'/ardour2', ardoursh)) if env['NLS']: - Export('gtkardour', 'intl_files') - SConscript ('po/SConscript') + i18n (gtkardour, gtkardour_files+skipped_files+fft_analysis_files, env) # configuration files env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui.rc')) diff --git a/gtk2_ardour/fft_result.cc b/gtk2_ardour/fft_result.cc index 9a55b59cb5..f5acef92ed 100644 --- a/gtk2_ardour/fft_result.cc +++ b/gtk2_ardour/fft_result.cc @@ -20,9 +20,9 @@ #include <fft_result.h> #include <fft_graph.h> -#include <stdlib.h> -#include <string.h> -#include <math.h> +#include <cstdlib> +#include <string> +#include <cmath> #include <iostream> diff --git a/gtk2_ardour/po/SConscript b/gtk2_ardour/po/SConscript index 868f123988..d7e957b3eb 100644 --- a/gtk2_ardour/po/SConscript +++ b/gtk2_ardour/po/SConscript @@ -27,7 +27,7 @@ print "Updating pot file: " domain = gtkardour['DOMAIN'] potfile = gtkardour['POTFILE'] -poaction = Action('intltool-update -p -g=' + domain) +poaction = env.Action('intltool-update -p -g=' + domain) Execute(poaction) diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 4559058b8d..06f86bb545 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2002 Paul Davis + Copyright (C) 2002-2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript index f5f1272fb8..8df33c1f60 100644 --- a/libs/ardour/SConscript +++ b/libs/ardour/SConscript @@ -198,7 +198,7 @@ ardour.Merge ([ libraries['lrdf'], libraries['samplerate'], libraries['sigc2'], - libraries['pbd3'], + libraries['pbd'], libraries['soundtouch'], libraries['midi++2'], libraries['glib2'], diff --git a/libs/gtkmm2ext/SConscript b/libs/gtkmm2ext/SConscript index b70aea3d40..5d8489f103 100644 --- a/libs/gtkmm2ext/SConscript +++ b/libs/gtkmm2ext/SConscript @@ -9,7 +9,7 @@ Import('env final_prefix install_prefix libraries i18n') gtkmm2ext = env.Copy() gtkmm2ext.Merge ([ libraries['sigc2'], - libraries['pbd3'], + libraries['pbd'], libraries['midi++2'], libraries['gtk2'], libraries['glibmm2'], diff --git a/libs/midi++2/SConscript b/libs/midi++2/SConscript index 928372909c..63a3b04f8d 100644 --- a/libs/midi++2/SConscript +++ b/libs/midi++2/SConscript @@ -7,7 +7,7 @@ import glob Import('env libraries install_prefix') midi2 = env.Copy() -midi2.Merge([ libraries['sigc2'], libraries['xml'], libraries['glib2'], libraries['pbd3'] ]) +midi2.Merge([ libraries['sigc2'], libraries['xml'], libraries['glib2'], libraries['pbd'] ]) domain = 'midipp' diff --git a/libs/pbd3/.cvsignore b/libs/pbd/.cvsignore index e9a15e81e9..e9a15e81e9 100644 --- a/libs/pbd3/.cvsignore +++ b/libs/pbd/.cvsignore diff --git a/libs/pbd3/AUTHORS b/libs/pbd/AUTHORS index e69de29bb2..e69de29bb2 100644 --- a/libs/pbd3/AUTHORS +++ b/libs/pbd/AUTHORS diff --git a/libs/pbd3/COPYING b/libs/pbd/COPYING index d60c31a97a..d60c31a97a 100644 --- a/libs/pbd3/COPYING +++ b/libs/pbd/COPYING diff --git a/libs/pbd3/ChangeLog b/libs/pbd/ChangeLog index 59e92915ba..59e92915ba 100644 --- a/libs/pbd3/ChangeLog +++ b/libs/pbd/ChangeLog diff --git a/libs/pbd3/NEWS b/libs/pbd/NEWS index e69de29bb2..e69de29bb2 100644 --- a/libs/pbd3/NEWS +++ b/libs/pbd/NEWS diff --git a/libs/pbd3/README b/libs/pbd/README index e69de29bb2..e69de29bb2 100644 --- a/libs/pbd3/README +++ b/libs/pbd/README diff --git a/libs/pbd3/SConscript b/libs/pbd/SConscript index cebb2472aa..a9166d9505 100644 --- a/libs/pbd3/SConscript +++ b/libs/pbd/SConscript @@ -6,18 +6,18 @@ import glob Import('env libraries i18n install_prefix') -pbd3 = env.Copy() +pbd = env.Copy() domain = 'libpbd' -pbd3.Append(DOMAIN=domain,MAJOR=4,MINOR=1,MICRO=0) -pbd3.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"") -pbd3.Append(CXXFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE") -pbd3.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED") -pbd3.Append(PACKAGE=domain) -pbd3.Append(POTFILE=domain + '.pot') +pbd.Append(DOMAIN=domain,MAJOR=4,MINOR=1,MICRO=0) +pbd.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"") +pbd.Append(CXXFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE") +pbd.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED") +pbd.Append(PACKAGE=domain) +pbd.Append(POTFILE=domain + '.pot') -pbd3_files = Split(""" +pbd_files = Split(""" basename.cc base_ui.cc convert.cc @@ -39,30 +39,30 @@ whitespace.cc xml++.cc """) -conf = Configure(pbd3) +conf = Configure(pbd) if conf.CheckFunc('getmntent'): conf.env.Append(CCFLAGS="-DHAVE_GETMNTENT") if conf.CheckCHeader('execinfo.h'): conf.env.Append(CXXFLAGS="-DHAVE_EXECINFO") -pbd3 = conf.Finish() +pbd = conf.Finish() -pbd3.Merge ([ libraries['sigc2'], libraries['xml'], libraries['glibmm2'], libraries['glib2'] ]) +pbd.Merge ([ libraries['sigc2'], libraries['xml'], libraries['glibmm2'], libraries['glib2'] ]) -pbd3.VersionBuild(['version.cc','pbd/version.h'], 'SConscript') +pbd.VersionBuild(['version.cc','pbd/version.h'], 'SConscript') -libpbd3 = pbd3.SharedLibrary('pbd', pbd3_files) -Default(libpbd3) +libpbd = pbd.SharedLibrary('pbd', pbd_files) +Default(libpbd) -mount_env = Environment(CCFLAGS='-DTEST_MOUNTPOINT -Ilibs/pbd3') +mount_env = Environment(CCFLAGS='-DTEST_MOUNTPOINT -Ilibs/pbd') mount_env.Program('mountpoint', 'mountpoint.cc') if env['NLS']: - i18n (pbd3, pbd3_files, env) + i18n (pbd, pbd_files, env) -env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libpbd3)) +env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libpbd)) env.Alias('tarball', env.Distribute (env['DISTTREE'], [ 'SConscript', 'i18n.h', 'gettext.h', 'pbd/abstract_ui.cc' ] + - pbd3_files + + pbd_files + glob.glob('po/*.po') + glob.glob('pbd/*.h'))) diff --git a/libs/pbd3/base_ui.cc b/libs/pbd/base_ui.cc index d3c8d5e4c7..d3c8d5e4c7 100644 --- a/libs/pbd3/base_ui.cc +++ b/libs/pbd/base_ui.cc diff --git a/libs/pbd3/basename.cc b/libs/pbd/basename.cc index a51e393b78..a51e393b78 100644 --- a/libs/pbd3/basename.cc +++ b/libs/pbd/basename.cc diff --git a/libs/pbd3/convert.cc b/libs/pbd/convert.cc index 60d39c91e2..60d39c91e2 100644 --- a/libs/pbd3/convert.cc +++ b/libs/pbd/convert.cc diff --git a/libs/pbd3/dmalloc.cc b/libs/pbd/dmalloc.cc index 0e730946c8..0e730946c8 100644 --- a/libs/pbd3/dmalloc.cc +++ b/libs/pbd/dmalloc.cc diff --git a/libs/pbd3/error.cc b/libs/pbd/error.cc index a6f8fb7f8f..a6f8fb7f8f 100644 --- a/libs/pbd3/error.cc +++ b/libs/pbd/error.cc diff --git a/libs/pbd3/gettext.h b/libs/pbd/gettext.h index 339c74ffe7..339c74ffe7 100644 --- a/libs/pbd3/gettext.h +++ b/libs/pbd/gettext.h diff --git a/libs/pbd3/i18n.h b/libs/pbd/i18n.h index 7c79d2eb53..7c79d2eb53 100644 --- a/libs/pbd3/i18n.h +++ b/libs/pbd/i18n.h diff --git a/libs/pbd3/libpbd.pc.in b/libs/pbd/libpbd.pc.in index 14d0208845..14d0208845 100644 --- a/libs/pbd3/libpbd.pc.in +++ b/libs/pbd/libpbd.pc.in diff --git a/libs/pbd3/libpbd.spec.in b/libs/pbd/libpbd.spec.in index d50622d638..d50622d638 100644 --- a/libs/pbd3/libpbd.spec.in +++ b/libs/pbd/libpbd.spec.in diff --git a/libs/pbd3/mountpoint.cc b/libs/pbd/mountpoint.cc index c1bcb375f3..c1bcb375f3 100644 --- a/libs/pbd3/mountpoint.cc +++ b/libs/pbd/mountpoint.cc diff --git a/libs/pbd3/path.cc b/libs/pbd/path.cc index 80f916c9ae..80f916c9ae 100644 --- a/libs/pbd3/path.cc +++ b/libs/pbd/path.cc diff --git a/libs/pbd3/pathscanner.cc b/libs/pbd/pathscanner.cc index 2af227a3a0..2af227a3a0 100644 --- a/libs/pbd3/pathscanner.cc +++ b/libs/pbd/pathscanner.cc diff --git a/libs/pbd3/pbd/.DS_Store b/libs/pbd/pbd/.DS_Store Binary files differindex 5008ddfcf5..5008ddfcf5 100644 --- a/libs/pbd3/pbd/.DS_Store +++ b/libs/pbd/pbd/.DS_Store diff --git a/libs/pbd3/pbd/.cvsignore b/libs/pbd/pbd/.cvsignore index 67020331ba..67020331ba 100644 --- a/libs/pbd3/pbd/.cvsignore +++ b/libs/pbd/pbd/.cvsignore diff --git a/libs/pbd3/pbd/abstract_ui.cc b/libs/pbd/pbd/abstract_ui.cc index 0e34787a2d..0e34787a2d 100644 --- a/libs/pbd3/pbd/abstract_ui.cc +++ b/libs/pbd/pbd/abstract_ui.cc diff --git a/libs/pbd3/pbd/abstract_ui.h b/libs/pbd/pbd/abstract_ui.h index f80db7bf1a..f80db7bf1a 100644 --- a/libs/pbd3/pbd/abstract_ui.h +++ b/libs/pbd/pbd/abstract_ui.h diff --git a/libs/pbd3/pbd/base_ui.h b/libs/pbd/pbd/base_ui.h index b4570f8707..b4570f8707 100644 --- a/libs/pbd3/pbd/base_ui.h +++ b/libs/pbd/pbd/base_ui.h diff --git a/libs/pbd3/pbd/basename.h b/libs/pbd/pbd/basename.h index 35aebe166c..35aebe166c 100644 --- a/libs/pbd3/pbd/basename.h +++ b/libs/pbd/pbd/basename.h diff --git a/libs/pbd3/pbd/compose.h b/libs/pbd/pbd/compose.h index 0df9519aaf..0df9519aaf 100644 --- a/libs/pbd3/pbd/compose.h +++ b/libs/pbd/pbd/compose.h diff --git a/libs/pbd3/pbd/convert.h b/libs/pbd/pbd/convert.h index 12e63ba6fc..12e63ba6fc 100644 --- a/libs/pbd3/pbd/convert.h +++ b/libs/pbd/pbd/convert.h diff --git a/libs/pbd3/pbd/error.h b/libs/pbd/pbd/error.h index 4136f02ee2..4136f02ee2 100644 --- a/libs/pbd3/pbd/error.h +++ b/libs/pbd/pbd/error.h diff --git a/libs/pbd3/pbd/failed_constructor.h b/libs/pbd/pbd/failed_constructor.h index 62eb6c0d71..62eb6c0d71 100644 --- a/libs/pbd3/pbd/failed_constructor.h +++ b/libs/pbd/pbd/failed_constructor.h diff --git a/libs/pbd3/pbd/fastlog.h b/libs/pbd/pbd/fastlog.h index 4269705a44..4269705a44 100644 --- a/libs/pbd3/pbd/fastlog.h +++ b/libs/pbd/pbd/fastlog.h diff --git a/libs/pbd3/pbd/forkexec.h b/libs/pbd/pbd/forkexec.h index 2af3711390..2af3711390 100644 --- a/libs/pbd3/pbd/forkexec.h +++ b/libs/pbd/pbd/forkexec.h diff --git a/libs/pbd3/pbd/mathfix.h b/libs/pbd/pbd/mathfix.h index f0dc7e491e..f0dc7e491e 100644 --- a/libs/pbd3/pbd/mathfix.h +++ b/libs/pbd/pbd/mathfix.h diff --git a/libs/pbd3/pbd/mountpoint.h b/libs/pbd/pbd/mountpoint.h index 86ccc58190..86ccc58190 100644 --- a/libs/pbd3/pbd/mountpoint.h +++ b/libs/pbd/pbd/mountpoint.h diff --git a/libs/pbd3/pbd/path.h b/libs/pbd/pbd/path.h index 0b77a7c237..0b77a7c237 100644 --- a/libs/pbd3/pbd/path.h +++ b/libs/pbd/pbd/path.h diff --git a/libs/pbd3/pbd/pathscanner.h b/libs/pbd/pbd/pathscanner.h index 346e7858c4..346e7858c4 100644 --- a/libs/pbd3/pbd/pathscanner.h +++ b/libs/pbd/pbd/pathscanner.h diff --git a/libs/pbd3/pbd/pool.h b/libs/pbd/pbd/pool.h index f8e19e72fb..f8e19e72fb 100644 --- a/libs/pbd3/pbd/pool.h +++ b/libs/pbd/pbd/pool.h diff --git a/libs/pbd3/pbd/pthread_utils.h b/libs/pbd/pbd/pthread_utils.h index 482b5b54cf..482b5b54cf 100644 --- a/libs/pbd3/pbd/pthread_utils.h +++ b/libs/pbd/pbd/pthread_utils.h diff --git a/libs/pbd3/pbd/receiver.h b/libs/pbd/pbd/receiver.h index 5ce238df63..5ce238df63 100644 --- a/libs/pbd3/pbd/receiver.h +++ b/libs/pbd/pbd/receiver.h diff --git a/libs/pbd3/pbd/restartable_rw.h b/libs/pbd/pbd/restartable_rw.h index ee84e4e295..ee84e4e295 100644 --- a/libs/pbd3/pbd/restartable_rw.h +++ b/libs/pbd/pbd/restartable_rw.h diff --git a/libs/pbd3/pbd/ringbuffer.h b/libs/pbd/pbd/ringbuffer.h index 1d9c9b04e3..1d9c9b04e3 100644 --- a/libs/pbd3/pbd/ringbuffer.h +++ b/libs/pbd/pbd/ringbuffer.h diff --git a/libs/pbd3/pbd/ringbufferNPT.h b/libs/pbd/pbd/ringbufferNPT.h index fee2efce3d..fee2efce3d 100644 --- a/libs/pbd3/pbd/ringbufferNPT.h +++ b/libs/pbd/pbd/ringbufferNPT.h diff --git a/libs/pbd3/pbd/selectable.h b/libs/pbd/pbd/selectable.h index 470bc3cfcc..470bc3cfcc 100644 --- a/libs/pbd3/pbd/selectable.h +++ b/libs/pbd/pbd/selectable.h diff --git a/libs/pbd3/pbd/stacktrace.h b/libs/pbd/pbd/stacktrace.h index d7278bd35a..d7278bd35a 100644 --- a/libs/pbd3/pbd/stacktrace.h +++ b/libs/pbd/pbd/stacktrace.h diff --git a/libs/pbd3/pbd/stl_delete.h b/libs/pbd/pbd/stl_delete.h index 6e5bfa0734..6e5bfa0734 100644 --- a/libs/pbd3/pbd/stl_delete.h +++ b/libs/pbd/pbd/stl_delete.h diff --git a/libs/pbd3/pbd/stl_functors.h b/libs/pbd/pbd/stl_functors.h index 4a96e91a28..4a96e91a28 100644 --- a/libs/pbd3/pbd/stl_functors.h +++ b/libs/pbd/pbd/stl_functors.h diff --git a/libs/pbd3/pbd/strsplit.h b/libs/pbd/pbd/strsplit.h index e55ad1c825..e55ad1c825 100644 --- a/libs/pbd3/pbd/strsplit.h +++ b/libs/pbd/pbd/strsplit.h diff --git a/libs/pbd3/pbd/textreceiver.h b/libs/pbd/pbd/textreceiver.h index b8bfe5bc78..b8bfe5bc78 100644 --- a/libs/pbd3/pbd/textreceiver.h +++ b/libs/pbd/pbd/textreceiver.h diff --git a/libs/pbd3/pbd/thrown_error.h b/libs/pbd/pbd/thrown_error.h index 83cf8acfac..83cf8acfac 100644 --- a/libs/pbd3/pbd/thrown_error.h +++ b/libs/pbd/pbd/thrown_error.h diff --git a/libs/pbd3/pbd/tokenizer.h b/libs/pbd/pbd/tokenizer.h index a976b79341..a976b79341 100644 --- a/libs/pbd3/pbd/tokenizer.h +++ b/libs/pbd/pbd/tokenizer.h diff --git a/libs/pbd3/pbd/touchable.h b/libs/pbd/pbd/touchable.h index 0298574dfa..0298574dfa 100644 --- a/libs/pbd3/pbd/touchable.h +++ b/libs/pbd/pbd/touchable.h diff --git a/libs/pbd3/pbd/transmitter.h b/libs/pbd/pbd/transmitter.h index 357cb9965f..357cb9965f 100644 --- a/libs/pbd3/pbd/transmitter.h +++ b/libs/pbd/pbd/transmitter.h diff --git a/libs/pbd3/pbd/undo.h b/libs/pbd/pbd/undo.h index f067635ed3..f067635ed3 100644 --- a/libs/pbd3/pbd/undo.h +++ b/libs/pbd/pbd/undo.h diff --git a/libs/pbd3/pbd/whitespace.h b/libs/pbd/pbd/whitespace.h index 6620a8fb50..6620a8fb50 100644 --- a/libs/pbd3/pbd/whitespace.h +++ b/libs/pbd/pbd/whitespace.h diff --git a/libs/pbd3/pbd/xml++.h b/libs/pbd/pbd/xml++.h index afb896e1d5..afb896e1d5 100644 --- a/libs/pbd3/pbd/xml++.h +++ b/libs/pbd/pbd/xml++.h diff --git a/libs/pbd3/pool.cc b/libs/pbd/pool.cc index 089766482d..089766482d 100644 --- a/libs/pbd3/pool.cc +++ b/libs/pbd/pool.cc diff --git a/libs/pbd3/pthread_utils.cc b/libs/pbd/pthread_utils.cc index db242cea7b..db242cea7b 100644 --- a/libs/pbd3/pthread_utils.cc +++ b/libs/pbd/pthread_utils.cc diff --git a/libs/pbd3/receiver.cc b/libs/pbd/receiver.cc index 5e7c10de70..5e7c10de70 100644 --- a/libs/pbd3/receiver.cc +++ b/libs/pbd/receiver.cc diff --git a/libs/pbd3/stacktrace.cc b/libs/pbd/stacktrace.cc index 1e7dfa08e9..1e7dfa08e9 100644 --- a/libs/pbd3/stacktrace.cc +++ b/libs/pbd/stacktrace.cc diff --git a/libs/pbd3/strsplit.cc b/libs/pbd/strsplit.cc index 7f29a77887..7f29a77887 100644 --- a/libs/pbd3/strsplit.cc +++ b/libs/pbd/strsplit.cc diff --git a/libs/pbd3/textreceiver.cc b/libs/pbd/textreceiver.cc index 43620e9830..43620e9830 100644 --- a/libs/pbd3/textreceiver.cc +++ b/libs/pbd/textreceiver.cc diff --git a/libs/pbd3/transmitter.cc b/libs/pbd/transmitter.cc index 876a9d86e5..876a9d86e5 100644 --- a/libs/pbd3/transmitter.cc +++ b/libs/pbd/transmitter.cc diff --git a/libs/pbd3/undo.cc b/libs/pbd/undo.cc index f2f11b1c5c..f2f11b1c5c 100644 --- a/libs/pbd3/undo.cc +++ b/libs/pbd/undo.cc diff --git a/libs/pbd3/whitespace.cc b/libs/pbd/whitespace.cc index 7f74940457..7f74940457 100644 --- a/libs/pbd3/whitespace.cc +++ b/libs/pbd/whitespace.cc diff --git a/libs/pbd3/xml++.cc b/libs/pbd/xml++.cc index e496d8b2fd..e496d8b2fd 100644 --- a/libs/pbd3/xml++.cc +++ b/libs/pbd/xml++.cc diff --git a/libs/surfaces/control_protocol/SConscript b/libs/surfaces/control_protocol/SConscript index f8a7d574f5..ce59b1c67c 100644 --- a/libs/surfaces/control_protocol/SConscript +++ b/libs/surfaces/control_protocol/SConscript @@ -34,7 +34,7 @@ cp.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"") cp.Merge ([ libraries['ardour'], libraries['sigc2'], - libraries['pbd3'], + libraries['pbd'], libraries['midi++2'], libraries['xml'], libraries['usb'], diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript index 1760eb24e9..213a81a99d 100644 --- a/libs/surfaces/generic_midi/SConscript +++ b/libs/surfaces/generic_midi/SConscript @@ -34,7 +34,7 @@ genericmidi.Merge ([ libraries['ardour'], libraries['ardour_cp'], libraries['midi++2'], - libraries['pbd3'], + libraries['pbd'], libraries['sigc2'], libraries['usb'], libraries['xml'], diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript index 8f3568aa8f..3f9cc5cc15 100644 --- a/libs/surfaces/tranzport/SConscript +++ b/libs/surfaces/tranzport/SConscript @@ -34,7 +34,7 @@ tranzport.Merge ([ libraries['ardour'], libraries['ardour_cp'], libraries['sigc2'], - libraries['pbd3'], + libraries['pbd'], libraries['midi++2'], libraries['xml'], libraries['usb'], |