Author: tkng
Date: Tue Dec 14 01:08:05 2004
New Revision: 34

Modified:
   trunk/uim/Makefile.am

Log:
* uim/Makefile.am: SCIM and Canna is defined as plugin.



Modified: trunk/uim/Makefile.am
==============================================================================
--- trunk/uim/Makefile.am       (original)
+++ trunk/uim/Makefile.am       Tue Dec 14 01:08:05 2004
@@ -4,39 +4,50 @@
 
 uim_defs = -DSCM_FILES=\"$(datadir)/uim\"
 
-lib_LTLIBRARIES = libuim.la libuim-m17nlib.la libuim-scim.la
+lib_LTLIBRARIES = libuim.la
 
 pkginclude_HEADERS = uim.h uim-util.h uim-helper.h uim-im-switcher.h uim-scm.h 
plugin.h
 
-libuim_la_SOURCES = uim.c uim-func.c \
-               uim-key.c uim-util.c  uim-helper.c uim-helper-client.c \
+libuim_la_SOURCES = uim.c uim-func.c uim-key.c uim-util.c \
+               slib.c siod.h context.h gettext.h \
+               uim-helper.c uim-helper-client.c \
                skk-dic.c anthy.c \
                prime.c \
-               slib.c siod.h context.h gettext.h \
                intl.c intl.h \
                uim-ipc.c uim-table.c \
                getpeereid.c \
                setenv.c \
-               $(canna_source) \
                plugin.c
 
-if CANNA
-canna_source = canna.c
-endif
-
 if M17NLIB
+  lib_LTLIBRARIES += libuim-m17nlib.la
   libuim_m17nlib_la_SOURCES = m17nlib.c
   libuim_m17nlib_la_LIBADD = @LIBINTL@ @LIBICONV@ @M17NLIB_LIBS@ libuim.la
   libuim_m17nlib_la_LDFLAGS = -luim
   libuim_m17nlib_la_CPPFLAGS = -I$(top_srcdir)
 endif
 
+if SCIM
+  lib_LTLIBRARIES += libuim-scim.la
+  libuim_scim_la_SOURCES = scim.cpp
+  libuim_scim_la_LIBADD = @LIBINTL@ @LIBICONV@ @SCIM_LIBS@ libuim.la
+  libuim_scim_la_LDFLAGS = -luim
+  libuim_scim_la_CXXFLAGS = -I$(top_srcdir) @SCIM_CFLAGS@
+endif
+
+if CANNA
+  lib_LTLIBRARIES += libuim-canna.la
+  libuim_canna_la_SOURCES = canna.c
+  libuim_canna_la_LIBADD = @LIBINTL@ @LIBICONV@ libuim.la
+  libuim_canna_la_LDFLAGS = -luim
+  libuim_canna_la_CPPFLAGS = -I$(top_srcdir)
+endif
+
 libuimincludedir =  $(includedir)/uim
 
 libuim_la_LDFLAGS = -version-info 0:1:0 -export-symbols-regex uim.\*
 libuim_la_LIBADD = @LIBINTL@ @LIBICONV@
-libuim_la_CPPFLAGS = $(uim_defs) -I$(top_srcdir)
-libuim_la_CFLAGS = -DLIBDIR=\"$(libdir)\"
+libuim_la_CPPFLAGS = $(uim_defs) -I$(top_srcdir) -DLIBDIR=\"$(libdir)\"
 
 if DEBUG
 libuim_la_CPPFLAGS += -DDEBUG -DDEBUG_SCM=1

Reply via email to