From 32a10b53d58dd4e08e701b4d4674c1bd68fb0928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= Date: Tue, 24 Aug 2010 15:50:35 +0000 Subject: [PATCH] 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 --- bindings/c/Makefile.am | 1 + taglib/Makefile.am | 2 ++ taglib/ape/Makefile.am | 2 ++ taglib/ape/apefile.cpp | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bindings/c/Makefile.am b/bindings/c/Makefile.am index 8bb01102..a4ab4444 100644 --- 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 e1df6aaa..30f1c750 100644 --- 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 2b6931ed..08b3f9ed 100644 --- 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 63d03ae1..570ebfe7 100644 --- a/taglib/ape/apefile.cpp +++ b/taglib/ape/apefile.cpp @@ -35,9 +35,9 @@ #include #include #include +#include #include "apefile.h" -#include "id3v1tag.h" #include "apetag.h" #include "apefooter.h"