[uim-commit] r213 - in trunk: scm uim

[ekato@freedesktop.org]

Author: ekato
Date: 2005-01-09 23:09:36 -0800 (Sun, 09 Jan 2005)
New Revision: 213

Modified:
   trunk/scm/loader.scm
   trunk/uim/Makefile.am
   trunk/uim/skk-dic.c
   trunk/uim/uim.c
Log:
* uim/skk-dic.c : Update copyright.  Make SKK facility pluggable
  using uim_plugin_instance_init() and uim_plugin_instance_quit().
* uim/uim.c : Remove uim_init_skk_dic() and uim_quit_skk_dic().
* scm/loader.scm : Make SKK pluggable.	
* uim/Makefile.am : Remove skk-dic.c from libuim_la_SOURCES, and
  create skk module from the file.  Move -lcanna from
  libuim_canna_la_LDFLAGS to libuim_canna_la_LIBADD.  Remove
  "@LIBINT@ @LIBICONV@" from libuim_m17n_lib_la_LIBADD,
  libuim_scim_la_LIBADD, libuim_canna_la_LIBADD, and
  libuim_anthy_la_LIBADD.


Modified: trunk/scm/loader.scm
===================================================================
--- trunk/scm/loader.scm	2005-01-10 07:00:47 UTC (rev 212)
+++ trunk/scm/loader.scm	2005-01-10 07:09:36 UTC (rev 213)
@@ -40,7 +40,7 @@
 (load-plugin "canna")
 
 (require "prime.scm")
-(require "skk.scm")
+(load-plugin "skk")
 (require "tcode.scm")
 (require "tutcode.scm")
 

Modified: trunk/uim/Makefile.am
===================================================================
--- trunk/uim/Makefile.am	2005-01-10 07:00:47 UTC (rev 212)
+++ trunk/uim/Makefile.am	2005-01-10 07:09:36 UTC (rev 213)
@@ -14,7 +14,6 @@
 libuim_la_SOURCES = uim.c uim-scm.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 \
 		prime.c \
 		intl.c intl.h \
 		uim-ipc.c \
@@ -42,7 +41,7 @@
 if M17NLIB
   uim_plugin_LTLIBRARIES += libuim-m17nlib.la
   libuim_m17nlib_la_SOURCES = m17nlib.c
-  libuim_m17nlib_la_LIBADD = @LIBINTL@ @LIBICONV@ @M17NLIB_LIBS@ libuim.la
+  libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ libuim.la
   libuim_m17nlib_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
   libuim_m17nlib_la_CPPFLAGS = -I$(top_srcdir)
 endif
@@ -50,7 +49,7 @@
 if SCIM
   uim_plugin_LTLIBRARIES += libuim-scim.la
   libuim_scim_la_SOURCES = scim.cpp
-  libuim_scim_la_LIBADD = @LIBINTL@ @LIBICONV@ @SCIM_LIBS@ libuim.la
+  libuim_scim_la_LIBADD = @SCIM_LIBS@ libuim.la
   libuim_scim_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
   libuim_scim_la_CXXFLAGS = -I$(top_srcdir) @SCIM_CFLAGS@
 endif
@@ -58,19 +57,25 @@
 if CANNA
   uim_plugin_LTLIBRARIES += libuim-canna.la
   libuim_canna_la_SOURCES = canna.c
-  libuim_canna_la_LIBADD = @LIBINTL@ @LIBICONV@ libuim.la
-  libuim_canna_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module -lcanna
+  libuim_canna_la_LIBADD = libuim.la -lcanna
+  libuim_canna_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
   libuim_canna_la_CPPFLAGS = -I$(top_srcdir)
 endif
 
 if ANTHY
   uim_plugin_LTLIBRARIES += libuim-anthy.la
   libuim_anthy_la_SOURCES = anthy.c
-  libuim_anthy_la_LIBADD = @LIBINTL@ @LIBICONV@ libuim.la
+  libuim_anthy_la_LIBADD = libuim.la
   libuim_anthy_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
   libuim_anthy_la_CPPFLAGS = -I$(top_srcdir)
 endif
 
+uim_plugin_LTLIBRARIES += libuim-skk.la
+libuim_skk_la_SOURCES = skk-dic.c
+libuim_skk_la_LIBADD = libuim.la
+libuim_skk_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
+libuim_skk_la_CPPFLAGS = -I$(top_srcdir)
+
 libuimincludedir =  $(includedir)/uim
 
 libuim_la_LDFLAGS = -version-info 0:1:0 -export-symbols-regex uim.\*

Modified: trunk/uim/skk-dic.c
===================================================================
--- trunk/uim/skk-dic.c	2005-01-10 07:00:47 UTC (rev 212)
+++ trunk/uim/skk-dic.c	2005-01-10 07:09:36 UTC (rev 213)
@@ -1,6 +1,6 @@
 /*
 
-  Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+  Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
 
   All rights reserved.
 
@@ -49,6 +49,7 @@
 #include "uim-scm.h"
 #include "uim-compat-scm.h"
 #include "context.h"
+#include "plugin.h"
 
 /*
  * cand : candidate
@@ -2029,7 +2030,7 @@
 }
 
 void
-uim_init_skk_dic(void)
+uim_plugin_instance_init(void)
 {
   uim_scm_init_subr_1("skk-lib-dic-open", skk_dic_open);
   uim_scm_init_subr_1("skk-lib-read-personal-dictionary", skk_lib_read_personal_dictionary);
@@ -2051,7 +2052,7 @@
 }
 
 void
-uim_quit_skk_dic(void)
+uim_plugin_instance_quit(void)
 {
   struct skk_line *sl, *tmp;
 

Modified: trunk/uim/uim.c
===================================================================
--- trunk/uim/uim.c	2005-01-10 07:00:47 UTC (rev 212)
+++ trunk/uim/uim.c	2005-01-10 07:09:36 UTC (rev 213)
@@ -644,7 +644,6 @@
   uim_init_table_subrs();
 #endif
   uim_init_prime();
-  uim_init_skk_dic();
 
   scm_files = getenv("LIBUIM_SCM_FILES");
   uim_scm_set_lib_path((scm_files) ? scm_files : SCM_FILES);
@@ -714,7 +713,6 @@
     }
   }
   /**/
-  uim_quit_skk_dic();
   uim_quit_prime();
   uim_quit_plugin();
   uim_scm_quit();