Improve element bindings generation build system

3 files changed, 13 insertions, 10 deletions

diff --git a/gstreamer-sharp/Makefile.am b/gstreamer-sharp/Makefile.am
index e363df6..46c21a3 100644
--- a/gstreamer-sharp/Makefile.am
+++ b/gstreamer-sharp/Makefile.am
@@ -53,14 +53,15 @@ sources = \
 	TypeFindDelegates.cs \
 	PresetDefault.cs \
 	MixerMessage.cs \
 	NavigationMessage.cs \
 	NavigationEvent.cs \
 	NavigationQuery.cs \
-	coreplugins/*.cs \
-	baseplugins/*.cs
+	coreplugins/generated/*.cs \
+	baseplugins/generated/*.cs \
+	coreplugins/*.cs
 
 overrides = \
 	override/URIHandlerAdapter.cs \
 	override/ColorBalanceAdapter.cs \
 	override/ColorBalance.cs  \
 	override/Mixer.cs \
@@ -137,16 +138,16 @@ generated-stamp: $(API) $(build_customs) $(overrides)
 		--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 \
 	&& 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
 	cp $(top_srcdir)/gstreamer-sharp.snk .
 
 $(ASSEMBLY): $(build_sources) generated-stamp $(KEYFILE)
diff --git a/gstreamer-sharp/baseplugins/Makefile.am b/gstreamer-sharp/baseplugins/Makefile.am
index f949d25..a209365 100644
--- a/gstreamer-sharp/baseplugins/Makefile.am
+++ b/gstreamer-sharp/baseplugins/Makefile.am
@@ -1,27 +1,28 @@
 ELEMENTS = decodebin playbin xvimagesink decodebin2 playbin2
 
 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)
 CLEANFILES = $(XML_FILES) $(CS_FILES)
 
 plugins-update: $(patsubst inspect/%.raw, inspect-%, $(INSPECT_FILES))
 inspect-%:
 	$(top_builddir)/elementgen/gsts-xmlinspect $(patsubst inspect-%,%,$@) > inspect/$(patsubst inspect-%,%,$@).raw
 
 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,$@) $@
 	if [ -e $(patsubst %.xml,%.metadata,$@) ]; then \
 		$(MONO) $(top_builddir)/parser/gst-gapi-fixup.exe --api=$@ \
 			--metadata=$(patsubst %.xml,%.metadata,$@) ; \
diff --git a/gstreamer-sharp/coreplugins/Makefile.am b/gstreamer-sharp/coreplugins/Makefile.am
index 0a6bbdc..23df403 100644
--- a/gstreamer-sharp/coreplugins/Makefile.am
+++ b/gstreamer-sharp/coreplugins/Makefile.am
@@ -4,13 +4,13 @@ NAMESPACE = Gst.CorePlugins
 INSPECT_FILES = $(patsubst %,inspect/%.raw,$(ELEMENTS))
 CUSTOM_FILES = 
 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))
 
 EXTRA_DIST = $(CUSTOM_FILES) $(INSPECT_FILES) $(OTHER_CS_FILES)
 CLEANFILES = $(XML_FILES) $(CS_FILES)
@@ -18,15 +18,16 @@ CLEANFILES = $(XML_FILES) $(CS_FILES)
 plugins-update: $(patsubst inspect/%.raw, inspect-%, $(INSPECT_FILES))
 inspect-%:
 	$(top_builddir)/elementgen/gsts-xmlinspect $(patsubst inspect-%,%,$@) > inspect/$(patsubst inspect-%,%,$@).raw
 
 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,$@) $@
 	if [ -e $(patsubst %.xml,%.metadata,$@) ]; then \
 		$(MONO) $(top_builddir)/parser/gst-gapi-fixup.exe --api=$@ \
 			--metadata=$(patsubst %.xml,%.metadata,$@) ; \