Fix build errors if ./configure is not executed in top src dir.

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 829f8c7..25071a1 100644 (file)
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -23,8 +23,8 @@
 libibus = $(top_builddir)/src/libibus.la
 
 INCLUDES = \
-       -I$(top_srcdir) \
        -I$(top_srcdir)/src \
+       -I$(top_builddir)/src \
        $(NULL)
 
 AM_CFLAGS = \

diff --git a/client/gtk2/Makefile.am b/client/gtk2/Makefile.am
index 3fef9c7..1f884a5 100644 (file)
--- a/client/gtk2/Makefile.am
+++ b/client/gtk2/Makefile.am
@@ -24,6 +24,7 @@ libibus = $(top_builddir)/src/libibus.la
 
 INCLUDES = \
        -I$(top_srcdir)/src \
+       -I$(top_builddir)/src \
        $(NULL)
 
 immoduledir = @GTK_IM_MODULEDIR@

diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am
index 19e0b44..9f60772 100644 (file)
--- a/client/x11/Makefile.am
+++ b/client/x11/Makefile.am
@@ -50,6 +50,7 @@ ibus_x11_CFLAGS = \
        @DBUS_CFLAGS@ \
        -I$(top_srcdir)/util/IMdkit \
        -I$(top_srcdir)/src \
+       -I$(top_builddir)/src \
        $(NULL)
 
 noinst_HEADERS = \

diff --git a/docs/reference/ibus/Makefile.am b/docs/reference/ibus/Makefile.am
index 0f25e3e..254b474 100644 (file)
--- a/docs/reference/ibus/Makefile.am
+++ b/docs/reference/ibus/Makefile.am
@@ -18,7 +18,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting the functions and macros.
 # e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=$(top_srcdir)/src
+DOC_SOURCE_DIR=../../../src
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=
@@ -80,8 +80,13 @@ LDFLAGS      = \
 # signals and properties.
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES=-I$(top_srcdir)/src
-GTKDOC_LIBS=$(top_builddir)/src/libibus.la
+INCLUDES = \
+       -I$(top_srcdir)/src \
+       -I$(top_builddir)/src \
+       $(NULL)
+GTKDOC_LIBS = \
+       $(top_builddir)/src/libibus.la \
+       $(NULL)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make

diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index 634bd54..0f78189 100644 (file)
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -24,6 +24,7 @@ libibus = $(top_builddir)/src/libibus.la
 
 INCLUDES = \
        -I$(top_srcdir)/src \
+       -I$(top_builddir)/src \
        $(NULL)
 
 AM_CFLAGS = \