From af356f46c65d6e43daa893d8323479c226dd2013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 3 Sep 2009 10:21:50 +0200 Subject: [PATCH] Fix make distcheck --- configure.ac | 3 --- doc/Makefile.am | 25 +++++++------------------ elementgen/Makefile.am | 4 ++-- elementgen/elementgen.cs | 15 ++++++++------- generator/Makefile.am | 2 ++ gstreamer-sharp/Makefile.am | 18 +++++++++--------- gstreamer-sharp/baseplugins/Makefile.am | 14 +++++++------- gstreamer-sharp/coreplugins/Makefile.am | 14 +++++++------- tests/Makefile.am | 2 ++ 9 files changed, 44 insertions(+), 53 deletions(-) diff --git a/configure.ac b/configure.ac index b2529adbc9..30acb6ba96 100644 --- a/configure.ac +++ b/configure.ac @@ -86,9 +86,6 @@ AC_SUBST(MONODOCER) AC_SUBST(MDASSEMBLER) AC_SUBST(MONODOCS2HTML) -MONODOC_SOURCESDIR=`pkg-config --variable=sourcesdir monodoc` -AC_SUBST(MONODOC_SOURCESDIR) - ## Versions of dependencies #GLIBSHARP_REQUIRED_VERSION=2.12.9.90 #PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-2.0 >= $GLIBSHARP_REQUIRED_VERSION) diff --git a/doc/Makefile.am b/doc/Makefile.am index fecfa17859..69544dc89e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,29 +1,18 @@ -if ENABLE_MONODOC -TARGETS = gstreamer-sharp-docs.zip gstreamer-sharp-docs.tree gstreamer-sharp-docs.source - ASSEMBLIES = \ $(top_builddir)/gstreamer-sharp/gstreamer-sharp.dll ASSEMBLIES_BUILD = $(foreach asm,$(ASSEMBLIES),$(addprefix -assembly:,$(asm))) -install-data-local: - mkdir -p $(DESTDIR)/$(MONODOC_SOURCESDIR) - install -m 644 $(srcdir)/gstreamer-sharp-docs.source \ - $(DESTDIR)/$(MONODOC_SOURCESDIR) - install -m 644 gstreamer-sharp-docs.tree \ - $(DESTDIR)/$(MONODOC_SOURCESDIR) - install -m 644 gstreamer-sharp-docs.zip \ - $(DESTDIR)/$(MONODOC_SOURCESDIR) - -uninstall-local: - rm -f $(DESTDIR)/$(MONODOC_SOURCESDIR)/gstreamer-sharp-docs.source - rm -f $(DESTDIR)/$(MONODOC_SOURCESDIR)/gstreamer-sharp-docs.tree - rm -f $(DESTDIR)/$(MONODOC_SOURCESDIR)/gstreamer-sharp-docs.zip +if ENABLE_MONODOC +SOURCESDIR=$(prefix)/lib/monodoc/sources +TARGETS=gstreamer-sharp-docs.zip gstreamer-sharp-docs.tree gstreamer-sharp-docs.source else -TARGETS = +SOURCESDIR=$(datadir) +TARGETS= endif -noinst_DATA = $(TARGETS) +monodocdir=$(SOURCESDIR) +monodoc_DATA=$(TARGETS) gstreamer-sharp-docs.zip gstreamer-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml $(MDASSEMBLER) --ecma $(srcdir)/en -o gstreamer-sharp-docs diff --git a/elementgen/Makefile.am b/elementgen/Makefile.am index db40508939..18d86c7d55 100644 --- a/elementgen/Makefile.am +++ b/elementgen/Makefile.am @@ -17,6 +17,6 @@ CLEANFILES = $(TARGETS) $(DEBUGS) MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = \ - elementgen.cs \ - interfaces/*.cs + $(srcdir)/elementgen.cs \ + $(srcdir)/interfaces/*.cs diff --git a/elementgen/elementgen.cs b/elementgen/elementgen.cs index 77691e1bb1..484712426a 100644 --- a/elementgen/elementgen.cs +++ b/elementgen/elementgen.cs @@ -247,7 +247,7 @@ public class ElementGen { return null; } - public static void writeElement (TextWriter writer, ElementInfo ei, StreamReader custom_code, XmlDocument api_doc) { + public static void writeElement (TextWriter writer, ElementInfo ei, StreamReader custom_code, XmlDocument api_doc, string interfaces_dir) { ArrayList enums = new ArrayList (); writer.WriteLine ("#region Autogenerated code"); @@ -398,13 +398,11 @@ public class ElementGen { } if (ei.interfaces.Count > 0) { - string path = Path.GetDirectoryName (System.Reflection.Assembly.GetCallingAssembly ().Location); - foreach (string iface in ei.interfaces) { writer.WriteLine ("#endregion"); writer.WriteLine ("#region Customized code"); writer.WriteLine ("#line 1 \"" + iface + ".cs\""); - StreamReader interface_code = System.IO.File.OpenText (path + "/interfaces/" + iface + ".cs"); + StreamReader interface_code = System.IO.File.OpenText (interfaces_dir + "/" + iface + ".cs"); string iface_code = interface_code.ReadToEnd (); writer.WriteLine (iface_code); } @@ -466,8 +464,8 @@ public class ElementGen { } public static int Main (string[] args) { - if (args.Length != 4) { - Console.Error.WriteLine ("Usage: element-gen --namespace= --api= --input= --customfile="); + if (args.Length != 5) { + Console.Error.WriteLine ("Usage: element-gen --namespace= --api= --input= --customfile= --interfacesdir="); return -1; } @@ -477,6 +475,7 @@ public class ElementGen { string filename = null; string customfile = null; StreamReader custom_code = null; + string interfaces_dir = null; foreach (string arg in args) { @@ -497,6 +496,8 @@ public class ElementGen { try { custom_code = System.IO.File.OpenText (customfile); } catch (Exception) { } // No custom file is OK + } else if (arg.StartsWith ("--interfacesdir=")) { + interfaces_dir = arg.Substring (16); } else if (arg.StartsWith ("--api=")) { string api_filename = arg.Substring (6); @@ -598,7 +599,7 @@ public class ElementGen { } } - writeElement (writer, ei, custom_code, api_doc); + writeElement (writer, ei, custom_code, api_doc, interfaces_dir); writer.WriteLine ("}"); diff --git a/generator/Makefile.am b/generator/Makefile.am index d70fd55c63..57dc559a12 100644 --- a/generator/Makefile.am +++ b/generator/Makefile.am @@ -63,6 +63,8 @@ dist_sources = $(sources) EXTRA_DIST = \ $(dist_sources) +CLEANFILES = gst-gapi_codegen.exe gst-gapi_codegen.exe.mdb + gst-gapi_codegen.exe: $(build_sources) $(CSC) -debug -out:gst-gapi_codegen.exe $(OFF_T_FLAGS) $(references) $(build_sources) diff --git a/gstreamer-sharp/Makefile.am b/gstreamer-sharp/Makefile.am index f90f5ea3c4..3b733a99a2 100644 --- a/gstreamer-sharp/Makefile.am +++ b/gstreamer-sharp/Makefile.am @@ -127,24 +127,24 @@ EXTRA_DIST = \ $(SYMBOLS) \ $(METADATA) \ $(customs) \ - $(sources) \ + $(build_sources) \ $(overrides) \ $(ASSEMBLY).config.in $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(srcdir)/$(SYMBOLS) - cp $(srcdir)/$(RAW_API) $(API) + cp $(srcdir)/$(RAW_API) $(builddir)/$(API) chmod u+w $(API) - $(MONO) $(top_builddir)/parser/gst-gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) \ - --symbols=$(srcdir)/$(SYMBOLS) + $(MONO) $(top_builddir)/parser/gst-gapi-fixup.exe --api=$(builddir)/$(API) \ + --metadata=$(srcdir)/$(METADATA) --symbols=$(srcdir)/$(SYMBOLS) generated-stamp: $(API) $(build_customs) $(overrides) - $(MONO) $(top_builddir)/generator/gst-gapi_codegen.exe --generate $(API) \ - --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ - --gluelib-name=gstreamersharpglue-0.10.dll --glue-filename=glue/generated.c \ + $(MONO) $(top_builddir)/generator/gst-gapi_codegen.exe --generate $(builddir)/$(API) \ + --outdir=$(builddir)/generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ + --gluelib-name=gstreamersharpglue-0.10.dll --glue-filename=$(builddir)/glue/generated.c \ --glue-includes=$(glue_includes) \ && cp $(overrides) $(builddir)/generated \ - && sed 's;public class ObjectManager;internal class ObjectManager;g' generated/ObjectManager.cs > generated/ObjectManager.cs.tmp \ - && mv generated/ObjectManager.cs.tmp generated/ObjectManager.cs \ + && sed 's;public class ObjectManager;internal class ObjectManager;g' $(builddir)/generated/ObjectManager.cs > $(builddir)/generated/ObjectManager.cs.tmp \ + && mv $(builddir)/generated/ObjectManager.cs.tmp $(builddir)/generated/ObjectManager.cs \ && touch generated-stamp coreplugins/generated/*.cs: $(API) $(builddir)/coreplugins/generated diff --git a/gstreamer-sharp/baseplugins/Makefile.am b/gstreamer-sharp/baseplugins/Makefile.am index 7c8264983a..2a0f6fbcd9 100644 --- a/gstreamer-sharp/baseplugins/Makefile.am +++ b/gstreamer-sharp/baseplugins/Makefile.am @@ -17,15 +17,15 @@ inspect-%: all: $(XML_FILES) $(CS_FILES) touch generated -generated/%.cs: $(top_builddir)/elementgen/element-gen.exe $(srcdir)/../gstreamer-api.xml $(CUSTOM_FILES) $(builddir)/%.xml +generated/%.cs: $(top_builddir)/elementgen/element-gen.exe $(top_builddir)/gstreamer-sharp/gstreamer-api.xml $(CUSTOM_FILES) $(builddir)/%.xml @mkdir -p generated $(MONO) $(top_builddir)/elementgen/element-gen.exe --namespace=$(NAMESPACE) \ - --api=$(srcdir)/../gstreamer-api.xml --input=$(patsubst generated/%.cs,$(builddir)/%.xml,$@) --customfile=$(patsubst generated/%.cs,$(srcdir)/%.custom,$@) > $@ + --api=$(top_builddir)/gstreamer-sharp/gstreamer-api.xml --input=$(patsubst generated/%.cs,$(builddir)/%.xml,$@) --customfile=$(patsubst generated/%.cs,$(srcdir)/%.custom,$@) --interfacesdir=$(top_srcdir)/elementgen/interfaces > $@ %.xml: $(top_builddir)/parser/gst-gapi-fixup.exe $(srcdir)/inspect/%.raw $(srcdir)/%.metadata - cp $(patsubst %.xml,$(srcdir)/inspect/%.raw,$@) $@ - $(MONO) $(top_builddir)/parser/gst-gapi-fixup.exe --api=$@ --metadata=$(patsubst %.xml,$(srcdir)/%.metadata,$@) - -%.xml: $(top_builddir)/parser/gst-gapi-fixup.exe $(srcdir)/inspect/%.raw - cp $(patsubst %.xml,$(srcdir)/inspect/%.raw,$@) $@ + cp $(patsubst %.xml,$(srcdir)/inspect/%.raw,$@) $(builddir)/$@ + chmod +w $(builddir)/$@ + $(MONO) $(top_builddir)/parser/gst-gapi-fixup.exe --api=$(builddir)/$@ --metadata=$(patsubst %.xml,$(srcdir)/%.metadata,$@) +%.xml: $(top_builddir)/parser/gst-gapi-fixup.exe $(srcdir)/inspect/%.raw + cp $(patsubst %.xml,$(srcdir)/inspect/%.raw,$@) $(builddir)/$@ diff --git a/gstreamer-sharp/coreplugins/Makefile.am b/gstreamer-sharp/coreplugins/Makefile.am index 8cf09fc512..7a45326fe1 100644 --- a/gstreamer-sharp/coreplugins/Makefile.am +++ b/gstreamer-sharp/coreplugins/Makefile.am @@ -22,15 +22,15 @@ inspect-%: all: $(XML_FILES) $(CS_FILES) touch generated -generated/%.cs: $(top_builddir)/elementgen/element-gen.exe $(srcdir)/../gstreamer-api.xml $(CUSTOM_FILES) $(builddir)/%.xml +generated/%.cs: $(top_builddir)/elementgen/element-gen.exe $(top_builddir)/gstreamer-sharp/gstreamer-api.xml $(CUSTOM_FILES) $(builddir)/%.xml @mkdir -p generated $(MONO) $(top_builddir)/elementgen/element-gen.exe --namespace=$(NAMESPACE) \ - --api=$(srcdir)/../gstreamer-api.xml --input=$(patsubst generated/%.cs,$(builddir)/%.xml,$@) --customfile=$(patsubst generated/%.cs,$(srcdir)/%.custom,$@) > $@ + --api=$(top_builddir)/gstreamer-sharp/gstreamer-api.xml --input=$(patsubst generated/%.cs,$(builddir)/%.xml,$@) --customfile=$(patsubst generated/%.cs,$(srcdir)/%.custom,$@) --interfacesdir=$(top_srcdir)/elementgen/interfaces > $@ %.xml: $(top_builddir)/parser/gst-gapi-fixup.exe $(srcdir)/inspect/%.raw $(srcdir)/%.metadata - cp $(patsubst %.xml,$(srcdir)/inspect/%.raw,$@) $@ - $(MONO) $(top_builddir)/parser/gst-gapi-fixup.exe --api=$@ --metadata=$(patsubst %.xml,$(srcdir)/%.metadata,$@) - -%.xml: $(top_builddir)/parser/gst-gapi-fixup.exe $(srcdir)/inspect/%.raw - cp $(patsubst %.xml,$(srcdir)/inspect/%.raw,$@) $@ + cp $(patsubst %.xml,$(srcdir)/inspect/%.raw,$@) $(builddir)/$@ + chmod +w $(builddir)/$@ + $(MONO) $(top_builddir)/parser/gst-gapi-fixup.exe --api=$(builddir)/$@ --metadata=$(patsubst %.xml,$(srcdir)/%.metadata,$@) +%.xml: $(top_builddir)/parser/gst-gapi-fixup.exe $(srcdir)/inspect/%.raw + cp $(patsubst %.xml,$(srcdir)/inspect/%.raw,$@) $(builddir)/$@ diff --git a/tests/Makefile.am b/tests/Makefile.am index 2c572a2ef4..8812306223 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,3 +14,5 @@ EXTRA_DIST = $(ASSEMBLY_CSFILES) CLEANFILES = $(ASSEMBLY) *.mdb *.pdb TestResult.xml DISTCLEANFILES = Makefile.in +clean-local: + rm -rf %temp%