[libpeas] Fix build when srcdir != builddir
- From: Steve Frécinaux <sfre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libpeas] Fix build when srcdir != builddir
- Date: Tue, 25 Jan 2011 23:58:36 +0000 (UTC)
commit 84c01eb4669f39aea3b8c40fbf28f4297200e886
Author: Steve Frécinaux <code istique net>
Date: Wed Jan 26 00:58:03 2011 +0100
Fix build when srcdir != builddir
libpeas-gtk/Makefile.am | 4 +++-
tests/libpeas-gtk/plugins/configurable/Makefile.am | 2 +-
tests/libpeas/testing/Makefile.am | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/libpeas-gtk/Makefile.am b/libpeas-gtk/Makefile.am
index 32a19b5..aa19ef3 100644
--- a/libpeas-gtk/Makefile.am
+++ b/libpeas-gtk/Makefile.am
@@ -47,7 +47,9 @@ if HAVE_INTROSPECTION
--add-include-path=$(top_builddir)/libpeas \
--c-include=libpeas-gtk/peas-gtk.h \
--warn-all
- INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)/libpeas
+ INTROSPECTION_COMPILER_ARGS = \
+ --includedir=$(top_srcdir)/libpeas \
+ --includedir=$(top_builddir)/libpeas
introspection_sources = $(INST_H_FILES) $(C_FILES)
diff --git a/tests/libpeas-gtk/plugins/configurable/Makefile.am b/tests/libpeas-gtk/plugins/configurable/Makefile.am
index 11acca9..f7daac5 100644
--- a/tests/libpeas-gtk/plugins/configurable/Makefile.am
+++ b/tests/libpeas-gtk/plugins/configurable/Makefile.am
@@ -16,4 +16,4 @@ libconfigurable_la_LIBADD = $(PEAS_LIBS) $(PEAS_GTK_LIBS)
noinst_DATA = configurable.plugin
-noinst_DIST = $(noinst_DATA)
+EXTRA_DIST = $(noinst_DATA)
diff --git a/tests/libpeas/testing/Makefile.am b/tests/libpeas/testing/Makefile.am
index c7736e5..58e730e 100644
--- a/tests/libpeas/testing/Makefile.am
+++ b/tests/libpeas/testing/Makefile.am
@@ -1,7 +1,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(srcdir) \
- -I../introspection \
+ -I$(srcdir)/../introspection \
$(PEAS_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]