diff options
| author | Tomeu Vizoso <tomeu@sugarlabs.org> | 2010-04-29 14:58:11 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu.vizoso@collabora.co.uk> | 2010-08-18 18:08:32 (GMT) |
| commit | a764fe20522f1052d326df36dd2f4edab02b5329 (patch) | |
| tree | 06d13c28ad89465c96c5fb1d04c67216e539cb88 | |
| parent | 599a1ae6c90c5c3572f19d8896f67ab6fc199f69 (diff) | |
Update introspection autofoo
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | m4/introspection.m4 | 2 | ||||
| -rw-r--r-- | src/sugar/Makefile.am | 44 |
3 files changed, 17 insertions, 33 deletions
diff --git a/configure.ac b/configure.ac index d2d24e7..6c99cf0 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ([2.59]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([configure.ac]) -AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip]) +AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip -Wno-portability]) AM_MAINTAINER_MODE AC_DISABLE_STATIC @@ -19,7 +19,7 @@ AM_PATH_PYTHON PKG_CHECK_MODULES(EXT, gtk+-2.0 sm ice alsa) -GOBJECT_INTROSPECTION_CHECK([0.6.3]) +GOBJECT_INTROSPECTION_CHECK([0.6.7]) PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` AC_SUBST(PYGTK_DEFSDIR) diff --git a/m4/introspection.m4 b/m4/introspection.m4 index 6e2c565..589721c 100644 --- a/m4/introspection.m4 +++ b/m4/introspection.m4 @@ -61,6 +61,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection fi AC_SUBST(INTROSPECTION_SCANNER) AC_SUBST(INTROSPECTION_COMPILER) @@ -69,6 +70,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], AC_SUBST(INTROSPECTION_TYPELIBDIR) AC_SUBST(INTROSPECTION_CFLAGS) AC_SUBST(INTROSPECTION_LIBS) + AC_SUBST(INTROSPECTION_MAKEFILE) AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") ]) diff --git a/src/sugar/Makefile.am b/src/sugar/Makefile.am index 61523da..ba74864 100644 --- a/src/sugar/Makefile.am +++ b/src/sugar/Makefile.am @@ -68,36 +68,18 @@ sugar-marshal.h: sugar-marshal.list $(GLIB_GENMARSHAL) --prefix=sugar_marshal \ $(srcdir)/sugar-marshal.list --header > sugar-marshal.h -SugarExt-1.0.gir: $(INTROSPECTION_SCANNER) libsugarext.la - $(INTROSPECTION_SCANNER) -v \ - --namespace SugarExt --nsversion=1.0 \ - --strip-prefix=sugar \ - --include=Gtk-2.0 \ - --library=libsugarext.la \ - --library asound \ - --library gdk-x11-2.0 \ - --library gtk-x11-2.0 \ - --output $@ \ - $(libsugarext_la_SOURCES) +include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = SugarExt-1.0.gir +INTROSPECTION_SCANNER_ARGS = --strip-prefix=Sugar +SugarExt_1_0_gir_LIBS = libsugarext.la +SugarExt_1_0_gir_FILES = $(libsugarext_la_SOURCES) +SugarExt_1_0_gir_INCLUDES = Gtk-2.0 +SugarExt_1_0_gir_PACKAGES = gtk+-2.0 +girdir = $(INTROSPECTION_GIRDIR) +dist_gir_DATA = SugarExt-1.0.gir +typelibdir = $(INTROSPECTION_TYPELIBDIR) +typelib_DATA = SugarExt-1.0.typelib +CLEANFILES = $(dist_gir_DATA) $(typelib_DATA) -BUILT_GIRSOURCES = SugarExt-1.0.gir - -# INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to -# install anything - we need to install inside our prefix. -girdir = $(datadir)/gir-1.0 -gir_DATA = $(BUILT_GIRSOURCES) - -typelibsdir = $(libdir)/girepository-1.0/ - -typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) - -%.typelib: %.gir $(INTROSPECTION_COMPILER) - $(QUIET_GEN) \ - LD_LIBRARY_PATH=.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} \ - $(INTROSPECTION_COMPILER) \ - --includedir=$(srcdir) \ - --includedir=. \ - $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) - -CLEANFILES = $(BUILT_SOURCES) $(BUILT_GIRSOURCES) $(typelibs_DATA) +CLEANFILES += $(BUILT_SOURCES) EXTRA_DIST = sugar-marshal.list |