From 8246f755cf7ef80cff1c8c54bcccceadabe0fb8f Mon Sep 17 00:00:00 2001
From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date: Sat, 31 Oct 2009 17:25:15 +0000
Subject: aiff: remove unused includes and fix flags order in Makefile.am

Also remove GST_PLUGINS_BASE_LIBS from LIBADD since we don't
need to link against any of the -base libs (we just use a define
from the gstaudio headers).
---
 gst/aiff/Makefile.am | 3 +--
 gst/aiff/aiffparse.c | 2 +-
 gst/aiff/aiffparse.h | 2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/gst/aiff/Makefile.am b/gst/aiff/Makefile.am
index 8f4b3fc4a..923c2733c 100644
--- a/gst/aiff/Makefile.am
+++ b/gst/aiff/Makefile.am
@@ -2,11 +2,10 @@ plugin_LTLIBRARIES = libgstaiff.la
 
 libgstaiff_la_SOURCES = aiffparse.c
 libgstaiff_la_CFLAGS = \
-	$(GST_BASE_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) \
+	$(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS)
 libgstaiff_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) \
 	$(GST_BASE_LIBS) \
 	$(LIBM)
 libgstaiff_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/gst/aiff/aiffparse.c b/gst/aiff/aiffparse.c
index c62107857..81ce145ce 100644
--- a/gst/aiff/aiffparse.c
+++ b/gst/aiff/aiffparse.c
@@ -56,7 +56,7 @@
 #include <math.h>
 
 #include "aiffparse.h"
-#include "gst/audio/audio.h"
+#include <gst/audio/audio.h>
 #include <gst/gst-i18n-plugin.h>
 
 GST_DEBUG_CATEGORY_STATIC (aiffparse_debug);
diff --git a/gst/aiff/aiffparse.h b/gst/aiff/aiffparse.h
index daca59ccf..9cb745320 100644
--- a/gst/aiff/aiffparse.h
+++ b/gst/aiff/aiffparse.h
@@ -23,8 +23,6 @@
 
 
 #include <gst/gst.h>
-#include "gst/riff/riff-ids.h"
-#include "gst/riff/riff-read.h"
 #include <gst/base/gstadapter.h>
 
 G_BEGIN_DECLS
-- 
cgit v1.2.3