[uim-commit] r164 - trunk/uim

[ekato@freedesktop.org]

Author: ekato
Date: 2005-01-07 21:54:23 -0800 (Fri, 07 Jan 2005)
New Revision: 164

Modified:
   trunk/uim/Makefile.am
   trunk/uim/plugin.c
Log:
* uim/plugin.c : Remove Mac OS X specific ".dylib" since module is
  now created with adding -module to libtool's LDFLAGS.
* uim/Makefile.am : Use -rpath $(uim_plugindir) -avoid-version
  -module for pluins LDFLAGS.


Modified: trunk/uim/Makefile.am
===================================================================
--- trunk/uim/Makefile.am	2005-01-08 04:01:25 UTC (rev 163)
+++ trunk/uim/Makefile.am	2005-01-08 05:54:23 UTC (rev 164)
@@ -39,7 +39,7 @@
   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_LDFLAGS = -luim
+  libuim_m17nlib_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
   libuim_m17nlib_la_CPPFLAGS = -I$(top_srcdir)
 endif
 
@@ -47,7 +47,7 @@
   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_LDFLAGS = -luim
+  libuim_scim_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
   libuim_scim_la_CXXFLAGS = -I$(top_srcdir) @SCIM_CFLAGS@
 endif
 
@@ -55,7 +55,7 @@
   uim_plugin_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_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
   libuim_canna_la_CPPFLAGS = -I$(top_srcdir)
 endif
 
@@ -63,7 +63,7 @@
   uim_plugin_LTLIBRARIES += libuim-anthy.la
   libuim_anthy_la_SOURCES = anthy.c
   libuim_anthy_la_LIBADD = @LIBINTL@ @LIBICONV@ libuim.la
-  libuim_anthy_la_LDFLAGS = -luim
+  libuim_anthy_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
   libuim_anthy_la_CPPFLAGS = -I$(top_srcdir)
 endif
 

Modified: trunk/uim/plugin.c
===================================================================
--- trunk/uim/plugin.c	2005-01-08 04:01:25 UTC (rev 163)
+++ trunk/uim/plugin.c	2005-01-08 05:54:23 UTC (rev 164)
@@ -56,11 +56,7 @@
 #endif
 
 #define PLUGIN_PREFIX "libuim-"
-#ifdef __APPLE__
-  #define PLUGIN_SUFFIX ".dylib"
-#else
-  #define PLUGIN_SUFFIX ".so"
-#endif /* __APPLE__ */
+#define PLUGIN_SUFFIX ".so"
 
 static uim_plugin_info_list *uim_plugin_list = NULL;
 static void plugin_list_append(uim_plugin_info_list *entry);
@@ -179,7 +175,7 @@
 void uim_init_plugin(void)
 {
   /* This function is called before scheme files are loaded. Plugin's search 
-   * path(both .so(.dylib) and .scm) should be got from plugin.scm.
+   * path(both .so and .scm) should be got from plugin.scm.
    */
   char *plugin_lib_dir_env;
   char *plugin_scm_dir_env;