Revision: 6116
Author: iratqq
Date: Tue Dec 8 01:26:48 2009
Log: * uim/Makefile.am (noinst_LTLIBRARIES):
- Build libuim-eb-static.la.
* gtk/Makefile.am (im_uim_la_LIBADD):
- Use it.
http://code.google.com/p/uim/source/detail?r=6116
Modified:
/trunk/gtk/Makefile.am
/trunk/uim/Makefile.am
=======================================
--- /trunk/gtk/Makefile.am Mon Dec 7 22:44:07 2009
+++ /trunk/gtk/Makefile.am Tue Dec 8 01:26:48 2009
@@ -34,7 +34,7 @@
compose.c compose.h text-util.c text-util.h
if EB
-im_uim_la_LIBADD += ../uim/libuim_eb_la-uim-eb.lo
+im_uim_la_LIBADD += ../uim/lib-eb-static.la
endif
noinst_PROGRAMS = gtk-rc-get-immodule-file
=======================================
--- /trunk/uim/Makefile.am Mon Dec 7 22:03:40 2009
+++ /trunk/uim/Makefile.am Tue Dec 8 01:26:48 2009
@@ -174,17 +174,24 @@
endif
if EB
+noinst_LTLIBRARIES += lib-eb-static.la
+lib_eb_static_la_SOURCES = uim-eb.c uim-eb.h
+lib_eb_static_la_CPPFLAGS = -I$(top_srcdir) \
+ @EBCONF_EBINCS@ @EBCONF_ZLIBINCS@ \
+ @EBCONF_PTHREAD_CPPFLAGS@ \
+ @EBCONF_INTLINCS@
+
uim_plugin_LTLIBRARIES += libuim-eb.la
-libuim_eb_la_SOURCES = uim-eb.c uim-eb.h eb.c
-libuim_eb_la_LIBADD = libuim-scm.la libuim.la @EBCONF_EBLIBS@
@EBCONF_ZLIBLIBS@ \
+libuim_eb_la_SOURCES = eb.c
+libuim_eb_la_LIBADD = libuim-scm.la libuim.la lib-eb-static.la \
+ @EBCONF_EBLIBS@ @EBCONF_ZLIBLIBS@ \
@EBCONF_INTLLIBS@
libuim_eb_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module \
@EBCONF_PTHREAD_LDFLAGS@
libuim_eb_la_CPPFLAGS = -I$(top_srcdir) \
@EBCONF_EBINCS@ @EBCONF_ZLIBINCS@ \
@EBCONF_PTHREAD_CPPFLAGS@ \
- @EBCONF_INTLINCS@ \
- @GTK2_CFLAGS@
+ @EBCONF_INTLINCS@
libuim_eb_la_CFLAGS = @EBCONF_PTHREAD_CFLAGS@ -Wall
endif
