diff --git a/.gitignore b/.gitignore
index cef9d3726f..eadac0c5ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,7 @@ sources/glue/*.la
sources/glue/.libs/
# generated by the generator (we don't want anyone to commit these to the repo)
-sources/generated/*.cs
+sources/generated/*/*.cs
sources/glue/generated.c
doc/*
sources/generated-stamp
diff --git a/configure.ac b/configure.ac
index 798b4c47cd..546b116c2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,14 +73,14 @@ AC_SUBST(LIB_PREFIX)
AC_SUBST(LIB_SUFFIX)
dnl Check for gtk-sharp
-PKG_CHECK_MODULES(GLIB_SHARP, glib-sharp-3.0 >= 2.99.2)
+PKG_CHECK_MODULES(GLIB_SHARP, glib-sharp-3.0 >= 2.99.3)
AC_SUBST(GLIB_SHARP_CFLAGS)
AC_SUBST(GLIB_SHARP_LIBS)
gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp-3.0`
AC_SUBST(gtksharp_prefix)
dnl Find GAPI
-PKG_CHECK_MODULES(GAPI, gapi-3.0 >= 2.99.2)
+PKG_CHECK_MODULES(GAPI, gapi-3.0 >= 2.99.3)
dnl Check for gapi
AC_PATH_PROG(GAPI_PARSER, gapi3-parser, no)
diff --git a/gstreamer-sharp.csproj b/gstreamer-sharp.csproj
index 7c9ebd7ae6..89c3d50b35 100644
--- a/gstreamer-sharp.csproj
+++ b/gstreamer-sharp.csproj
@@ -40,7 +40,7 @@
-
+
diff --git a/sources/Makefile.am b/sources/Makefile.am
index 75d569ca29..8b2ef71c82 100644
--- a/sources/Makefile.am
+++ b/sources/Makefile.am
@@ -9,7 +9,7 @@ sources = custom/*.cs
build_sources = AssemblyInfo.cs $(sources)
-CLEANFILES = $(DLL) generated-stamp generated/*.cs $(API)
+CLEANFILES = $(DLL) generated-stamp generated/*/*.cs $(API)
DISTCLEANFILES = AssemblyInfo.cs $(DLLMAP)
@@ -30,7 +30,8 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
$(GAPI_FIXUP) --api=$(srcdir)/$(API) --metadata=$(srcdir)/$(METADATA)
generated-stamp: $(API)
- $(GAPI_CODEGEN) --generate $(srcdir)/$(API) $(GLIB_SHARP_CFLAGS) \
+ rm -rf generated/* && \
+ $(GAPI_CODEGEN) --generate $(srcdir)/$(API) $(GLIB_SHARP_CFLAGS) \
--outdir=generated \
--glue-filename=$(GLUEDIR)/generated.c --gluelib-name=libgstreamersharpglue-1.0.0.dll \
--glue-includes=gst/gst.h,`cd $(GST_INCLUDEDIR);find gst -type f | tr "\n" ","` \
@@ -38,7 +39,7 @@ generated-stamp: $(API)
$(DLL): $(build_sources) generated-stamp
$(CSC) -nowarn:169 -unsafe -target:library $(GLIB_SHARP_LIBS) \
- $(build_sources) generated/*.cs -out:$(DLL)
+ $(build_sources) generated/*/*.cs -out:$(DLL)
install-data-local:
echo "$(GACUTIL) /i $(DLL) /f $(GACUTIL_FLAGS)"; \
@@ -47,3 +48,5 @@ install-data-local:
uninstall-local:
echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1;
+clean-local:
+ -rm -r generated/*
diff --git a/sources/glue/Makefile.am b/sources/glue/Makefile.am
index cd669f5c10..6423a58347 100644
--- a/sources/glue/Makefile.am
+++ b/sources/glue/Makefile.am
@@ -13,6 +13,6 @@ INCLUDES = $(GST_CFLAGS) -I$(top_srcdir)
libgstreamersharpglue.dll: $(libgstreamersharpglue_1_0_0_la_OBJECTS) libgstreamersharpglue.rc libgstreamersharpglue.def
./build-dll libgstreamersharpglue $(VERSION)
-CLEANFILES = lib*.a lib*.dll
+CLEANFILES = lib*.a lib*.dll generated.c
EXTRA_DIST =
diff --git a/sources/gstreamer-sharp.metadata b/sources/gstreamer-sharp.metadata
index 100790a12e..90b2eb1b09 100644
--- a/sources/gstreamer-sharp.metadata
+++ b/sources/gstreamer-sharp.metadata
@@ -208,32 +208,6 @@ along with this program. If not, see .
Gst.Rtp
Gst.Rtsp
Gst.Sdp
- GlobalBase
- GlobalVideo
- GlobalAudio
- GlobalPbUtil
- GlobalTag
- GlobalApp
- GlobalController
- GlobalFFT
- GlobalNet
- GlobalRiff
- GlobalRtp
- GlobalRtsp
- GlobalSdp
- ConstantsBase
- ConstantsVideo
- ConstantsAudio
- ConstantsPbUtil
- ConstantsTag
- ConstantsApp
- ConstantsController
- ConstantsFFT
- ConstantsNet
- ConstantsRiff
- ConstantsRtp
- ConstantsRtsp
- ConstantsSdp
libgstreamer-1.0-0.dll