[libpeas] Fix building introspection when libpeas is not installed
- From: Garrett Regier <gregier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libpeas] Fix building introspection when libpeas is not installed
- Date: Wed, 21 Sep 2011 09:31:47 +0000 (UTC)
commit 14c40c71c028372e4efd652e6dbb3e51ed28b765
Author: Garrett Regier <garrettregier gmail com>
Date: Tue Aug 30 14:55:52 2011 -0700
Fix building introspection when libpeas is not installed
libpeas-gtk/Makefile.am | 2 +-
tests/libpeas/introspection/Makefile.am | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/libpeas-gtk/Makefile.am b/libpeas-gtk/Makefile.am
index aeef828..0ed84cd 100644
--- a/libpeas-gtk/Makefile.am
+++ b/libpeas-gtk/Makefile.am
@@ -60,7 +60,7 @@ if HAVE_INTROSPECTION
PeasGtk-1.0.gir: libpeas-gtk-1.0.la
PeasGtk_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0
PeasGtk_1_0_gir_CFLAGS = $(PEAS_CFLAGS) $(PEAS_GTK_CFLAGS) -I$(top_srcdir)
- PeasGtk_1_0_gir_LIBS = libpeas-gtk-1.0.la
+ PeasGtk_1_0_gir_LIBS = $(top_builddir)/libpeas/libpeas-1.0.la libpeas-gtk-1.0.la
PeasGtk_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
PeasGtk_1_0_gir_EXPORT_PACKAGES = libpeas-gtk-1.0
PeasGtk_1_0_gir_SCANNERFLAGS = --include-uninstalled=$(top_builddir)/libpeas/Peas-1.0.gir
diff --git a/tests/libpeas/introspection/Makefile.am b/tests/libpeas/introspection/Makefile.am
index 09ae0d2..592ce6a 100644
--- a/tests/libpeas/introspection/Makefile.am
+++ b/tests/libpeas/introspection/Makefile.am
@@ -36,7 +36,9 @@ introspection_sources = $(libintrospection_1_0_la_SOURCES)
Introspection-1.0.gir: libintrospection-1.0.la
Introspection_1_0_gir_INCLUDES = GObject-2.0
Introspection_1_0_gir_CFLAGS = $(INTROSPECTION_INCLUDES)
-Introspection_1_0_gir_LIBS = libintrospection-1.0.la
+Introspection_1_0_gir_LIBS = \
+ libintrospection-1.0.la \
+ $(top_builddir)/libpeas/libpeas-1.0.la
Introspection_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
CLEANFILES = $(INTROSPECTION_GIRS) $(INTROSPECTION_TYPELIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]