From 56535b85670f0c9f7ec50df8ae53146d48f50c61 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 8 Apr 2010 15:47:05 +0200 Subject: Additional build tweaks for introspection support This makes us closer to what the official documentation tells us to do. --- Makefile.am | 2 +- autogen.sh | 1 + gconf/Makefile.am | 12 ++++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 08b887ea..d41ccdd6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ DISTCLEANFILES = \ intltool-merge \ intltool-extract -DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-defaults-service +DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection --enable-defaults-service install-data-local: -mkdir -p $(DESTDIR)$(sysgconfdir)/gconf.xml.defaults diff --git a/autogen.sh b/autogen.sh index c7d1c625..a514d11a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -5,6 +5,7 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. REQUIRED_AUTOMAKE_VERSION=1.9 +REQUIRED_M4MACROS=introspection.m4 PKG_NAME="GConf" diff --git a/gconf/Makefile.am b/gconf/Makefile.am index 3f8bea70..7b0821d7 100644 --- a/gconf/Makefile.am +++ b/gconf/Makefile.am @@ -29,11 +29,6 @@ else SANITY_CHECK= endif --include $(INTROSPECTION_MAKEFILE) -INTROSPECTION_GIRS = -INTROSPECTION_COMPILER_ARGS= \ - --includedir=$(srcdir) - lib_LTLIBRARIES = libgconf-2.la bin_PROGRAMS = gconftool-2 @@ -125,9 +120,14 @@ libgconf_2_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) +-include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = +INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) +INTROSPECTION_COMPILER_ARGS= --includedir=$(srcdir) + if HAVE_INTROSPECTION introspection_files = \ - $(gconf_headers) + $(gconfinclude_HEADERS) GConf-2.0.gir: $(INTROSPECTION_SCANNER) libgconf-2.la Makefile GConf_2_0_gir_SCANNERFLAGS = --strip-prefix=GConf GConf_2_0_gir_INCLUDES = GObject-2.0 -- cgit v1.2.1