diff options
| author | Huang Peng <shawn.p.huang@gmail.com> | 2008-08-22 16:42:36 +0800 |
|---|---|---|
| committer | Huang Peng <shawn.p.huang@gmail.com> | 2008-08-22 16:42:36 +0800 |
| commit | 938981abbe11994677fc646d7146ac1d9a9413f3 (patch) | |
| tree | 9d0242be3e0fe7cfd0836eeba0c00ab7b9ad8039 /client | |
| parent | 0ac5c124f8cea65f5cde563c44190e8e84063421 (diff) | |
| download | ibus-938981abbe11994677fc646d7146ac1d9a9413f3.tar.gz ibus-938981abbe11994677fc646d7146ac1d9a9413f3.tar.xz ibus-938981abbe11994677fc646d7146ac1d9a9413f3.zip | |
Refine Makefile.am
Diffstat (limited to 'client')
| -rw-r--r-- | client/gtk2/Makefile.am | 10 | ||||
| -rw-r--r-- | client/x11/Makefile.am | 5 |
2 files changed, 11 insertions, 4 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 \ |