From 056723b97cdabb6356deeed8a17d4d83b4b41ed6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Tue, 9 Jan 2007 13:35:08 +0000
Subject: [PATCH] ext/ogg/Makefile.am: Dist gstoggdemux.h to fix 'make
 distcheck'.

Original commit message from CVS:
* ext/ogg/Makefile.am:
Dist gstoggdemux.h to fix 'make distcheck'.
* sys/v4l/Makefile.am:
Fix 'make distcheck' even more.
---
 ChangeLog           | 8 ++++++++
 ext/ogg/Makefile.am | 3 +++
 sys/v4l/Makefile.am | 3 ++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d45acc11cc..10245d302f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-09  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* ext/ogg/Makefile.am:
+	  Dist gstoggdemux.h to fix 'make distcheck'.
+
+	* sys/v4l/Makefile.am:
+	  Fix 'make distcheck' even more.
+
 2007-01-09  Wim Taymans  <wim@fluendo.com>
 
 	* docs/plugins/Makefile.am:
diff --git a/ext/ogg/Makefile.am b/ext/ogg/Makefile.am
index abccd34659..e75bc42972 100644
--- a/ext/ogg/Makefile.am
+++ b/ext/ogg/Makefile.am
@@ -8,6 +8,9 @@ libgstogg_la_SOURCES = \
 	gstoggaviparse.c \
 	gstoggparse.c
 
+noinst_HEADERS = \
+	gstoggdemux.h
+
 libgstogg_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(OGG_CFLAGS) 
 libgstogg_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/riff/libgstriff-$(GST_MAJORMINOR).la \
diff --git a/sys/v4l/Makefile.am b/sys/v4l/Makefile.am
index 53c45b0ba0..0fc783d101 100644
--- a/sys/v4l/Makefile.am
+++ b/sys/v4l/Makefile.am
@@ -21,7 +21,8 @@ libgstvideo4linux_la_SOURCES = \
 #	gstv4lmjpegsrc.c v4lmjpegsrc_calls.c \
 #	gstv4lmjpegsink.c v4lmjpegsink_calls.c
 
-libgstvideo4linux_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/gst-libs
+libgstvideo4linux_la_CFLAGS = \
+	$(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS)
 libgstvideo4linux_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(xv_libs)