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

1 files changed, 0 insertions, 136 deletions

diff --git a/libs/taglib/SConscript b/libs/taglib/SConscript
deleted file mode 100644
index 2543bed4a8..0000000000
--- a/libs/taglib/SConscript
+++ /dev/null
@@ -1,136 +0,0 @@
-# -*- python -*-
-
-import os.path
-import os
-import glob
-from shutil import copy
-
-Import('env install_prefix libraries')
-taglib = env.Clone()
-
-taglib_files = glob.glob ('taglib/*.cpp')
-taglib_files += glob.glob ('taglib/flac/*.cpp')
-taglib_files += glob.glob ('taglib/mpc/*.cpp')
-taglib_files += glob.glob ('taglib/mpeg/*.cpp')
-taglib_files += glob.glob ('taglib/mpeg/id3v1/*.cpp')
-taglib_files += glob.glob ('taglib/mpeg/id3v2/*.cpp')
-taglib_files += glob.glob ('taglib/mpeg/id3v2/frames/*.cpp')
-taglib_files += glob.glob ('taglib/ogg/*.cpp')
-taglib_files += glob.glob ('taglib/ogg/vorbis/*.cpp')
-taglib_files += glob.glob ('taglib/ogg/speex/*.cpp')
-taglib_files += glob.glob ('taglib/ogg/flac/*.cpp')
-taglib_files += glob.glob ('taglib/trueaudio/*.cpp')
-taglib_files += glob.glob ('taglib/wavpack/*.cpp')
-taglib_files += glob.glob ('taglib/ape/*.cpp')
-taglib_files += glob.glob ('taglib/toolkit/*.cpp')
-
-
-domain = 'taglib'
-
-taglib.Append(CCFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"")
-taglib.Append(CCFLAGS = "-DHAVE_CONFIG_H=1")
-# mingw may need this
-#taglib.Append(CCFLAGS="-no-undefined")
-taglib.Append(PACKAGE = domain)
-taglib.Append(POTFILE = domain + '.pot')
-taglib.Append (CPPATH= [ '#libs/taglib/taglib',
-                         '#libs/taglib/taglib/toolkit',
-                         '#libs/taglib/taglib/flac' +
-                         '#libs/taglib/taglib/ape',
-                         '#libs/taglib/taglib/mpc',
-                         '#libs/taglib/taglib/mpeg',
-                         '#libs/taglib/taglib/mpeg/id3v1',
-                         '#libs/taglib/taglib/mpeg/id3v2',
-                         '#libs/taglib/taglib/wavpack',
-                         '#libs/taglib/taglib/trueaudio',
-                         '#libs/taglib/taglib/ogg'
-                         '#libs/taglib/taglib/ogg/vorbis'
-                         '#libs/taglib/taglib/ogg/speex'
-                         '#libs/taglib/taglib/ogg/flac'
-                        ],
-               CXXFLAGS= [ "-Ilibs/taglib/taglib",
-                           "-Ilibs/taglib/taglib/toolkit",
-                           "-Ilibs/taglib/taglib/flac",
-                           "-Ilibs/taglib/taglib/ape",
-                           "-Ilibs/taglib/taglib/mpc",
-                           "-Ilibs/taglib/taglib/mpeg",
-                           "-Ilibs/taglib/taglib/mpeg/id3v1",
-                           "-Ilibs/taglib/taglib/mpeg/id3v2",
-                           "-Ilibs/taglib/taglib/wavpack",
-                           "-Ilibs/taglib/taglib/trueaudio",
-                           "-Ilibs/taglib/taglib/ogg",
-                           "-Ilibs/taglib/taglib/ogg/vorbis",
-                           "-Ilibs/taglib/taglib/ogg/speex",
-                           "-Ilibs/taglib/taglib/ogg/flac"
-                           ]
-               )
-
-if env['IS_OSX']:
-    taglib.Append (LINKFLAGS= [ "-lz" ] )
-
-#conf = Configure(taglib)
-#taglib = conf.finish ()
-
-headers = Split ("""
-taglib/audioproperties.h
-taglib/fileref.h
-taglib/tag.h
-taglib/taglib_export.h
-taglib/tagunion.h
-taglib/ape/apefooter.h
-taglib/ape/apeitem.h
-taglib/ape/apetag.h
-taglib/flac/flacfile.h
-taglib/flac/flacproperties.h
-taglib/mpc/mpcfile.h
-taglib/mpc/mpcproperties.h
-taglib/mpeg/mpegfile.h
-taglib/mpeg/mpegheader.h
-taglib/mpeg/mpegproperties.h
-taglib/mpeg/xingheader.h
-taglib/ogg/oggfile.h
-taglib/ogg/oggpage.h
-taglib/ogg/oggpageheader.h
-taglib/ogg/xiphcomment.h
-taglib/toolkit/taglib.h
-taglib/toolkit/tbytevector.h
-taglib/toolkit/tbytevectorlist.h
-taglib/toolkit/tdebug.h
-taglib/toolkit/tfile.h
-taglib/toolkit/tlist.h
-taglib/toolkit/tlist.tcc
-taglib/toolkit/tmap.h
-taglib/toolkit/tmap.tcc
-taglib/toolkit/tstring.h
-taglib/toolkit/tstringlist.h
-taglib/toolkit/unicode.h
-taglib/trueaudio/trueaudiofile.h
-taglib/trueaudio/trueaudioproperties.h
-taglib/wavpack/wavpackfile.h
-taglib/wavpack/wavpackproperties.h
-""")
-
-libtaglib = taglib.SharedLibrary ('taglib', taglib_files)
- 
-config_h = taglib.Command('config.h', ['config.h.in'], 'cd libs/taglib && ./configure && cd -', ENV=os.environ)
-
-Default([config_h,libtaglib])
-
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libtaglib))
-
-env.Alias('tarball', env.Distribute (env['DISTTREE'],
-                                     [ 'AUTHORS',
-                                       'configure',
-                                       'config.h.in',
-                                       'acinclude.m4',
-                                       'Makefile.am',
-                                       'SConscript',
-                                       'taglib.pc.in',
-                                       'admin/config.sub',
-                                       'admin/config.guess',
-                                       'admin/conf.change.pl',
-                                       'admin/install-sh'
-                                     ] +
-                                     taglib_files +
-                                     headers
-                                     ))