Revision: 7107
Author: ek.kato
Date: Mon May 23 23:36:02 2011
Log: * uim/uim-eb.c : Remove obsolete comment.
* uim/uim-eb.h : Ditto. Don't use UIM_GTK_ prefix for the include
guard.
* uim/Makefile.am
- (lib-eb-static.la) : Don't build because the convenience
library is no longer used by other than libuim-eb.so.
- (libuim_eb_la_SOURCES) : Use uim-eb.[ch] directory.
- (libuim_eb_la_LIBADD) : Remove lib-eb-static.la.
http://code.google.com/p/uim/source/detail?r=7107
Modified:
/trunk/uim/Makefile.am
/trunk/uim/uim-eb.c
/trunk/uim/uim-eb.h
=======================================
--- /trunk/uim/Makefile.am Mon May 23 23:22:35 2011
+++ /trunk/uim/Makefile.am Mon May 23 23:36:02 2011
@@ -174,16 +174,9 @@
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 = eb.c
-libuim_eb_la_LIBADD = libuim-scm.la libuim.la lib-eb-static.la \
+libuim_eb_la_SOURCES = eb.c uim-eb.c uim-eb.h
+libuim_eb_la_LIBADD = libuim-scm.la libuim.la \
@EBCONF_EBLIBS@ @EBCONF_ZLIBLIBS@ \
@EBCONF_INTLLIBS@
libuim_eb_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module \
=======================================
--- /trunk/uim/uim-eb.c Thu Jan 6 18:09:56 2011
+++ /trunk/uim/uim-eb.c Mon May 23 23:36:02 2011
@@ -31,9 +31,6 @@
*/
-/* FIXME! This is a ad-hoc solution to advance
- annotation related discussion. */
-
#include <config.h>
#include <stdio.h>
=======================================
--- /trunk/uim/uim-eb.h Thu Jan 6 18:09:56 2011
+++ /trunk/uim/uim-eb.h Mon May 23 23:36:02 2011
@@ -31,11 +31,8 @@
*/
-/* FIXME! This is a ad-hoc solution to advance
- annotation related discussion. */
-
-#ifndef UIM_GTK_UIM_EB_H
-#define UIM_GTK_UIM_EB_H
+#ifndef UIM_EB_H
+#define UIM_EB_H
typedef struct _uim_eb uim_eb;
