Fix out-of-tree build

Also cleanup Makefiles and fix build error with older valac.

BUG=none

Review URL: https://codereview.appspot.com/6782099

diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index abcc543..f293a84 100644 (file)
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -31,14 +31,14 @@ vapi_deps = \
        $(srcdir)/IBus-1.0.metadata \
        $(srcdir)/IBus-1.0-custom.vala \
        | \
-       $(top_srcdir)/src/IBus-@IBUS_API_VERSION@.gir \
+       $(top_builddir)/src/IBus-@IBUS_API_VERSION@.gir \
        $(NULL)
 
 ibus-@IBUS_API_VERSION@.vapi: $(vapi_deps)
        $(AM_V_GEN) $(VAPIGEN) --library ibus-@IBUS_API_VERSION@ \
                        --pkg gio-2.0 \
                        --metadatadir=$(srcdir) \
-                       $(top_srcdir)/src/IBus-@IBUS_API_VERSION@.gir \
+                       $(top_builddir)/src/IBus-@IBUS_API_VERSION@.gir \
                        $(srcdir)/IBus-1.0-custom.vala
 
 EXTRA_DIST = \

diff --git a/docs/reference/ibus/Makefile.am b/docs/reference/ibus/Makefile.am
index 82d11fb..e39ab75 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=$(top_srcdir)/gtk
-DOC_SOURCE_DIR=$(top_srcdir)/src
+DOC_SOURCE_DIR=$(top_srcdir)/src $(top_builddir)/src
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=

diff --git a/engine/main.vala b/engine/main.vala
index f2057f9..4dc3734 100644 (file)
--- a/engine/main.vala
+++ b/engine/main.vala
@@ -34,7 +34,7 @@ const uint16 cedilla_compose_seqs[] = {
   (uint16) IBus.KEY_Multi_key,    (uint16) IBus.KEY_C,  (uint16) IBus.KEY_apostrophe, 0,      0,
     0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
   (uint16) IBus.KEY_Multi_key,    (uint16) IBus.KEY_c,  (uint16) IBus.KEY_apostrophe, 0,      0,
-    0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
+    0x00E7 /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
 };
 
 class DummyEngine : IBus.EngineSimple {

diff --git a/src/Makefile.am b/src/Makefile.am
index df4ada3..7ee5df8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -74,7 +74,7 @@ ibus_sources =              \
     ibusservice.c           \
     ibusfactory.c           \
     ibusengine.c            \
-    ibuserror.c                                \
+    ibuserror.c             \
     ibustext.c              \
     ibuskeymap.c            \
     ibusattribute.c         \
@@ -95,8 +95,8 @@ ibus_sources =              \
     ibusobservedpath.c      \
     ibuscomponent.c         \
     ibusutil.c              \
-       ibusenginesimple.c      \
-       $(NULL)
+    ibusenginesimple.c      \
+    $(NULL)
 libibus_1_0_la_SOURCES =    \
     ibusmarshalers.c        \
     ibusenumtypes.c         \
@@ -112,7 +112,6 @@ ibus_enumtypes_sources =    \
     $(NULL)
 ibus_headers =              \
     ibus.h                  \
-    ibusversion.h           \
     ibusshare.h             \
     ibusdebug.h             \
     ibusobject.h            \
@@ -121,7 +120,7 @@ ibus_headers =              \
     ibusservice.h           \
     ibusfactory.h           \
     ibusengine.h            \
-    ibuserror.h                                \
+    ibuserror.h             \
     ibustext.h              \
     ibuskeymap.h            \
     ibusattribute.h         \
@@ -144,12 +143,13 @@ ibus_headers =              \
     ibusobservedpath.h      \
     ibuscomponent.h         \
     ibusutil.h              \
-       ibusenginesimple.h      \
+    ibusenginesimple.h      \
     $(NULL)
 ibusincludedir = $(includedir)/ibus-@IBUS_API_VERSION@
 ibus_public_headers =       \
     $(ibus_headers)         \
     ibusenumtypes.h         \
+    ibusversion.h           \
     $(NULL)
 ibusinclude_HEADERS =       \
     $(ibus_public_headers)  \
@@ -157,32 +157,35 @@ ibusinclude_HEADERS =       \
 ibus_privite_headers =       \
     ibusinternal.h           \
     keyname-table.h          \
-       gtkimcontextsimpleseqs.h \
+    gtkimcontextsimpleseqs.h \
     $(NULL)
 noinst_HEADERS =            \
     $(ibus_privite_headers) \
     $(NULL)
 
-BUILT_SOURCES =             \
-    ibusmarshalers.h        \
-    ibusmarshalers.c        \
-    ibusenumtypes.h         \
-    ibusenumtypes.c         \
+BUILT_SOURCES =                 \
+    $(ibus_marshalers_sources)  \
+    $(ibus_enumtypes_sources)   \
     $(NULL)
 
 if HAVE_INTROSPECTION
-introspection_files =           \
-    $(ibus_public_headers)      \
+introspection_sources =         \
+    $(ibus_headers)             \
     $(ibus_sources)             \
-    ibusenumtypes.c             \
-    ibusenumtypes.h             \
+    $(NULL)
+built_introspection_sources =   \
+    $(ibus_enumtypes_sources)   \
+    ibusversion.h               \
     $(NULL)
 IBus-1.0.gir: $(libibus) Makefile
 IBus_1_0_gir_SCANNERFLAGS = --pkg-export=ibus-1.0 $(IBUS_GIR_SCANNERFLAGS)
 IBus_1_0_gir_INCLUDES = GLib-2.0 GObject-2.0 Gio-2.0
 IBus_1_0_gir_LIBS = $(libibus)
-IBus_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))
-IBus_1_0_gir_CFLAGS = -DIBUS_COMPILATION
+IBus_1_0_gir_FILES =                                            \
+    $(addprefix $(srcdir)/,$(introspection_sources))            \
+    $(addprefix $(builddir)/,$(built_introspection_sources))    \
+    $(NULL)
+IBus_1_0_gir_CFLAGS = -DIBUS_COMPILATION -I$(srcdir) -I$(builddir)
 INTROSPECTION_GIRS += IBus-1.0.gir
 
 girdir = $(datadir)/gir-1.0

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index f146ddd..cc029d1 100644 (file)
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -29,6 +29,7 @@ INCLUDES =              \
        @GLIB2_CFLAGS@      \
        @GIO2_CFLAGS@       \
        -I$(top_srcdir)/src \
+       -I$(top_builddir)/src \
        $(NULL)
 
 prog_ldadd =                   \