From 3608f875fec0ff1fd161ceae37425365e13e3467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 3 Sep 2009 08:46:52 +0200 Subject: [PATCH] Ship all required files in the tarballs and fix running of the unit test suite --- elementgen/Makefile.am | 3 ++- gstreamer-sharp/baseplugins/Makefile.am | 2 +- gstreamer-sharp/coreplugins/Makefile.am | 2 +- tests/Makefile.am | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/elementgen/Makefile.am b/elementgen/Makefile.am index 58b7796076..db40508939 100644 --- a/elementgen/Makefile.am +++ b/elementgen/Makefile.am @@ -17,5 +17,6 @@ CLEANFILES = $(TARGETS) $(DEBUGS) MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = \ - elementgen.cs + elementgen.cs \ + interfaces/*.cs diff --git a/gstreamer-sharp/baseplugins/Makefile.am b/gstreamer-sharp/baseplugins/Makefile.am index ade4d7ce1b..d0a016df6d 100644 --- a/gstreamer-sharp/baseplugins/Makefile.am +++ b/gstreamer-sharp/baseplugins/Makefile.am @@ -7,7 +7,7 @@ METADATA_FILES = decodebin.metadata playbin.metadata decodebin2.metadata playbin CS_FILES = $(patsubst %,generated/%.cs,$(ELEMENTS)) XML_FILES = $(patsubst %,%.xml,$(ELEMENTS)) -EXTRA_DIST = $(CUSTOM_FILES) $(INSPECT_FILES) +EXTRA_DIST = $(METADATA_FILES) $(CUSTOM_FILES) $(INSPECT_FILES) CLEANFILES = $(XML_FILES) $(CS_FILES) plugins-update: $(patsubst inspect/%.raw, inspect-%, $(INSPECT_FILES)) diff --git a/gstreamer-sharp/coreplugins/Makefile.am b/gstreamer-sharp/coreplugins/Makefile.am index fdd66355f7..843c14c089 100644 --- a/gstreamer-sharp/coreplugins/Makefile.am +++ b/gstreamer-sharp/coreplugins/Makefile.am @@ -12,7 +12,7 @@ OTHER_CS_FILES = memindex.cs \ fileindex.cs XML_FILES = $(patsubst %,%.xml,$(ELEMENTS)) -EXTRA_DIST = $(CUSTOM_FILES) $(INSPECT_FILES) $(OTHER_CS_FILES) +EXTRA_DIST = $(METADATA_FILES) $(CUSTOM_FILES) $(INSPECT_FILES) $(OTHER_CS_FILES) CLEANFILES = $(XML_FILES) $(CS_FILES) plugins-update: $(patsubst inspect/%.raw, inspect-%, $(INSPECT_FILES)) diff --git a/tests/Makefile.am b/tests/Makefile.am index 02aeef5595..2c572a2ef4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -8,8 +8,9 @@ $(ASSEMBLY): $(ASSEMBLY_CSFILES) $(CSC) $(MCS_FLAGS) -out:$@ -target:library -r:$(top_builddir)/gstreamer-sharp/gstreamer-sharp.dll $(ASSEMBLY_CSFILES) $(GLIBSHARP_LIBS) run-test: $(ASSEMBLY) - MONO_PATH="../gstreamer-sharp/" $(MONO) $(NUNIT_TESTER) -labels $(ASSEMBLY) + LD_LIBRARY_PATH=$(top_builddir)/gstreamer-sharp/glue/.libs:$$LD_LIBRARY_PATH MONO_PATH=$(top_builddir)/gstreamer-sharp $(MONO) $(NUNIT_TESTER) -labels $(ASSEMBLY) +EXTRA_DIST = $(ASSEMBLY_CSFILES) CLEANFILES = $(ASSEMBLY) *.mdb *.pdb TestResult.xml DISTCLEANFILES = Makefile.in