tools: Fix to add -ldl LDADD

-ldl option is needed for dlclose() in Ubuntu.

Also move the docs build order to the last.

Also unset G_MESSAGES_DEBUG for gsettings in xkb-latin-layouts.
gsettings cannot get the key value when G_MESSAGES_DEBUG is enabled.

3 files changed, 23 insertions, 15 deletions

diff --git a/Makefile.am b/Makefile.am
index 9ff786dc..17e56b38 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,13 +55,13 @@ SUBDIRS = \
 	data \
 	m4 \
 	po \
-	docs \
 	$(ENGINE_DIR) \
 	$(UI_DIR) \
 	tools \
 	$(DAEMON_DIR) \
 	$(PYTHON_LIB_DIRS) \
 	$(SETUP_DIR) \
+	docs \
 	$(NULL)
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/src/tests/xkb-latin-layouts b/src/tests/xkb-latin-layouts
index f8dced6b..92464234 100755
--- a/src/tests/xkb-latin-layouts
+++ b/src/tests/xkb-latin-layouts
@@ -82,9 +82,16 @@ finit()
 
 test_xkb_keymaps()
 {
+    # G_MESSAGES_DEBUG=all or G_MESSAGES_DEBUG=GLib-GIO-DEBUG would append
+    # debug messages to gsettings output and could not get the result correctly.
+    backup_G_MESSAGES_DEBUG="$G_MESSAGES_DEBUG"
+    unset G_MESSAGES_DEBUG
     # Loop over top level schemas since "gsettings list-recursively" only
     # looks for direct children.
     xkb_latin_layouts=`gsettings get org.freedesktop.ibus.general xkb-latin-layouts`
+    if [ x"$backup_G_MESSAGES_DEBUG" != x ] ; then
+        export G_MESSAGES_DEBUG=$backup_G_MESSAGES_DEBUG
+    fi
     while read keymap ; do
         eval keymap="$keymap"
         HAS_VARIANT=$($ECHO "$keymap" | grep '(' 2> /dev/null) ||:
diff --git a/tools/Makefile.am b/tools/Makefile.am
index a9262ee0..b82395da 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -39,22 +39,22 @@ VAPIGEN_VAPIS =
 
 # force include config.h before gi18n.h.
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src \
-	-include $(CONFIG_HEADER) \
-	$(NULL)
+    -I$(top_srcdir)/src \
+    -I$(top_builddir)/src \
+    -include $(CONFIG_HEADER) \
+    $(NULL)
 
 AM_CFLAGS = \
-	@GLIB2_CFLAGS@ \
-	@GIO2_CFLAGS@ \
-	@GTHREAD2_CFLAGS@ \
-	-DG_LOG_DOMAIN=\"IBUS\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DIBUS_DISABLE_DEPRECATED \
-	-Wno-unused-variable \
-	-Wno-unused-but-set-variable \
-	-Wno-unused-function \
-	$(NULL)
+    @GLIB2_CFLAGS@ \
+    @GIO2_CFLAGS@ \
+    @GTHREAD2_CFLAGS@ \
+    -DG_LOG_DOMAIN=\"IBUS\" \
+    -DLIBEXECDIR=\"$(libexecdir)\" \
+    -DIBUS_DISABLE_DEPRECATED \
+    -Wno-unused-variable \
+    -Wno-unused-but-set-variable \
+    -Wno-unused-function \
+    $(NULL)
 
 AM_LDADD = \
     @GOBJECT2_LIBS@ \
@@ -63,6 +63,7 @@ AM_LDADD = \
     @GTHREAD2_LIBS@ \
     $(libibus) \
     $(libibusimmodule) \
+    -ldl               \
     $(NULL)
 
 AM_VALAFLAGS = \