git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@773917 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
This commit is contained in:
Scott Wheeler
2008-02-12 04:24:45 +00:00
parent 8153052e12
commit 9df8927f4c
5 changed files with 10 additions and 10 deletions

View File

@ -4,12 +4,12 @@ INCLUDES = \
-I$(top_srcdir)/taglib/mpeg \
-I$(top_srcdir)/taglib/ogg \
-I$(top_srcdir)/taglib/ogg/vorbis \
-I$(top_srcdir)/taglib/ogg/speex \
-I$(top_srcdir)/taglib/ogg/flac \
-I$(top_srcdir)/taglib/flac \
-I$(top_srcdir)/taglib/mpc \
-I$(top_srcdir)/taglib/mpeg/id3v2 \
-I$(top_srcdir)/taglib/wavpack \
-I$(top_srcdir)/taglib/speex \
-I$(top_srcdir)/taglib/trueaudio \
$(all_includes)

View File

@ -8,11 +8,11 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/flac
${CMAKE_CURRENT_SOURCE_DIR}/mpc
${CMAKE_CURRENT_SOURCE_DIR}/ogg/vorbis
${CMAKE_CURRENT_SOURCE_DIR}/ogg/speex
${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v2
${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v1
${CMAKE_CURRENT_SOURCE_DIR}/ape
${CMAKE_CURRENT_SOURCE_DIR}/wavpack
${CMAKE_CURRENT_SOURCE_DIR}/speex
${CMAKE_CURRENT_SOURCE_DIR}/trueaudio
${CMAKE_CURRENT_BINARY_DIR}/taglib
${CMAKE_CURRENT_BINARY_DIR}/..
@ -28,7 +28,6 @@ ADD_SUBDIRECTORY( flac )
ADD_SUBDIRECTORY( ape )
ADD_SUBDIRECTORY( mpc )
ADD_SUBDIRECTORY( wavpack )
ADD_SUBDIRECTORY( speex )
ADD_SUBDIRECTORY( trueaudio )
@ -110,8 +109,8 @@ wavpack/wavpackproperties.cpp
)
SET(speex_SRCS
speex/speexfile.cpp
speex/speexproperties.cpp
ogg/speex/speexfile.cpp
ogg/speex/speexproperties.cpp
)
SET(trueaudio_SRCS

View File

@ -1,4 +1,4 @@
SUBDIRS = toolkit mpeg ogg flac ape mpc wavpack speex trueaudio
SUBDIRS = toolkit mpeg ogg flac ape mpc wavpack trueaudio
INCLUDES = \
-I$(top_srcdir)/taglib \
@ -9,8 +9,8 @@ INCLUDES = \
-I$(top_srcdir)/taglib/flac \
-I$(top_srcdir)/taglib/mpc \
-I$(top_srcdir)/taglib/ogg/vorbis \
-I$(top_srcdir)/taglib/ogg/speex \
-I$(top_srcdir)/taglib/wavpack \
-I$(top_srcdir)/taglib/speex \
-I$(top_srcdir)/taglib/trueaudio \
$(all_includes)
@ -22,5 +22,5 @@ taglib_includedir = $(includedir)/taglib
libtag_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 6:0:5
libtag_la_LIBADD = ./mpeg/libmpeg.la ./ogg/libogg.la ./flac/libflac.la ./mpc/libmpc.la \
./ape/libape.la ./toolkit/libtoolkit.la ./wavpack/libwavpack.la ./speex/libspeex.la \
./ape/libape.la ./toolkit/libtoolkit.la ./wavpack/libwavpack.la \
./trueaudio/libtrueaudio.la

View File

@ -1,4 +1,5 @@
ADD_SUBDIRECTORY( vorbis )
ADD_SUBDIRECTORY( speex )
ADD_SUBDIRECTORY( flac )
INSTALL( FILES oggfile.h oggpage.h oggpageheader.h xiphcomment.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib )

View File

@ -1,4 +1,4 @@
SUBDIRS = vorbis flac
SUBDIRS = vorbis flac speex
INCLUDES = -I$(top_srcdir)/taglib -I$(top_srcdir)/taglib/toolkit $(all_includes)
@ -18,4 +18,4 @@ taglib_include_HEADERS = \
taglib_includedir = $(includedir)/taglib
libogg_la_LIBADD = ./vorbis/libvorbis.la ./flac/liboggflac.la
libogg_la_LIBADD = ./vorbis/libvorbis.la ./flac/liboggflac.la ./speex/libspeex.la