Various fixes that collectively allow `make dist` to work.

Original commit message from CVS:
Various fixes that collectively allow `make dist` to work.

diff --git a/.gitignore b/.gitignore
index 5e1312d..52b9d01 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ config.log
 config.status
 config.sub
 configure
+gstreamer-[0-9]*
 gstreamer-config
 gstreamer.spec
 libtool

diff --git a/acconfig.h b/acconfig.h
index 9ac8f17..16f4685 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -6,6 +6,7 @@
 #undef HAVE_LIBXML
 #undef HAVE_LIBMMX
 #undef HAVE_XAUDIO
+#undef HAVE_CSSAUTH
 
 #undef HAVE_ATOMIC_H
 

diff --git a/config.h.in b/config.h.in
index cd80000..8cc2bd5 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -14,6 +14,7 @@
 #undef HAVE_LIBXML
 #undef HAVE_LIBMMX
 #undef HAVE_XAUDIO
+#undef HAVE_CSSAUTH
 
 #undef HAVE_ATOMIC_H
 

diff --git a/configure.in b/configure.in
index 3a7916a..cbd0283 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -66,14 +66,10 @@ AM_CONDITIONAL(HAVE_LIBXML, test "x$HAVE_LIBXML" = "xyes")
 
 
 AC_CHECK_HEADER(mmx.h,[
-  AC_DEFINE(HAVE_LIBMMX), []])
-AM_CONDITIONAL(HAVE_LIBMMX, test "x$HAVE_LIBMMX" = "xyes")
-
-AC_CHECK_HEADER(xaudio/decoder.h,[
-  AC_DEFINE(HAVE_XAUDIO) 
-  HAVE_XAUDIO="yes", []
+  AC_DEFINE(HAVE_LIBMMX)
+  HAVE_LIBMMX="yes", []
 ])
-AM_CONDITIONAL(HAVE_XAUDIO, test "x$HAVE_XAUDIO" = "xyes")
+AM_CONDITIONAL(HAVE_LIBMMX, test "x$HAVE_LIBMMX" = "xyes")
 
 AC_CHECK_HEADER(xaudio/decoder.h,[
   AC_DEFINE(HAVE_XAUDIO) 
@@ -109,12 +105,12 @@ dnl check if css.c exists (FIXME)
 if test -f plugins/dvdsrc/css.c
 then
   AC_MSG_RESULT(yes)
-  HAVE_DECSS="yes"
+  HAVE_CSSAUTH="yes"
 else
   AC_MSG_RESULT(no)
-  HAVE_DECSS="no"
+  HAVE_CSSAUTH="no"
 fi
-AM_CONDITIONAL(HAVE_DECSS, test "x$HAVE_DECSS" = "xyes")
+AM_CONDITIONAL(HAVE_CSSAUTH, test "x$HAVE_CSSAUTH" = "xyes")
 
 
 AC_SUBST(CFLAGS)

diff --git a/test/Makefile.am b/test/Makefile.am
index 50c6b26..4f940c4 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,7 +2,7 @@
 bin_PROGRAMS = qtest spectrum record wave mp3 teardown buffer mp3parse \
                mpeg2parse mp3play ac3parse ac3play dvdcat fake cobin
 
-SUBDIRS = xml cothreads
+SUBDIRS = xml cothreads bindings
 
 spectrum_CFLAGS = $(shell gnome-config --cflags gnomeui)
 spectrum_LDFLAGS = $(shell gnome-config --libs gnomeui)
@@ -13,6 +13,8 @@ buffer_SOURCES = buffer.c mem.c
 teardown_SOURCES = teardown.c mem.c
 ac3play_SOURCES = ac3play.c mem.c
 
+noinst_HEADERS = mem.h
+
 LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
 
 INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir) \

diff --git a/test/cothreads/Makefile.am b/test/cothreads/Makefile.am
index f60104e..6ba1bb8 100644 (file)
--- a/test/cothreads/Makefile.am
+++ b/test/cothreads/Makefile.am
@@ -3,3 +3,5 @@ bin_PROGRAMS = test simple
 test_SOURCES = test.c cothreads.c object.c looper.c
 
 simple_SOURCES = simple.c cothreads.c
+
+noinst_HEADERS = cothreads.h object.h looper.h

diff --git a/test/xml/Makefile.am b/test/xml/Makefile.am
index 59c91ed..dcac2c1 100644 (file)
--- a/test/xml/Makefile.am
+++ b/test/xml/Makefile.am
@@ -3,4 +3,4 @@ bin_PROGRAMS = readreg createreg
 INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) -I$(top_srcdir)
 LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(XML_LIBS) $(top_srcdir)/gst/libgst.la
 
-EXTRA_DIST = README registry.xml
+EXTRA_DIST = README