Refine Makefile.am

3 files changed, 41 insertions, 34 deletions

diff --git a/client/gtk2/Makefile.am b/client/gtk2/Makefile.am
index 058b784..b5c251b 100644
--- a/client/gtk2/Makefile.am
+++ b/client/gtk2/Makefile.am
@@ -25,27 +25,31 @@ INCLUDES = \
 	-I$(top_srcdir)/lib/gtk2 \
 	$(NULL)
 
-
 immoduledir = @GTK_IM_MODULEDIR@
 immodule_LTLIBRARIES = im-ibus.la
-im_ibus_la_DEPENDENCIES = $(libibus_gtk)
+
 im_ibus_la_SOURCES = \
 	ibusim.c \
 	ibusimcontext.c \
 	ibusimcontext.h \
 	$(NULL)
+
+im_ibus_la_DEPENDENCIES = $(libibus_gtk)
+im_ibus_la_LIBADD = $(libibus_gtk)
+
 im_ibus_la_CFLAGS = \
 	@GTK2_CFLAGS@ \
 	@DBUS_CFLAGS@ \
 	-DG_LOG_DOMAIN=\"IBUS\" \
 	$(NULL)
+
 im_ibus_la_LDFLAGS = \
 	@GTK2_LIBS@ \
 	@DBUS_LIBS@ \
-	$(libibus_gtk) \
 	-avoid-version \
 	-module \
 	$(NULL)
+
 $(libibus_gtk):
 	(cd $(top_builddir)/lib/gtk2; make )
 
diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am
index 106ddaf..0e1c4ff 100644
--- a/client/x11/Makefile.am
+++ b/client/x11/Makefile.am
@@ -36,11 +36,14 @@ ibus_x11_DEPENDENCIES = \
 	$(NULL)
 
 ibus_x11_LDADD = \
-	@GTK2_LIBS@ \
 	$(libIMdkit) \
 	$(libibus_gtk) \
 	$(NULL)
 
+ibus_x11_LDFLAGS = \
+	@GTK2_LIBS@ \
+	$(NULL)
+
 ibus_x11_CFLAGS = \
 	@GTK2_CFLAGS@ \
 	-I$(top_srcdir)/util/IMdkit \
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 48c1674..d559030 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1.20080813\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2008-08-22 11:17+0800\n"
+"POT-Creation-Date: 2008-08-22 16:07+0800\n"
 "PO-Revision-Date: 2008-08-13 21:59+0800\n"
 "Last-Translator: Huang Peng <shawn.p.huang@gmail.com>\n"
 "Language-Team: Huang Peng <shawn.p.huang@gmail.com>\n"
@@ -383,39 +383,39 @@ msgstr "简体中文"
 msgid "Chinese (traditional)"
 msgstr "繁体中文"
 
-#: setup/main.py:91
+#: setup/main.py:92
 msgid "trigger"
 msgstr "开关"
 
-#: setup/main.py:91
+#: setup/main.py:92
 msgid "next_engine"
 msgstr "下一个引擎"
 
-#: setup/main.py:91
+#: setup/main.py:92
 msgid "prev_engine"
 msgstr "上一个引擎"
 
-#: setup/main.py:116
+#: setup/main.py:117
 msgid "IBus daemon is not started. Do you want to start it now?"
 msgstr "IBus守护进程没有启动，您是否想现在启动它？"
 
-#: setup/main.py:132
+#: setup/main.py:133
 msgid "IBus has been started! "
 msgstr "IBus已经启动了！"
 
-#: setup/main.py:154 setup/setup.glade:320
+#: setup/main.py:155 setup/setup.glade:321
 msgid "Engine"
 msgstr "输入法引擎"
 
-#: setup/main.py:178
+#: setup/main.py:179
 msgid "Started"
 msgstr "启动"
 
-#: setup/main.py:187
+#: setup/main.py:188
 msgid "Preload"
 msgstr "预加载"
 
-#: setup/main.py:196
+#: setup/main.py:197
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "选择%s的快捷键"
@@ -444,35 +444,35 @@ msgstr "请按一个键盘按键（或者一个组合按键）"
 msgid "IBus - Setup"
 msgstr "IBus - 设置"
 
-#: setup/setup.glade:27
+#: setup/setup.glade:28
 msgid "Auto start IBus on session login"
 msgstr "启动桌面时自动启动IBus"
 
-#: setup/setup.glade:57 setup/setup.glade:76 setup/setup.glade:127
-msgid "..."
-msgstr ""
-
-#: setup/setup.glade:143
-msgid "Previous engine:"
-msgstr "上一个引擎:"
+#: setup/setup.glade:56
+msgid "Trigger:"
+msgstr "开关:"
 
-#: setup/setup.glade:159
+#: setup/setup.glade:84
 msgid "Next engine:"
 msgstr "下一个引擎:"
 
-#: setup/setup.glade:189
-msgid "Trigger:"
-msgstr "开关:"
+#: setup/setup.glade:100
+msgid "Previous engine:"
+msgstr "上一个引擎:"
+
+#: setup/setup.glade:117 setup/setup.glade:166 setup/setup.glade:186
+msgid "..."
+msgstr ""
 
-#: setup/setup.glade:206
+#: setup/setup.glade:207
 msgid "Keyboard shortcuts"
 msgstr "快捷键"
 
-#: setup/setup.glade:235
+#: setup/setup.glade:236
 msgid "Lookup table orientation:"
 msgstr "候选词表方向:"
 
-#: setup/setup.glade:247
+#: setup/setup.glade:248
 msgid ""
 "Horizontal\n"
 "Vertical"
@@ -480,15 +480,15 @@ msgstr ""
 "水平\n"
 "竖直"
 
-#: setup/setup.glade:261
+#: setup/setup.glade:262
 msgid "Panel"
 msgstr "界面"
 
-#: setup/setup.glade:282
+#: setup/setup.glade:283
 msgid "General"
 msgstr "通用"
 
-#: setup/setup.glade:331
+#: setup/setup.glade:332
 msgid ""
 "IBus\n"
 "\n"
@@ -499,10 +499,10 @@ msgid ""
 "\n"
 msgstr ""
 
-#: setup/setup.glade:348
+#: setup/setup.glade:349
 msgid "About"
 msgstr "关于"
 
-#: setup/setup.glade:370
+#: setup/setup.glade:371
 msgid "gtk-close"
 msgstr ""