[libwnck] Fix failure to build outside source tree



commit ddbb711674cb67dbb3cf8e0c58137764d5e6f9b9
Author: Theppitak Karoonboonyanan <thep linux thai net>
Date:   Tue Jul 6 17:45:25 2010 +0700

    Fix failure to build outside source tree
    
    Use gobject-introspection 0.6.14, where introspection sources can be
    referenced via VPATH. Also fix distcheck failure in doc subdir.

 configure.in        |    2 +-
 doc/Makefile.am     |    2 +-
 libwnck/Makefile.am |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/configure.in b/configure.in
index cada989..6ad320e 100644
--- a/configure.in
+++ b/configure.in
@@ -167,7 +167,7 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 ##################################################
 GTK_DOC_CHECK([1.9])
 
-GOBJECT_INTROSPECTION_CHECK([0.6.7])
+GOBJECT_INTROSPECTION_CHECK([0.6.14])
 
 AC_OUTPUT([
 Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 285a065..e49e298 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -41,7 +41,7 @@ extra_files =
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-GTKDOC_CFLAGS = -I$(top_srcdir) $(LIBWNCK_CFLAGS) -DWNCK_I_KNOW_THIS_IS_UNSTABLE
+GTKDOC_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(LIBWNCK_CFLAGS) -DWNCK_I_KNOW_THIS_IS_UNSTABLE
 GTKDOC_LIBS = $(top_builddir)/libwnck/libwnck-1.la $(LIBWNCK_LIBS)
 
 include $(top_srcdir)/gtk-doc.make
diff --git a/libwnck/Makefile.am b/libwnck/Makefile.am
index 4d14dea..5587347 100644
--- a/libwnck/Makefile.am
+++ b/libwnck/Makefile.am
@@ -181,7 +181,7 @@ Wnck_1_0_gir_CFLAGS =			\
 	-DWNCK_I_KNOW_THIS_IS_UNSTABLE	\
 	-DSN_API_NOT_YET_FROZEN=1
 Wnck_1_0_gir_LIBS = libwnck-1.la
-Wnck_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
+Wnck_1_0_gir_FILES = $(introspection_sources)
 INTROSPECTION_GIRS += Wnck-1.0.gir
 
 girdir = $(datadir)/gir-1.0



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]