summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2008-02-09 03:37:40 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2008-02-09 03:37:40 +0000
commita4c996087e679a43d888446927e6e457b10bdb5f (patch)
tree690af7e8d81bb6dcbbc8cf9de2eb4662cae7a360
parentd2d7e672929c39a8971763e935b456f978e91c8c (diff)
downloadgst-plugins-bad-a4c996087e679a43d888446927e6e457b10bdb5f.tar.gz
gst-plugins-bad-a4c996087e679a43d888446927e6e457b10bdb5f.tar.bz2
gst-plugins-bad-a4c996087e679a43d888446927e6e457b10bdb5f.zip
gst/selector/Makefile.am: Listing the marshal.h in the nodist_HEADERS breaks distcheck, so let's not do that
Original commit message from CVS: * gst/selector/Makefile.am: Listing the marshal.h in the nodist_HEADERS breaks distcheck, so let's not do that * tests/check/Makefile.am: Disable the crashing cdaudio plugin from the states test so I can make pre-releases.
-rw-r--r--ChangeLog11
-rw-r--r--gst/selector/Makefile.am2
-rw-r--r--tests/check/Makefile.am2
3 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 189f414a..01dc65f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2008-02-09 Jan Schmidt <jan.schmidt@sun.com>
+ * gst/selector/Makefile.am:
+
+ Listing the marshal.h in the nodist_HEADERS breaks distcheck, so
+ let's not do that
+
+ * tests/check/Makefile.am:
+ Disable the crashing cdaudio plugin from the states test so I can make
+ pre-releases.
+
+2008-02-09 Jan Schmidt <jan.schmidt@sun.com>
+
* win32/vs6/libgstdshowdecwrapper.dsp:
* win32/vs6/libgstflv.dsp:
Convert to DOS line endings, and set -kb
diff --git a/gst/selector/Makefile.am b/gst/selector/Makefile.am
index ddeb90fd..bcab863e 100644
--- a/gst/selector/Makefile.am
+++ b/gst/selector/Makefile.am
@@ -19,4 +19,4 @@ libgstselector_la_CFLAGS = $(GST_CFLAGS)
libgstselector_la_LIBADD =
libgstselector_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS)
-noinst_HEADERS = gstinputselector.h gstoutputselector.h $(built_headers)
+noinst_HEADERS = gstinputselector.h gstoutputselector.h
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 598f35df..a862b1e9 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -13,7 +13,7 @@ TESTS_ENVIRONMENT = \
$(REGISTRY_ENVIRONMENT) \
GST_PLUGIN_SYSTEM_PATH= \
GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/sys:$(top_builddir)/ext:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR) \
- STATE_IGNORE_ELEMENTS="vcdsrc nassink glimagesink"
+ STATE_IGNORE_ELEMENTS="cdaudio vcdsrc nassink glimagesink"
EXTRA_DIST = test-cert.pem test-key.pem