Merged revisions 6292,6294-6295,6311,6314 via svnmerge from

svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/build_fixes

........
  r6292 | trutkin | 2009-12-05 08:31:25 -0500 (Sat, 05 Dec 2009) | 1 line
  
  remove scons build files
........
  r6294 | trutkin | 2009-12-05 09:11:17 -0500 (Sat, 05 Dec 2009) | 2 lines
  
  cairomm
  remove unnecessary vendor libraries as we now rely on the developer to install them
........
  r6295 | trutkin | 2009-12-05 09:12:54 -0500 (Sat, 05 Dec 2009) | 2 lines
  
  soundtouch
  remove unnecessary vendor libraries as we now rely on the developer to install them
........
  r6311 | trutkin | 2009-12-05 23:38:49 -0500 (Sat, 05 Dec 2009) | 2 lines

  glibmm2, gtkmm2, libgnomecanvasmm, sigc++2  
  remove unnecessary vendor libraries as we now rely on the developer to install them
........
  r6314 | trutkin | 2009-12-06 09:15:49 -0500 (Sun, 06 Dec 2009) | 4 lines
  
  remove scons referencing from Makefile
  
  - TODO: should move cscope stuff to waf and get rid of the Makefile
........


git-svn-id: svn://localhost/ardour2/branches/3.0@6315 d708f5d6-7413-0410-9779-e7cbd77b26cf

8 files changed, 0 insertions, 534 deletions

