From a4c996087e679a43d888446927e6e457b10bdb5f Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Sat, 9 Feb 2008 03:37:40 +0000 Subject: [PATCH] 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. --- ChangeLog | 11 +++++++++++ gst/selector/Makefile.am | 2 +- tests/check/Makefile.am | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 189f414a91..01dc65f693 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-02-09 Jan Schmidt + + * 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 * win32/vs6/libgstdshowdecwrapper.dsp: diff --git a/gst/selector/Makefile.am b/gst/selector/Makefile.am index ddeb90fdcb..bcab863e7f 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 598f35dfd9..a862b1e9fe 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