build: Make distcheck pass

5 files changed, 60 insertions, 15 deletions

diff --git a/Makefile.am b/Makefile.am
index d8e82eb..7a0ed9d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,21 @@ SUBDIRS = sources sources/glue samples doc
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gstreamer-sharp-1.0.pc
 
-EXTRA_DIST = gstreamer-sharp-1.0.pc.in out/gstreamer-sharp.dll.config
+EXTRA_DIST = gstreamer-sharp-1.0.pc.in out/gstreamer-sharp.dll.config gstreamer-sharp.snk
 DISTCLEANFILES = gstreamer-sharp-1.0.pc
 
+MAINTAINERCLEANFILES = \
+	compile \
+	INSTALL \
+	aclocal.m4 \
+	ltmain.sh \
+	Makefile.in \
+	depcomp \
+	missing \
+	install-sh \
+	configure \
+	config.sub \
+	config.guess
+
 regenerate:
 	bindinate --name=gstreamer --regenerate=true --merge-with=GstApp-1.0,GstAudio-1.0,GstBase-1.0,GstController-1.0,GstFft-1.0,GstMpegts-1.0,GstNet-1.0,GstPbutils-1.0,GstRiff-1.0,GstRtp-1.0,GstRtsp-1.0,GstSdp-1.0,GstTag-1.0,GstVideo-1.0 --gir=Gst-1.0
diff --git a/configure.ac b/configure.ac
index 56696aa..3a9c01e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,7 +175,6 @@ AC_CONFIG_FILES([
 	gstreamer-sharp-1.0.pc
 	doc/Makefile
 ])
-AC_CONFIG_COMMANDS([default],[[ echo timestamp > stamp-h ]],[[]])
 AC_OUTPUT
 
 echo ""
diff --git a/sources/gstreamer-sharp.snk b/gstreamer-sharp.snk
index f1f0777..f1f0777 100644
--- a/sources/gstreamer-sharp.snk
+++ b/gstreamer-sharp.snk
diff --git a/sources/Makefile.am b/sources/Makefile.am
index 5680a89..f777c80 100644
--- a/sources/Makefile.am
+++ b/sources/Makefile.am
@@ -1,26 +1,55 @@
 RAW_API = $(ASSEMBLY_NAME)-api.raw
 API = $(ASSEMBLY_NAME)-api.xml
 METADATA = $(ASSEMBLY_NAME).metadata
-DLL = $(top_srcdir)/out/$(ASSEMBLY_NAME).dll
-DLLMAP = $(top_srcdir)/out/$(ASSEMBLY_NAME).dll.config
-GLUEDIR = $(srcdir)/glue
+DLL = ../out/$(ASSEMBLY_NAME).dll
+DLLMAP = ../out/$(ASSEMBLY_NAME).dll.config
+GLUEDIR = glue
+KEYFILE = $(ASSEMBLY_NAME).snk
 
-sources = custom/*.cs
+sources = \
+	Adapter.cs \
+	Application.cs \
+	AppSink.cs \
+	AppSrc.cs \
+	AudioFilter.cs \
+	Bin.cs \
+	Buffer.cs \
+	Bus.cs \
+	Caps.cs \
+	DeviceProvider.cs \
+	DynamicSignal.cs \
+	Element.cs \
+	FFTF32.cs \
+	Iterator.cs \
+	MapInfo.cs \
+	Message.cs \
+	MiniObject.cs \
+	NavigationAdapter.cs \
+	Object.cs \
+	Pad.cs \
+	Pipeline.cs \
+	TagList.cs \
+	Value.cs \
+	Version.cs \
+	VideoGLUploadMeta.cs
 
-build_sources = AssemblyInfo.cs $(sources)
+build_sources = AssemblyInfo.cs $(addprefix $(srcdir)/custom/, $(sources))
 
-CLEANFILES = $(DLL) generated-stamp generated/*/*.cs $(API)
+CLEANFILES = $(DLL) generated-stamp generated/*/*.cs $(API) $(KEYFILE)
 
-DISTCLEANFILES = AssemblyInfo.cs $(DLLMAP)
+DISTCLEANFILES = AssemblyInfo.cs $(DLLMAP) $(DLL)
+
+MAINTAINERCLEANFILES = \
+	Makefile.in
 
 noinst_DATA = $(DLL)
+gapi_DATA = $(API)
 
 EXTRA_DIST = \
 	$(RAW_API) \
-	$(sources) \
+	$(addprefix $(srcdir)/custom/, $(sources)) \
 	$(METADATA) \
 	AssemblyInfo.cs.in \
-	$(ASSEMBLY_NAME).snk \
 	gstreamer-sharp-api.xml
 
 all: generated-stamp $(ASSEMBLY)
@@ -38,18 +67,20 @@ generated-stamp: $(API)
 		--glue-includes=gst/gst.h,`cd $(GST_INCLUDEDIR);find gst -type f -name "*.h" -not -path "gst/gl/*" | tr "\n" ","` \
 	 	--assembly-name=$(ASSEMBLY_NAME) && touch generated-stamp
 
-$(DLL): $(build_sources) generated-stamp
+$(KEYFILE): $(top_srcdir)/gstreamer-sharp.snk
+	cp $(top_srcdir)/gstreamer-sharp.snk .
+
+$(DLL): $(build_sources) generated-stamp $(KEYFILE)
+	test -d ../out || mkdir ../out
 	$(CSC) -nowarn:169 -nowarn:108 -nowarn:114 -unsafe -target:library $(GLIB_SHARP_LIBS) $(GIO_SHARP_LIBS) \
 		$(build_sources)  generated/*/*.cs -out:$(DLL)
 
 install-data-local:
 	echo "$(GACUTIL) /i $(DLL) /f $(GACUTIL_FLAGS)";  \
-        $(GACUTIL) /i $(DLL) /f $(GACUTIL_FLAGS) || exit 1; \
-	cp $(API) $(gapidir);
+        $(GACUTIL) /i $(DLL) /f $(GACUTIL_FLAGS) || exit 1;
 
 uninstall-local:
 	echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
         $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1;
-	rm -f $(gapidir)/$(API)
 clean-local:
 	-rm -r generated/*
diff --git a/sources/glue/Makefile.am b/sources/glue/Makefile.am
index 6b1b079..72056fd 100644
--- a/sources/glue/Makefile.am
+++ b/sources/glue/Makefile.am
@@ -17,4 +17,6 @@ libgstreamersharpglue.dll: $(libgstreamersharpglue_1_0_0_la_OBJECTS) libgstreame
 
 CLEANFILES = lib*.a lib*.dll generated.c
 
+MAINTAINERCLEANFILES = Makefile.in
+
 EXTRA_DIST =