From 08eb738c9387f524c50a84004618f6dfb01c4487 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 3 Sep 2010 11:09:57 +0100 Subject: [PATCH] build: Use Makefile.introspection Whenever possible, instead of writing our own rules for generating GIR files and typelibs. --- cogl/Makefile.am | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/cogl/Makefile.am b/cogl/Makefile.am index 4de6fae2b..6b25a63d2 100644 --- a/cogl/Makefile.am +++ b/cogl/Makefile.am @@ -235,26 +235,26 @@ coglincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/cogl coglinclude_HEADERS = $(cogl_headers) nodist_coglinclude_HEADERS = cogl-defines.h cogl-enum-types.h -if HAVE_INTROSPECTION -Cogl-@CLUTTER_API_VERSION@.gir: Makefile $(INTROSPECTION_SCANNER) libclutter-cogl.la - $(QUIET_SCAN)$(INTROSPECTION_SCANNER) \ - $(INTROSPECTION_SCANNER_ARGS) \ - --quiet \ - --namespace Cogl --nsversion=@CLUTTER_API_VERSION@ \ - $(INCLUDES) \ - $(AM_CPPFLAGS) \ - --c-include='cogl/cogl.h' \ - --include=GL-1.0 \ - --include=GObject-2.0 \ - --library=libclutter-cogl.la \ - --libtool="$(top_builddir)/libtool" \ - --output $@ \ - $(cogl_headers) cogl-enum-types.h +-include $(INTROSPECTION_MAKEFILE) -BUILT_GIRSOURCES = Cogl-@CLUTTER_API_VERSION@.gir +INTROSPECTION_GIRS = + +if HAVE_INTROSPECTION + +Cogl-@CLUTTER_API_VERSION@.gir: libclutter-cogl.la Makefile + +Cogl_@CLUTTER_API_VERSION_AM@_gir_NAMESPACE = Cogl +Cogl_@CLUTTER_API_VERSION_AM@_gir_VERSION = @CLUTTER_API_VERSION@ +Cogl_@CLUTTER_API_VERSION_AM@_gir_LIBS = libclutter-cogl.la +Cogl_@CLUTTER_API_VERSION_AM@_gir_FILES = $(cogl_headers) cogl-enum-types.h +Cogl_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(INCLUDES) $(AM_CPPFLAGS) +Cogl_@CLUTTER_API_VERSION_AM@_gir_INCLUDES = GL-1.0 GObject-2.0 +Cogl_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = --warn-all --c-include='cogl/cogl.h' + +INTROSPECTION_GIRS += Cogl-@CLUTTER_API_VERSION@.gir girdir = $(datadir)/gir-1.0 -gir_DATA = $(BUILT_GIRSOURCES) +dist_gir_DATA = $(INTROSPECTION_GIRS) -CLEANFILES += $(BUILT_GIRSOURCES) +CLEANFILES += $(INTROSPECTION_GIRS) endif