From 57785c952444e4cb9d13e43d4f9cc9713d66958b Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 16 Jan 2012 15:00:18 +0000 Subject: Use local include files for building GIR Add -I argument for g-ir-scanner to use the include files from the local tree instead of the ones installed in the system. --- Index: libxklavier-5.2/libxklavier/Makefile.am =================================================================== --- libxklavier-5.2.orig/libxklavier/Makefile.am +++ libxklavier-5.2/libxklavier/Makefile.am @@ -94,7 +94,7 @@ introspection_sources = $(xklavier_heade Xkl-1.0.gir: libxklavier.la Xkl_1_0_gir_INCLUDES = GObject-2.0 xlib-2.0 -Xkl_1_0_gir_CFLAGS = $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) +Xkl_1_0_gir_CFLAGS = -I$(top_srcdir) $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) Xkl_1_0_gir_LIBS = libxklavier.la Xkl_1_0_gir_FILES = $(xklavier_headers) $(introspection_sources) INTROSPECTION_GIRS += Xkl-1.0.gir Index: libxklavier-5.2/libxklavier/Makefile.in =================================================================== --- libxklavier-5.2.orig/libxklavier/Makefile.in +++ libxklavier-5.2/libxklavier/Makefile.in @@ -343,7 +343,7 @@ INTROSPECTION_COMPILER_ARGS = --included # avoid introspecting private headers @HAVE_INTROSPECTION_TRUE@introspection_sources = $(xklavier_headers) $(filter %.c, $(libxklavier_la_SOURCES)) @HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_INCLUDES = GObject-2.0 xlib-2.0 -@HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_CFLAGS = $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) +@HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_CFLAGS = -I$(top_srcdir) $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) @HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_LIBS = libxklavier.la @HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_FILES = $(xklavier_headers) $(introspection_sources) @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0