Use actually normal taglib headers (apparently it completely changes them on install. More idiotically layed out library tree, ever.).

Add symlinks to taglib source tree to mimick installed tree to avoid the copy thing. git-svn-id: svn://localhost/ardour2/branches/3.0@4674 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 03:24:05 +00:00
parent b80aa1fa9d
commit 906567d867
58 changed files with 62 additions and 24 deletions
--- a/2
+++ b/2
@@ -1221,7 +1221,7 @@ else:
                                          CPPPATH=['#libs', '#libs/soundtouch'])
    libraries['taglib'] = LibraryInfo(LIBS='libtaglib',
                                      LIBPATH='#libs/taglib',
-                                      CPPPATH=['#libs/taglib/headers','#libs/taglib/headers/taglib'])
+                                      CPPPATH=['#libs/taglib', '#libs/taglib/taglib'])
 #    libraries['libglademm'] = LibraryInfo(LIBS='libglademm',
 #                                          LIBPATH='#libs/libglademm',
 #                                          CPPPATH='#libs/libglademm')
--- a/libs/ardour/ardour/audiofile_tagger.h
+++ b/libs/ardour/ardour/audiofile_tagger.h
@@ -23,9 +23,9 @@

 #include <string>

-#include "taglib/ogg/xiphcomment.h"
 #include "taglib/tag.h"
-#include "taglib/toolkit/taglib.h"
+#include "taglib/taglib.h"
+#include "taglib/xiphcomment.h"

 using std::string;

--- a/libs/ardour/audiofile_tagger.cc
+++ b/libs/ardour/audiofile_tagger.cc
@@ -25,11 +25,11 @@
 #include "pbd/convert.h"

 #include "taglib/fileref.h"
-#include "taglib/flac/flacfile.h"
-#include "taglib/ogg/oggfile.h"
-#include "taglib/ogg/xiphcomment.h"
+#include "taglib/flacfile.h"
+#include "taglib/oggfile.h"
 #include "taglib/tag.h"
-#include "taglib/toolkit/taglib.h"
+#include "taglib/taglib.h"
+#include "taglib/xiphcomment.h"

 /* Convert Glib::ustring to TagLib::String */
 #define TL_STR(ustring) TagLib::String ((ustring).c_str(), TagLib::String::UTF8)
--- a/libs/taglib/SConscript
+++ b/libs/taglib/SConscript
@@ -112,25 +112,9 @@ taglib/wavpack/wavpackproperties.h

 libtaglib = taglib.SharedLibrary ('taglib', taglib_files)
 
-#
-# the header structure of this library is not very convenient
-# if you don't want to install the library. headers are distributed
-# all over the place, making a simple -Ipath flag for the compiler
-# rather difficult. This hack creates a directory and copies
-# the headers into it, allowing us to use -I#libs/taglib/headers
-#
-
-def headercopy(env, target, source):
-    if os.access (str(target[0]), os.X_OK) != True:
-        os.makedirs (str(target[0]))
-    for file in source : 
-        copy (str(file), str(target[0]))
-        
-header_dir = taglib.Command ('#libs/taglib/headers/taglib', headers, headercopy)
-
 config_h = taglib.Command('config.h', ['config.h.in'], 'cd libs/taglib && ./configure && cd -', ENV=os.environ)

-Default([config_h,header_dir,libtaglib])
+Default([config_h,libtaglib])

 env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libtaglib))

