gst-libs/gst/pbutils/: Use glib-enum generator to have a proper enum GType for

Original commit message from CVS:
* gst-libs/gst/pbutils/Makefile.am:
* gst-libs/gst/pbutils/pbutils.h:
Use glib-enum generator to have a proper enum GType for
GST_TYPE_INSTALL_PLUGINS_RETURN so we can easily wrap it in bindings.

diff --git a/ChangeLog b/ChangeLog
index 57dea6f..9a3157f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-01  Edward Hervey  <edward.hervey@collabora.co.uk>
+
+       * gst-libs/gst/pbutils/Makefile.am:
+       * gst-libs/gst/pbutils/pbutils.h:
+       Use glib-enum generator to have a proper enum GType for
+       GST_TYPE_INSTALL_PLUGINS_RETURN so we can easily wrap it in bindings.
+
 2007-12-31  David Schleef  <ds@schleef.org>
 
        * tests/check/Makefile.am:

diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
index 236faa5..ba0065c 100644 (file)
--- a/gst-libs/gst/pbutils/Makefile.am
+++ b/gst-libs/gst/pbutils/Makefile.am
@@ -1,22 +1,46 @@
 lib_LTLIBRARIES = libgstpbutils-@GST_MAJORMINOR@.la
 
-libgstpbutils_@GST_MAJORMINOR@_la_SOURCES = \
-       pbutils.c         \
+headers_pbutils = \
        pbutils.h         \
-       descriptions.c    \
        descriptions.h    \
-       install-plugins.c \
        install-plugins.h \
-       missing-plugins.c \
        missing-plugins.h
 
+# variables used for enum/marshal generation
+glib_enum_headers=$(headers_pbutils)
+glib_enum_define=GST_INSTALL
+glib_enum_prefix=gst_install
+
+built_sources = \
+       pbutils-enumtypes.c
+
+built_headers = \
+       pbutils-enumtypes.h
+
+libgstpbutils_@GST_MAJORMINOR@_la_SOURCES = \
+       pbutils.c         \
+       descriptions.c    \
+       install-plugins.c \
+       missing-plugins.c
+
+nodist_libgstpbutils_@GST_MAJORMINOR@_la_SOURCES = \
+       $(built_sources)
+
 libgstpbutils_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/pbutils
 libgstpbutils_@GST_MAJORMINOR@include_HEADERS = \
-       pbutils.h         \
-       descriptions.h    \
-       install-plugins.h \
-       missing-plugins.h
+       $(headers_pbutils)
+nodist_libgstpbutils_@GST_MAJORMINOR@include_HEADERS = \
+       pbutils-enumtypes.h
 
 libgstpbutils_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)
 libgstpbutils_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstpbutils_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
+
+BUILT_SOURCES = \
+       $(built_sources) \
+       $(built_headers)
+
+CLEANFILES = $(BUILT_SOURCES)
+
+
+include $(top_srcdir)/common/glib-gen.mak

diff --git a/gst-libs/gst/pbutils/pbutils.h b/gst-libs/gst/pbutils/pbutils.h
index 50c54c9..02f7f6b 100644 (file)
--- a/gst-libs/gst/pbutils/pbutils.h
+++ b/gst-libs/gst/pbutils/pbutils.h
@@ -25,6 +25,7 @@
 #include <gst/pbutils/descriptions.h>
 #include <gst/pbutils/missing-plugins.h>
 #include <gst/pbutils/install-plugins.h>
+#include <gst/pbutils/pbutils-enumtypes.h>
 
 G_BEGIN_DECLS