diff --git a/libs/surfaces/control_protocol/SConscript b/libs/surfaces/control_protocol/SConscript
deleted file mode 100644
index a9d60c6e25..0000000000
--- a/libs/surfaces/control_protocol/SConscript
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- python -*-
-
-import os
-import os.path
-import glob
-
-Import('env final_prefix install_prefix final_config_prefix libraries i18n')
-
-cp = env.Clone()
-
-#
-# this defines the version number of libardour_cp
-# 
-
-domain = 'ardour_cp'
-
-cp.Append(DOMAIN = domain, MAJOR = 1, MINOR = 0, MICRO = 0)
-cp.Append(CXXFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"")
-cp.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
-cp.Append(PACKAGE = domain)
-cp.Append(POTFILE = domain + '.pot')
-
-cp_files=Split("""
-basic_ui.cc
-control_protocol.cc
-smpte.cc
-""")
-
-cp.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
-cp.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
-cp.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")
-cp.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
-cp.Append(CPPPATH = libraries['jack'].get('CPPPATH', []))
-
-cp.Merge ([
-    libraries['ardour'],
-    libraries['sndfile'],
-    libraries['sigc2'],
-    libraries['pbd'],
-    libraries['midi++2'],
-    libraries['evoral'],
-    libraries['xml'],
-    libraries['glib2'],
-    libraries['glibmm2']
-	])
-
-libardour_cp = cp.SharedLibrary('ardour_cp', cp_files)
-
-Default(libardour_cp)
-
-if env['NLS']:
-	i18n (cp, cp_files, env)
-	      
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libardour_cp))
-
-env.Alias('tarball', env.Distribute (env['DISTTREE'],
-				     [ 'SConscript' ] +
-				     cp_files + 
-				     glob.glob('po/*.po') + glob.glob('*.h') + glob.glob('control_protocol/*.h')))
diff --git a/libs/surfaces/frontier/tranzport/SConscript b/libs/surfaces/frontier/tranzport/SConscript
deleted file mode 100644
index b3794899b5..0000000000
--- a/libs/surfaces/frontier/tranzport/SConscript
+++ /dev/null
@@ -1,57 +0,0 @@
-# -*- python -*-
-
-import os
-import os.path
-import glob
-
-Import('env final_prefix install_prefix final_config_prefix libraries i18n')
-
-tranzport = env.Clone()
-
-#
-# this defines the version number of libardour_tranzport
-# 
-
-domain = 'ardour_tranzport'
-
-tranzport.Append(DOMAIN = domain, MAJOR = 1, MINOR = 0, MICRO = 0)
-tranzport.Append(CXXFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"")
-tranzport.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
-tranzport.Append(PACKAGE = domain)
-tranzport.Append(POTFILE = domain + '.pot')
-
-tranzport_files=Split("""
-interface.cc
-tranzport_control_protocol.cc
-""")
-
-tranzport.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
-tranzport.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
-tranzport.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")
-tranzport.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
-
-tranzport.Merge ([
-    libraries['ardour'],
-    libraries['ardour_cp'],
-    libraries['sigc2'],
-    libraries['pbd'],
-    libraries['midi++2'],
-    libraries['evoral'],
-    libraries['xml'],
-    libraries['usb'],
-    libraries['glib2'],
-    libraries['glibmm2']
-    ])
-
-libardour_tranzport = tranzport.SharedLibrary('ardour_tranzport', tranzport_files)
-
-if tranzport['TRANZPORT']:
-	Default(libardour_tranzport)
-	if env['NLS']:
-		i18n (tranzport, tranzport_files, env)
-	env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'surfaces'), libardour_tranzport))
-
-env.Alias('tarball', env.Distribute (env['DISTTREE'],
-				     [ 'SConscript' ] +
-				     tranzport_files + 
-				     glob.glob('po/*.po') + glob.glob('*.h')))
diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript
deleted file mode 100644
index 86d879cdcd..0000000000
--- a/libs/surfaces/generic_midi/SConscript
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- python -*-
-
-import os
-import os.path
-import glob
-
-Import('env final_prefix install_prefix final_config_prefix libraries i18n')
-
-genericmidi = env.Clone()
-
-#
-# this defines the translation domain of libardour_genericmidi
-# 
-
-domain = 'ardour_genericmidi'
-
-genericmidi.Append(DOMAIN = domain, MAJOR = 1, MINOR = 0, MICRO = 0)
-genericmidi.Append(CXXFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"")
-genericmidi.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
-genericmidi.Append(PACKAGE = domain)
-genericmidi.Append(POTFILE = domain + '.pot')
-
-genericmidi_files=Split("""
-interface.cc
-generic_midi_control_protocol.cc
-midicontrollable.cc
-""")
-
-genericmidi.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
-genericmidi.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
-genericmidi.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")
-genericmidi.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
-genericmidi.Append(CPPPATH = libraries['jack'].get('CPPPATH', []))
-
-genericmidi.Merge ([
-	libraries['evoral'],
-	libraries['ardour'],
-	libraries['ardour_cp'],
-	libraries['sndfile'],
-	libraries['midi++2'],
-	libraries['evoral'],
-	libraries['pbd'],
-	libraries['sigc2'],
-	libraries['usb'],
-	libraries['xml'],
-	libraries['glib2'],
-	libraries['glibmm2']
-	])
-
-libardour_genericmidi = genericmidi.SharedLibrary('ardour_genericmidi', genericmidi_files)
-
-Default(libardour_genericmidi)
-
-if env['NLS']:
-	i18n (genericmidi, genericmidi_files, env)
-	      
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'surfaces'), libardour_genericmidi))
-
-env.Alias('tarball', env.Distribute (env['DISTTREE'],
-				     [ 'SConscript' ] +
-				     genericmidi_files + 
-				     glob.glob('po/*.po') + glob.glob('*.h')))
diff --git a/libs/surfaces/mackie/SConscript b/libs/surfaces/mackie/SConscript
deleted file mode 100644
index 392fa2dcff..0000000000
--- a/libs/surfaces/mackie/SConscript
+++ /dev/null
@@ -1,87 +0,0 @@
-# -*- python -*-
-
-import os
-import os.path
-import glob
-
-Import('env final_prefix install_prefix final_config_prefix libraries i18n')
-
-mackie = env.Clone()
-
-#
-# this defines the version number of libardour_mackie
-# 
-
-domain = 'ardour_mackie'
-
-mackie.Append(DOMAIN = domain, MAJOR = 1, MINOR = 1, MICRO = 0)
-mackie.Append(CXXFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"")
-mackie.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
-mackie.Append(PACKAGE = domain)
-mackie.Append(POTFILE = domain + '.pot')
-
-if mackie['DEBUG'] == 1:
-  mackie.Append(CXXFLAGS="-DDEBUG")
-  mackie.Append(CXXFLAGS="-DPORT_DEBUG")
-
-if mackie['IS_OSX']:
-    mackie.Append (LINKFLAGS="-Xlinker -headerpad -Xlinker 2048")
-
-mackie_files=Split("""
-interface.cc
-midi_byte_array.cc
-controls.cc
-surface_port.cc
-dummy_port.cc
-mackie_port.cc
-route_signal.cc
-mackie_midi_builder.cc
-mackie_button_handler.cc
-mackie_control_protocol_poll.cc
-types.cc
-surface.cc
-mackie_control_protocol.cc
-bcf_surface.cc
-bcf_surface_generated.cc
-mackie_surface.cc
-mackie_surface_generated.cc
-mackie_jog_wheel.cc
-""")
-
-mackie.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
-mackie.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
-mackie.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")
-mackie.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
-mackie.Append(CPPPATH = libraries['jack'].get('CPPPATH', []))
-
-mackie.Merge ([
-    libraries['evoral'],
-    libraries['ardour'],
-    libraries['ardour_cp'],
-    libraries['sigc2'],
-    libraries['pbd'],
-    libraries['midi++2'],
-    libraries['xml'],
-    libraries['glib2'],
-    libraries['glibmm2'],
-    libraries['sndfile']
-    ])
-
-libardour_mackie = mackie.SharedLibrary('ardour_mackie', mackie_files)
-
-test_files = Split("""
-midi_byte_array.cc
-test.cc
-""")
-mackie_test = Program('mackie_test', test_files )
-
-if mackie['SURFACES']:
-	Default(libardour_mackie)
-	if env['NLS']:
-		i18n (mackie, mackie_files, env)
-	env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3','surfaces'), libardour_mackie))
-
-env.Alias('tarball', env.Distribute (env['DISTTREE'],
-				     [ 'SConscript' ] +
-				     mackie_files + 
-				     glob.glob('po/*.po') + glob.glob('*.h')))
diff --git a/libs/surfaces/osc/SConscript b/libs/surfaces/osc/SConscript
deleted file mode 100644
index 2e1b0c7ac7..0000000000
--- a/libs/surfaces/osc/SConscript
+++ /dev/null
@@ -1,63 +0,0 @@
-# -*- python -*-
-
-import os
-import os.path
-import glob
-
-Import('env final_prefix install_prefix final_config_prefix libraries i18n')
-
-osc = env.Clone()
-
-#
-# this defines the translation domain of libardour_osc
-# 
-
-domain = 'ardour_osc'
-
-osc.Append(DOMAIN = domain, MAJOR = 1, MINOR = 0, MICRO = 0)
-osc.Append(CXXFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"")
-osc.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
-osc.Append(PACKAGE = domain)
-osc.Append(POTFILE = domain + '.pot')
-
-osc_files=Split("""
-osc.cc
-osc_controllable.cc
-interface.cc
-""")
-
-osc.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
-osc.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
-osc.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")
-osc.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
-osc.Append(CPPPATH = libraries['jack'].get('CPPPATH', []))
-
-osc.Merge ([
-	libraries['lo'],
-	libraries['midi++2'],
-	libraries['evoral'],
-	libraries['ardour'],
-	libraries['ardour_cp'],
-	libraries['pbd'],
-	libraries['sigc2'],
-	libraries['xml'],
-	libraries['glib2'],
-	libraries['glibmm2']
-	])
-
-libardour_osc = osc.SharedLibrary('ardour_osc', osc_files)
-
-if osc['HAVE_LIBLO']:
-	Default(libardour_osc)
-	if env['NLS']:
-		i18n (osc, osc_files, env)
-	env.Alias('install', env.Install(os.path.join(install_prefix, 
-						      env['LIBDIR'], 
-						      'ardour3', 
-						      'surfaces'), 
-					 libardour_osc))
-		
-env.Alias('tarball', env.Distribute (env['DISTTREE'],
-				     [ 'SConscript' ] +
-				     osc_files + 
-				     glob.glob('po/*.po') + glob.glob('*.h')))
diff --git a/libs/surfaces/powermate/SConscript b/libs/surfaces/powermate/SConscript
deleted file mode 100644
index 3e01e2042b..0000000000
--- a/libs/surfaces/powermate/SConscript
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- python -*-
-
-import os
-import os.path
-import glob
-
-Import('env final_prefix install_prefix final_config_prefix libraries i18n')
-
-powermate = env.Clone()
-
-#
-# this defines the version number of powermate
-# 
-
-domain = 'ardour_powermate'
-
-powermate.Append(DOMAIN = domain, MAJOR = 1, MINOR = 0, MICRO = 0)
-powermate.Append(CXXFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"")
-powermate.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
-powermate.Append(PACKAGE = domain)
-powermate.Append(POTFILE = domain + '.pot')
-
-powermate_files=Split("""
-interface.cc
-powermate.cc
-""")
-
-powermate.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
-powermate.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
-powermate.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")
-powermate.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
-
-powermate.Merge ([
-    libraries['evoral'],
-    libraries['ardour'],
-    libraries['ardour_cp'],
-    libraries['sigc2'],
-    libraries['pbd'],
-    libraries['midi++2'],
-    libraries['evoral'],
-    libraries['xml'],
-    libraries['usb'],
-    libraries['glib2'],
-    libraries['glibmm2']
-    ])
-
-libardour_powermate = powermate.SharedLibrary('ardour_powermate', powermate_files)
-
-if env['POWERMATE']:
-	Default(libardour_powermate)
-
-	if env['NLS']:
-		i18n (powermate, powermate_files, env)
-	      
-	env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'surfaces'), libardour_powermate))
-
-	env.Alias('tarball', env.Distribute (env['DISTTREE'],
-					     [ 'SConscript' ] +
-					     powermate_files + 
-					     glob.glob('po/*.po') + glob.glob('*.h')))
-
diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript
deleted file mode 100644
index 31630fb2e0..0000000000
--- a/libs/surfaces/tranzport/SConscript
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*- python -*-
-
-import os
-import os.path
-import glob
-
-Import('env final_prefix install_prefix final_config_prefix libraries i18n')
-
-tranzport = env.Clone()
-
-#
-# this defines the version number of libardour_tranzport
-# 
-
-domain = 'ardour_tranzport'
-
-tranzport.Append(DOMAIN = domain, MAJOR = 1, MINOR = 0, MICRO = 0)
-tranzport.Append(CXXFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"")
-tranzport.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
-tranzport.Append(PACKAGE = domain)
-tranzport.Append(POTFILE = domain + '.pot')
-
-tranzport_files=Split("""
-interface.cc
-buttons.cc
-io.cc
-io_usb.cc
-panner.cc
-lights.cc
-screen.cc
-state.cc
-wheel_modes.cc
-button_events.cc
-general.cc
-lcd.cc
-mode.cc
-show.cc
-init.cc
-wheel.cc
-""")
-
-#figure out when to do
-#io_usb.cc
-#io_midi.cc
-#io_kernel.cc
-
-tranzport.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
-tranzport.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
-tranzport.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")
-tranzport.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
-#if env['HAVE_TRANZPORT_KERNEL_DRIVER']:
-#    tranzport.Append(CXXFLAGS="-DHAVE_TRANZPORT_KERNEL_DRIVER=1")
-
-#merge more into tranzport files for the right io lib
-tranzport.Append(CPPPATH = libraries['jack'].get('CPPPATH', []))
-
-tranzport.Merge ([
-    libraries['evoral'],
-    libraries['ardour'],
-    libraries['ardour_cp'],
-    libraries['sigc2'],
-    libraries['pbd'],
-    libraries['midi++2'],
-    libraries['xml'],
-    libraries['glib2'],
-    libraries['glibmm2'],
-    libraries['usb'],
-    libraries['sndfile']
-    ])
-
-libardour_tranzport = tranzport.SharedLibrary('ardour_tranzport', tranzport_files)
-
-if tranzport['TRANZPORT']:
-    Default(libardour_tranzport)
-    if env['NLS']:
-        i18n (tranzport, tranzport_files, env)
-#    if env['HAVE_TRANZPORT_KERNEL_DRIVER']:
-#        tranzport.Merge([ libraries['usb'] ])
-    env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'surfaces'), libardour_tranzport))
-
-env.Alias('tarball', env.Distribute (env['DISTTREE'],
-                     [ 'SConscript' ] +
-                     tranzport_files + 
-                     glob.glob('po/*.po') + glob.glob('*.h')))
diff --git a/libs/surfaces/wiimote/SConscript b/libs/surfaces/wiimote/SConscript
deleted file mode 100644
index eee54f37e4..0000000000
--- a/libs/surfaces/wiimote/SConscript
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- python -*-
-
-import os
-import os.path
-import glob
-
-Import('env final_prefix install_prefix final_config_prefix libraries i18n')
-
-wiimote = env.Clone()
-
-#
-# this defines the version number of libardour_wiimote
-# 
-
-domain = 'ardour_wiimote'
-
-wiimote.Append(DOMAIN = domain, MAJOR = 1, MINOR = 0, MICRO = 0)
-wiimote.Append(CXXFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"")
-wiimote.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
-wiimote.Append(PACKAGE = domain)
-wiimote.Append(POTFILE = domain + '.pot')
-
-wiimote_files=Split("""
-wiimote.cc
-interface.cc
-""")
-
-wiimote.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
-wiimote.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
-wiimote.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")
-wiimote.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
-wiimote.Append(LINKFLAGS="-lcwiid")
-#wiimote.Append(CPPPATH = libraries['jack'].get('CPPPATH', []))
-
-wiimote.Merge ([
-	libraries['ardour'],
-	libraries['ardour_cp'],
-	libraries['evoral'],
-	libraries['sndfile'],
-	libraries['midi++2'],
-	libraries['pbd'],
-	libraries['sigc2'],
-	libraries['usb'],
-	libraries['xml'],
-	libraries['glib2'],
-	libraries['glibmm2']
-	])
-
-libardour_wiimote = wiimote.SharedLibrary('ardour_wiimote', wiimote_files)
-
-if wiimote['WIIMOTE']:
-	Default(libardour_wiimote)
-	env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'surfaces'), libardour_wiimote))
-
-if env['NLS']:
-	i18n (wiimote, wiimote_files, env)
-
-env.Alias('tarball', env.Distribute (env['DISTTREE'],
-				     [ 'SConscript' ] +
-				     wiimote_files + 
-				     glob.glob('po/*.po') + glob.glob('*.h')))