Fix Automake build

Patch by Stephen F. Booth

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@1167433 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

diff --git a/bindings/c/Makefile.am b/bindings/c/Makefile.am
index 8bb011025bd0b580d859373c61773beef0fa3fe6..a4ab4444340a1d965db5b27de8f58f962f5d54b9 100644 (file)
--- a/bindings/c/Makefile.am
+++ b/bindings/c/Makefile.am
@@ -11,6 +11,7 @@ INCLUDES = \
        -I$(top_srcdir)/taglib/mpc \
        -I$(top_srcdir)/taglib/mp4 \
        -I$(top_srcdir)/taglib/mpeg/id3v2 \
+       -I$(top_srcdir)/taglib/mpeg/id3v2/frames \
        -I$(top_srcdir)/taglib/wavpack \
        -I$(top_srcdir)/taglib/trueaudio \
        $(all_includes)

diff --git a/taglib/Makefile.am b/taglib/Makefile.am
index e1df6aaae2eb87972f234c9ff6749e80a15dd460..30f1c750474cbf69fb49dd35f1ccef63365dd95a 100644 (file)
--- a/taglib/Makefile.am
+++ b/taglib/Makefile.am
@@ -18,7 +18,9 @@ INCLUDES = \
        -I$(top_srcdir)/taglib/riff \
        -I$(top_srcdir)/taglib/riff/aiff \
        -I$(top_srcdir)/taglib/riff/wav \
+       -I$(top_srcdir)/taglib/ape \
        -I$(top_srcdir)/taglib/mpeg/id3v2 \
+       -I$(top_srcdir)/taglib/mpeg/id3v2/frames \
        $(all_includes)
 
 lib_LTLIBRARIES = libtag.la

diff --git a/taglib/ape/Makefile.am b/taglib/ape/Makefile.am
index 2b6931ed8d124ee28fa17730d63432a7064d3493..08b3f9ed8ac96002e82a438b327ecb709dd8ca62 100644 (file)
--- a/taglib/ape/Makefile.am
+++ b/taglib/ape/Makefile.am
@@ -2,6 +2,8 @@ DEFS = -DMAKE_TAGLIB_LIB @DEFS@
 INCLUDES = \
        -I$(top_srcdir)/taglib \
        -I$(top_srcdir)/taglib/toolkit \
+       -I$(top_srcdir)/taglib/mpeg/id3v1 -I../mpeg/id3v1 \
+       -I$(top_srcdir)/taglib/mpeg/id3v2 -I../mpeg/id3v2 \
        $(all_includes)
 
 noinst_LTLIBRARIES = libape.la

diff --git a/taglib/ape/apefile.cpp b/taglib/ape/apefile.cpp
index 63d03ae13823022e0271ff70c73495b54867c6d2..570ebfe7423f6d70784ab5c5681a02d87a9a8e1c 100644 (file)
--- a/taglib/ape/apefile.cpp
+++ b/taglib/ape/apefile.cpp
@@ -35,9 +35,9 @@
 #include <tstring.h>
 #include <tdebug.h>
 #include <tagunion.h>
+#include <id3v1tag.h>
 
 #include "apefile.h"
-#include "id3v1tag.h"
 
 #include "apetag.h"
 #include "apefooter.h"