[farsight2/master] Fix various Makefile details to make "make distcheck" pass

[Olivier Crête]

---
 Makefile.am                       |    3 +--
 gst-libs/gst/farsight/Makefile.am |    2 ++
 gst/funnel/Makefile.am            |    2 +-
 python/pyfarsightmodule.c         |    2 +-
 transmitters/Makefile.am          |    2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ff23e97..2fd8c36 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,8 +25,7 @@ DIST_SUBDIRS = 			\
 #	pkgconfig
 
 EXTRA_DIST = \
-	AUTHORS COPYING COPYING.LIB NEWS README RELEASE REQUIREMENTS \
-	ChangeLog autogen.sh
+	AUTHORS COPYING NEWS README ChangeLog autogen.sh
 
 ACLOCAL_AMFLAGS = -I common/m4
 
diff --git a/gst-libs/gst/farsight/Makefile.am b/gst-libs/gst/farsight/Makefile.am
index b3db3ca..f687cbb 100644
--- a/gst-libs/gst/farsight/Makefile.am
+++ b/gst-libs/gst/farsight/Makefile.am
@@ -23,6 +23,8 @@ BUILT_SOURCES = \
 		fs-enum-types.c \
 		fs-enum-types.h
 
+CLEANFILES = $(BUILT_SOURCES)
+
 libgstfarsight_ at GST_MAJORMINOR@_la_SOURCES = \
 		fs-base-conference.c \
 		fs-candidate.c \
diff --git a/gst/funnel/Makefile.am b/gst/funnel/Makefile.am
index 52b1645..e702c56 100644
--- a/gst/funnel/Makefile.am
+++ b/gst/funnel/Makefile.am
@@ -5,4 +5,4 @@ libfsfunnel_la_CFLAGS = $(FS2_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libfsfunnel_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libfsfunnel_la_LIBADD = $(FS2_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
 
-noinst_HEADERS = gstfsfunnel.c
+noinst_HEADERS = gstfsfunnel.h
diff --git a/python/pyfarsightmodule.c b/python/pyfarsightmodule.c
index 3a2a64a..f9bf2ee 100644
--- a/python/pyfarsightmodule.c
+++ b/python/pyfarsightmodule.c
@@ -1,5 +1,5 @@
 #include <pygobject.h>
-#include <gst-libs/gst/farsight/fs-codec.h>
+#include <gst/farsight/fs-codec.h>
 
 void fs_register_classes (PyObject *d);
 void fs_add_constants(PyObject *module, const gchar *strip_prefix);
diff --git a/transmitters/Makefile.am b/transmitters/Makefile.am
index 353b1f0..0a91f81 100644
--- a/transmitters/Makefile.am
+++ b/transmitters/Makefile.am
@@ -1,3 +1,3 @@
 
 SUBDIRS = $(FS2_TRANSMITTER_PLUGINS_SELECTED)
-DIST_SUBDIRS = $(FS2_TRANMITTER_PLUGINS_ALL)
+DIST_SUBDIRS = $(FS2_TRANSMITTER_PLUGINS_ALL)
-- 
1.5.6.5