[libpeas] Fix include paths for building PeasUI-2.0.gir

[Steve Frécinaux <sfre src gnome org>]

commit f0587f35072ab319c2488a6a4ab992a883517563
Author: Steve Frécinaux <code istique net>
Date:   Fri Apr 23 11:07:32 2010 +0200

    Fix include paths for building PeasUI-2.0.gir

 libpeas/Makefile.am   |    9 +++------
 libpeasui/Makefile.am |   18 ++++++++----------
 2 files changed, 11 insertions(+), 16 deletions(-)
---
diff --git a/libpeas/Makefile.am b/libpeas/Makefile.am
index ad90536..90b76b4 100644
--- a/libpeas/Makefile.am
+++ b/libpeas/Makefile.am
@@ -1,8 +1,3 @@
--include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
-
 lib_LTLIBRARIES = libpeas-2.0.la
 
 INCLUDES =								\
@@ -51,6 +46,9 @@ headerdir = $(prefix)/include/libpeas-2.0/libpeas
 header_DATA = $(INST_H_FILES)
 
 if HAVE_INTROSPECTION
+  -include $(INTROSPECTION_MAKEFILE)
+  INTROSPECTION_GIRS = Peas-2.0.gir
+
   introspection_sources = $(libpeas_2_0_la_SOURCES)
 
   Peas-2.0.gir: libpeas-2.0.la
@@ -58,7 +56,6 @@ if HAVE_INTROSPECTION
   Peas_2_0_gir_CFLAGS = $(PEAS_CFLAGS)
   Peas_2_0_gir_LIBS = libpeas-2.0.la
   Peas_2_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
-  INTROSPECTION_GIRS += Peas-2.0.gir
 
   girdir = $(datadir)/gir-1.0
   dist_gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/libpeasui/Makefile.am b/libpeasui/Makefile.am
index a6503f9..118b7b4 100644
--- a/libpeasui/Makefile.am
+++ b/libpeasui/Makefile.am
@@ -1,9 +1,3 @@
--include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
-INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libpeas
-
-
 lib_LTLIBRARIES = libpeasui-2.0.la
 
 INCLUDES = \
@@ -38,16 +32,20 @@ headerdir = $(prefix)/include/libpeas-2.0/libpeasui
 header_DATA = $(INST_H_FILES)
 
 if HAVE_INTROSPECTION
+  -include $(INTROSPECTION_MAKEFILE)
+  INTROSPECTION_GIRS = PeasUI-2.0.gir
+  INTROSPECTION_SCANNER_ARGS = --add-include-path=$(top_builddir)/libpeas
+  INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)/libpeas
+
   introspection_sources = $(libpeasui_2_0_la_SOURCES)
 
-  PeasuUI-2.0.gir: libpeasui-2.0.la
+  PeasUI-2.0.gir: libpeasui-2.0.la
   PeasUI_2_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 Peas-2.0
-  PeasUI_2_0_gir_CFLAGS = $(PEAS_CFLAGS) $(PEASUI_CFLAGS)
+  PeasUI_2_0_gir_CFLAGS = $(PEAS_CFLAGS) $(PEASUI_CFLAGS) -I$(top_srcdir)
   PeasUI_2_0_gir_LIBS = libpeasui-2.0.la
   PeasUI_2_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
-  INTROSPECTION_GIRS += PeasUI-2.0.gir
 
-  girdir = $(datadir)/gir-1.0 ../libpeas
+  girdir = $(datadir)/gir-1.0
   dist_gir_DATA = $(INTROSPECTION_GIRS)
 
   typelibdir = $(libdir)/girepository-1.0