[unique] build: Use the introspection Makefile
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [unique] build: Use the introspection Makefile
- Date: Wed, 16 Feb 2011 19:28:12 +0000 (UTC)
commit 405661a08143b9d639a1539fe359680e6870c57c
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Wed Feb 16 19:20:05 2011 +0000
build: Use the introspection Makefile
Do not generate the Unique GIR and typelib files manually, but use the
Makefile that gobject-introspection itself provides.
https://bugzilla.gnome.org/show_bug.cgi?id=642492
unique/Makefile.am | 47 ++++++++++++++++++-----------------------------
1 files changed, 18 insertions(+), 29 deletions(-)
---
diff --git a/unique/Makefile.am b/unique/Makefile.am
index c26ff88..b4a77f3 100644
--- a/unique/Makefile.am
+++ b/unique/Makefile.am
@@ -111,38 +111,27 @@ DISTCLEANFILES += uniqueversion.h
EXTRA_DIST += uniqueversion.h.in
+# introspection
+-include $(INTROSPECTION_MAKEFILE)
+
if HAVE_INTROSPECTION
-BUILT_GIRSOURCES =
-
-Unique-3.0.gir: $(INTROSPECTION_SCANNER) libunique-3.0.la
- $(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
- --namespace Unique --nsversion=3.0 \
- $(INCLUDES) $(AM_CPPFLAGS) \
- --c-include='unique/unique.h' \
- --include=GObject-2.0 \
- --include=Gtk-3.0 \
- --library=libunique-3.0.la \
- --libtool="$(top_builddir)/libtool" \
- --pkg gobject-2.0 \
- --pkg gtk+-3.0 \
- --output $@ \
- $(unique_sources_h) \
- $(unique_sources_c)
-
-BUILT_GIRSOURCES += Unique-3.0.gir
+INTROSPECTION_GIRS = Unique-3.0.gir
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(BUILT_GIRSOURCES)
+Unique-3.0.gir: libunique-3.0.la Makefile
-typelibsdir = $(libdir)/girepository-1.0
-typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
+Unique_3_0_gir_NAMESPACE = Unique
+Unique_3_0_gir_VERSION = 3.0
+Unique_3_0_gir_LIBS = libunique-3.0.la
+Unique_3_0_gir_FILES = $(unique_sources_h) $(unique_sources_c) uniqueenumtypes.h uniqueenumtypes.c
+Unique_3_0_gir_CFLAGS = $(INCLUDES) $(AM_CPPFLAGS)
+Unique_3_0_gir_INCLUDES = GObject-2.0 Gtk-3.0
+Unique_3_0_gir_SCANNERFLAGS = --warn-all --pkg-export unique-3.0 --c-include "unique/unique.h"
+
+girdir = $(datadir)/gir-1.0
+dist_gir_DATA = Unique-3.0.gir
-%.typelib: %.gir $(INTROSPECTION_COMPILER)
- $(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) \
- --includedir=$(srcdir) \
- --includedir=. \
- $(INTROSPECTION_COMPILER_OPTS) \
- $< -o $(@F)
+typelibsdir = $(libdir)/girepository-1.0/
+typelibs_DATA = Unique-3.0.typelib
-CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
+CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA)
endif # HAVE_INTROSPECTION
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]