Improve element bindings generation build system

diff --git a/gstreamer-sharp/Makefile.am b/gstreamer-sharp/Makefile.am
index e363df6..46c21a3 100644 (file)
--- a/gstreamer-sharp/Makefile.am
+++ b/gstreamer-sharp/Makefile.am
@@ -56,8 +56,9 @@ sources = \
        NavigationMessage.cs \
        NavigationEvent.cs \
        NavigationQuery.cs \
-       coreplugins/*.cs \
-       baseplugins/*.cs
+       coreplugins/generated/*.cs \
+       baseplugins/generated/*.cs \
+       coreplugins/*.cs
 
 overrides = \
        override/URIHandlerAdapter.cs \
@@ -140,10 +141,10 @@ generated-stamp: $(API) $(build_customs) $(overrides)
        && mv generated/ObjectManager.cs.tmp generated/ObjectManager.cs \
        && touch generated-stamp
 
-coreplugins/*.cs: $(API) coreplugins/*.metadata coreplugins/inspect/*.raw
+coreplugins/generated/*.cs: $(API) coreplugins/*.metadata coreplugins/inspect/*.raw
        $(MAKE) -C coreplugins
 
-baseplugins/*.cs: $(API) baseplugins/*.custom baseplugins/*.metadata baseplugins/inspect/*.raw
+baseplugins/generated/*.cs: $(API) baseplugins/*.custom baseplugins/*.metadata baseplugins/inspect/*.raw
        $(MAKE) -C baseplugins
 
 $(KEYFILE): $(top_srcdir)/gstreamer-sharp.snk

diff --git a/gstreamer-sharp/baseplugins/Makefile.am b/gstreamer-sharp/baseplugins/Makefile.am
index f949d25..a209365 100644 (file)
--- a/gstreamer-sharp/baseplugins/Makefile.am
+++ b/gstreamer-sharp/baseplugins/Makefile.am
@@ -4,7 +4,7 @@ NAMESPACE = Gst.BasePlugins
 INSPECT_FILES = $(patsubst %,inspect/%.raw,$(ELEMENTS))
 CUSTOM_FILES = playbin.custom
 METADATA_FILES = decodebin.metadata playbin.metadata decodebin2.metadata playbin2.metadata
-CS_FILES = $(patsubst %,%.cs,$(ELEMENTS))
+CS_FILES = $(patsubst %,generated/%.cs,$(ELEMENTS))
 XML_FILES = $(patsubst %,%.xml,$(ELEMENTS))
 
 EXTRA_DIST = $(CUSTOM_FILES) $(INSPECT_FILES)
@@ -16,9 +16,10 @@ inspect-%:
 
 all: $(XML_FILES) $(CS_FILES)
 
-%.cs: $(top_builddir)/elementgen/element-gen.exe $(CUSTOM_FILES) $(XML_FILES)
+generated/%.cs: $(top_builddir)/elementgen/element-gen.exe $(CUSTOM_FILES) $(XML_FILES)
+       mkdir -p generated
        $(MONO) $(top_builddir)/elementgen/element-gen.exe --namespace=$(NAMESPACE) \
-               --api=$(srcdir)/../gstreamer-api.xml --input=$(patsubst %.cs,%,$@) > $@
+               --api=$(srcdir)/../gstreamer-api.xml --input=$(patsubst generated/%.cs,%,$@) > $@
 
 %.xml: $(top_builddir)/parser/gst-gapi-fixup.exe $(INSPECT_FILES) $(METADATA_FILES)
        cp $(patsubst %.xml,inspect/%.raw,$@) $@

diff --git a/gstreamer-sharp/coreplugins/Makefile.am b/gstreamer-sharp/coreplugins/Makefile.am
index 0a6bbdc..23df403 100644 (file)
--- a/gstreamer-sharp/coreplugins/Makefile.am
+++ b/gstreamer-sharp/coreplugins/Makefile.am
@@ -7,7 +7,7 @@ METADATA_FILES = typefind.metadata \
                fakesrc.metadata \
                fakesink.metadata \
                identity.metadata
-CS_FILES = $(patsubst %,%.cs,$(ELEMENTS))
+CS_FILES = $(patsubst %,generated/%.cs,$(ELEMENTS))
 OTHER_CS_FILES = memindex.cs \
        fileindex.cs
 XML_FILES = $(patsubst %,%.xml,$(ELEMENTS))
@@ -21,9 +21,10 @@ inspect-%:
 
 all: $(XML_FILES) $(CS_FILES)
 
-%.cs: $(top_builddir)/elementgen/element-gen.exe $(CUSTOM_FILES) $(XML_FILES)
+generated/%.cs: $(top_builddir)/elementgen/element-gen.exe $(CUSTOM_FILES) $(XML_FILES)
+       mkdir -p generated
        $(MONO) $(top_builddir)/elementgen/element-gen.exe --namespace=$(NAMESPACE) \
-               --api=$(srcdir)/../gstreamer-api.xml --input=$(patsubst %.cs,%,$@) > $@
+               --api=$(srcdir)/../gstreamer-api.xml --input=$(patsubst generated/%.cs,%,$@) > $@
 
 %.xml: $(top_builddir)/parser/gst-gapi-fixup.exe $(INSPECT_FILES) $(METADATA_FILES)
        cp $(patsubst %.xml,inspect/%.raw,$@) $@