--- a/libs/taglib/taglib/apefooter.h
+++ b/libs/taglib/taglib/apefooter.h
@@ -0,0 +1 @@
+./ape/apefooter.h
--- a/libs/taglib/taglib/apeitem.h
+++ b/libs/taglib/taglib/apeitem.h
@@ -0,0 +1 @@
+./ape/apeitem.h
--- a/libs/taglib/taglib/apetag.h
+++ b/libs/taglib/taglib/apetag.h
@@ -0,0 +1 @@
+./ape/apetag.h
--- a/libs/taglib/taglib/attachedpictureframe.h
+++ b/libs/taglib/taglib/attachedpictureframe.h
@@ -0,0 +1 @@
+./mpeg/id3v2/frames/attachedpictureframe.h
--- a/libs/taglib/taglib/commentsframe.h
+++ b/libs/taglib/taglib/commentsframe.h
@@ -0,0 +1 @@
+./mpeg/id3v2/frames/commentsframe.h
--- a/libs/taglib/taglib/flacfile.h
+++ b/libs/taglib/taglib/flacfile.h
@@ -0,0 +1 @@
+./flac/flacfile.h
--- a/libs/taglib/taglib/flacproperties.h
+++ b/libs/taglib/taglib/flacproperties.h
@@ -0,0 +1 @@
+./flac/flacproperties.h
--- a/libs/taglib/taglib/generalencapsulatedobjectframe.h
+++ b/libs/taglib/taglib/generalencapsulatedobjectframe.h
@@ -0,0 +1 @@
+./mpeg/id3v2/frames/generalencapsulatedobjectframe.h
--- a/libs/taglib/taglib/id3v1genres.h
+++ b/libs/taglib/taglib/id3v1genres.h
@@ -0,0 +1 @@
+./mpeg/id3v1/id3v1genres.h
--- a/libs/taglib/taglib/id3v1tag.h
+++ b/libs/taglib/taglib/id3v1tag.h
@@ -0,0 +1 @@
+./mpeg/id3v1/id3v1tag.h
--- a/libs/taglib/taglib/id3v2extendedheader.h
+++ b/libs/taglib/taglib/id3v2extendedheader.h
@@ -0,0 +1 @@
+./mpeg/id3v2/id3v2extendedheader.h
--- a/libs/taglib/taglib/id3v2footer.h
+++ b/libs/taglib/taglib/id3v2footer.h
@@ -0,0 +1 @@
+./mpeg/id3v2/id3v2footer.h
--- a/libs/taglib/taglib/id3v2frame.h
+++ b/libs/taglib/taglib/id3v2frame.h
@@ -0,0 +1 @@
+./mpeg/id3v2/id3v2frame.h
--- a/libs/taglib/taglib/id3v2framefactory.h
+++ b/libs/taglib/taglib/id3v2framefactory.h
@@ -0,0 +1 @@
+./mpeg/id3v2/id3v2framefactory.h
--- a/libs/taglib/taglib/id3v2header.h
+++ b/libs/taglib/taglib/id3v2header.h
@@ -0,0 +1 @@
+./mpeg/id3v2/id3v2header.h
--- a/libs/taglib/taglib/id3v2synchdata.h
+++ b/libs/taglib/taglib/id3v2synchdata.h
@@ -0,0 +1 @@
+./mpeg/id3v2/id3v2synchdata.h
--- a/libs/taglib/taglib/id3v2tag.h
+++ b/libs/taglib/taglib/id3v2tag.h
@@ -0,0 +1 @@
+./mpeg/id3v2/id3v2tag.h
--- a/libs/taglib/taglib/mpcfile.h
+++ b/libs/taglib/taglib/mpcfile.h
@@ -0,0 +1 @@
+./mpc/mpcfile.h
--- a/libs/taglib/taglib/mpcproperties.h
+++ b/libs/taglib/taglib/mpcproperties.h
@@ -0,0 +1 @@
+./mpc/mpcproperties.h
--- a/libs/taglib/taglib/mpegfile.h
+++ b/libs/taglib/taglib/mpegfile.h
@@ -0,0 +1 @@
+./mpeg/mpegfile.h
--- a/libs/taglib/taglib/mpegheader.h
+++ b/libs/taglib/taglib/mpegheader.h
@@ -0,0 +1 @@
+./mpeg/mpegheader.h
--- a/libs/taglib/taglib/mpegproperties.h
+++ b/libs/taglib/taglib/mpegproperties.h
@@ -0,0 +1 @@
+./mpeg/mpegproperties.h
--- a/libs/taglib/taglib/oggfile.h
+++ b/libs/taglib/taglib/oggfile.h
@@ -0,0 +1 @@
+./ogg/oggfile.h
--- a/libs/taglib/taglib/oggflacfile.h
+++ b/libs/taglib/taglib/oggflacfile.h
@@ -0,0 +1 @@
+./ogg/flac/oggflacfile.h
--- a/libs/taglib/taglib/oggpage.h
+++ b/libs/taglib/taglib/oggpage.h
@@ -0,0 +1 @@
+./ogg/oggpage.h
--- a/libs/taglib/taglib/oggpageheader.h
+++ b/libs/taglib/taglib/oggpageheader.h
@@ -0,0 +1 @@
+./ogg/oggpageheader.h
--- a/libs/taglib/taglib/relativevolumeframe.h
+++ b/libs/taglib/taglib/relativevolumeframe.h
@@ -0,0 +1 @@
+./mpeg/id3v2/frames/relativevolumeframe.h
--- a/libs/taglib/taglib/speexfile.h
+++ b/libs/taglib/taglib/speexfile.h
@@ -0,0 +1 @@
+./ogg/speex/speexfile.h
--- a/libs/taglib/taglib/speexproperties.h
+++ b/libs/taglib/taglib/speexproperties.h
@@ -0,0 +1 @@
+./ogg/speex/speexproperties.h
--- a/libs/taglib/taglib/taglib.h
+++ b/libs/taglib/taglib/taglib.h
@@ -0,0 +1 @@
+./toolkit/taglib.h
--- a/libs/taglib/taglib/tbytevector.h
+++ b/libs/taglib/taglib/tbytevector.h
@@ -0,0 +1 @@
+./toolkit/tbytevector.h
--- a/libs/taglib/taglib/tbytevectorlist.h
+++ b/libs/taglib/taglib/tbytevectorlist.h
@@ -0,0 +1 @@
+./toolkit/tbytevectorlist.h
--- a/libs/taglib/taglib/tdebug.h
+++ b/libs/taglib/taglib/tdebug.h
@@ -0,0 +1 @@
+./toolkit/tdebug.h
--- a/libs/taglib/taglib/textidentificationframe.h
+++ b/libs/taglib/taglib/textidentificationframe.h
@@ -0,0 +1 @@
+./mpeg/id3v2/frames/textidentificationframe.h
--- a/libs/taglib/taglib/tfile.h
+++ b/libs/taglib/taglib/tfile.h
@@ -0,0 +1 @@
+./toolkit/tfile.h
--- a/libs/taglib/taglib/tlist.h
+++ b/libs/taglib/taglib/tlist.h
@@ -0,0 +1 @@
+./toolkit/tlist.h
--- a/libs/taglib/taglib/tlist.tcc
+++ b/libs/taglib/taglib/tlist.tcc
@@ -0,0 +1 @@
+toolkit/tlist.tcc
--- a/libs/taglib/taglib/tmap.h
+++ b/libs/taglib/taglib/tmap.h
@@ -0,0 +1 @@
+./toolkit/tmap.h
--- a/libs/taglib/taglib/tmap.tcc
+++ b/libs/taglib/taglib/tmap.tcc
@@ -0,0 +1 @@
+toolkit/tmap.tcc
--- a/libs/taglib/taglib/trueaudiofile.h
+++ b/libs/taglib/taglib/trueaudiofile.h
@@ -0,0 +1 @@
+./trueaudio/trueaudiofile.h
--- a/libs/taglib/taglib/trueaudioproperties.h
+++ b/libs/taglib/taglib/trueaudioproperties.h
@@ -0,0 +1 @@
+./trueaudio/trueaudioproperties.h
--- a/libs/taglib/taglib/tstring.h
+++ b/libs/taglib/taglib/tstring.h
@@ -0,0 +1 @@
+./toolkit/tstring.h
--- a/libs/taglib/taglib/tstringlist.h
+++ b/libs/taglib/taglib/tstringlist.h
@@ -0,0 +1 @@
+./toolkit/tstringlist.h
--- a/libs/taglib/taglib/unicode.h
+++ b/libs/taglib/taglib/unicode.h
@@ -0,0 +1 @@
+./toolkit/unicode.h
--- a/libs/taglib/taglib/uniquefileidentifierframe.h
+++ b/libs/taglib/taglib/uniquefileidentifierframe.h
@@ -0,0 +1 @@
+./mpeg/id3v2/frames/uniquefileidentifierframe.h
--- a/libs/taglib/taglib/unknownframe.h
+++ b/libs/taglib/taglib/unknownframe.h
@@ -0,0 +1 @@
+./mpeg/id3v2/frames/unknownframe.h
--- a/libs/taglib/taglib/unsynchronizedlyricsframe.h
+++ b/libs/taglib/taglib/unsynchronizedlyricsframe.h
@@ -0,0 +1 @@
+./mpeg/id3v2/frames/unsynchronizedlyricsframe.h
--- a/libs/taglib/taglib/urllinkframe.h
+++ b/libs/taglib/taglib/urllinkframe.h
@@ -0,0 +1 @@
+./mpeg/id3v2/frames/urllinkframe.h
--- a/libs/taglib/taglib/vorbisfile.h
+++ b/libs/taglib/taglib/vorbisfile.h
@@ -0,0 +1 @@
+./ogg/vorbis/vorbisfile.h
--- a/libs/taglib/taglib/vorbisproperties.h
+++ b/libs/taglib/taglib/vorbisproperties.h
@@ -0,0 +1 @@
+./ogg/vorbis/vorbisproperties.h
--- a/libs/taglib/taglib/wavpackfile.h
+++ b/libs/taglib/taglib/wavpackfile.h
@@ -0,0 +1 @@
+./wavpack/wavpackfile.h
--- a/libs/taglib/taglib/wavpackproperties.h
+++ b/libs/taglib/taglib/wavpackproperties.h
@@ -0,0 +1 @@
+./wavpack/wavpackproperties.h
--- a/libs/taglib/taglib/xingheader.h
+++ b/libs/taglib/taglib/xingheader.h
@@ -0,0 +1 @@
+./mpeg/xingheader.h
--- a/libs/taglib/taglib/xiphcomment.h
+++ b/libs/taglib/taglib/xiphcomment.h
@@ -0,0 +1 @@
+./ogg/xiphcomment.h
				`@@ -0,0 +1 @@`
				`./mpeg/id3v2/frames/generalencapsulatedobjectframe.h`
				`@@ -0,0 +1 @@`
				`./mpeg/id3v2/frames/textidentificationframe.h`
				`@@ -0,0 +1 @@`
				`./mpeg/id3v2/frames/uniquefileidentifierframe.h`
				`@@ -0,0 +1 @@`
				`./mpeg/id3v2/frames/unsynchronizedlyricsframe.h`