kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 1.8.0.

Browse source 
Feature safe:	yes
This commit is contained in:
MANTANI Nobutaka 2012-04-01 15:41:28 +00:00
parent 4512e6eeb1
commit e7db971f3c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=294084
32 changed files with 485 additions and 536 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
japanese/uim-anthy/Makefile
View file

@ -32,13 +32,13 @@ CONFIGURE_ARGS+= --with-gtk2 --enable-dict
UIM_SLAVE= yes
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-uim_Makefile.in \
${PATCHDIR}/extra-patch-helper_Makefile.in
${PATCHDIR}/extra-patch-gtk2_dict_Makefile.in
do-build:
(cd ${WRKSRC}/uim && ${GMAKE} libuim-anthy.la)
(cd ${WRKSRC}/uim && ${GMAKE} libuim-anthy-utf8.la)
.if !defined(WITHOUT_X11)
(cd ${WRKSRC}/helper && ${GMAKE} uim-dict-gtk)
(cd ${WRKSRC}/gtk2/dict && ${GMAKE} uim-dict-gtk)
.endif
do-install:
@ -46,7 +46,7 @@ do-install:
${GMAKE} uim_plugin_LTLIBRARIES=libuim-anthy.la install-uim_pluginLTLIBRARIES && \
${GMAKE} uim_plugin_LTLIBRARIES=libuim-anthy-utf8.la install-uim_pluginLTLIBRARIES)
.if !defined(WITHOUT_X11)
(cd ${WRKSRC}/helper && ${GMAKE} bin_PROGRAMS=uim-dict-gtk install-binPROGRAMS install-uim_dict_uiDATA)
(cd ${WRKSRC}/gtk2/dict && ${GMAKE} bin_PROGRAMS=uim-dict-gtk install-binPROGRAMS install-uim_dict_uiDATA)
.endif
post-install:

7
textproc/uim-el/Makefile
View file

@ -6,8 +6,7 @@
#
PORTNAME= uim-el
PORTVERSION= 1.7.3
PORTREVISION= 1
PORTVERSION= 1.8.0
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
@ -18,8 +17,8 @@ COMMENT?= Emacs lisp for uim input method library
PROJECTHOST= uim
CONFLICTS?= uim-el-xemacs21-mule-[0-9]* \
uim-el-emacs22-[0-9]* \
uim-el-emacs21-[0-9]*
uim-el-emacs22-[0-9]* \
uim-el-emacs21-[0-9]*
RUN_DEPENDS= uim-el-agent:${PORTSDIR}/textproc/uim

4
textproc/uim-el/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (uim-1.7.3.tar.bz2) = d2909d2d624a92677935461ce03413f33b7e5af6e19796410406628e59bd561c
SIZE (uim-1.7.3.tar.bz2) = 6380469
SHA256 (uim-1.8.0.tar.bz2) = bf760f51b37e4d3a2c960357faea2ef52d1bb7ee06252284c47e431cde88ecc6
SIZE (uim-1.8.0.tar.bz2) = 6453678

8
textproc/uim-gnome/Makefile
View file

@ -21,17 +21,17 @@ CONFIGURE_ARGS= --with-gtk2 --enable-gnome-applet
UIM_SLAVE= yes
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-helper_Makefile.in
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gtk2_toolbar_Makefile.in
.if defined(WITHOUT_X11)
IGNORE= requires X11
.endif
do-build:
(cd ${WRKSRC}/helper && ${GMAKE})
(cd ${WRKSRC}/gtk2/toolbar && ${GMAKE})
do-install:
(cd ${WRKSRC}/helper && \
${GMAKE} am__EXEEXT_3="" install-serverDATA install-libexecPROGRAMS)
(cd ${WRKSRC}/gtk2/toolbar && \
${GMAKE} install-serverDATA install-libexecPROGRAMS)
.include "${MASTERDIR}/Makefile"

21
textproc/uim-gtk/Makefile
View file

@ -18,8 +18,11 @@ CONFIGURE_ARGS= --with-gtk2 --enable-pref
UIM_SLAVE= yes
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gtk_Makefile.in \
${PATCHDIR}/extra-patch-helper_Makefile.in
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gtk2_immodule_Makefile.in \
${PATCHDIR}/extra-patch-gtk2_pad_Makefile.in \
${PATCHDIR}/extra-patch-gtk2_pref_Makefile.in \
${PATCHDIR}/extra-patch-gtk2_switcher_Makefile.in \
${PATCHDIR}/extra-patch-gtk2_toolbar_Makefile.in
.if defined(WITHOUT_X11)
IGNORE= requires X11
@ -27,11 +30,17 @@ IGNORE= requires X11
do-build:
(cd ${WRKSRC}/uim && ${GMAKE} libuim-x-util.la libuim-counted-init.la)
(cd ${WRKSRC}/gtk && ${GMAKE})
(cd ${WRKSRC}/helper && ${GMAKE})
(cd ${WRKSRC}/gtk2/immodule && ${GMAKE})
(cd ${WRKSRC}/gtk2/pad && ${GMAKE})
(cd ${WRKSRC}/gtk2/pref && ${GMAKE})
(cd ${WRKSRC}/gtk2/switcher && ${GMAKE})
(cd ${WRKSRC}/gtk2/toolbar && ${GMAKE})
do-install:
(cd ${WRKSRC}/gtk && ${GMAKE} install)
(cd ${WRKSRC}/helper && ${GMAKE} install-binPROGRAMS)
(cd ${WRKSRC}/gtk2/immodule && ${GMAKE} install)
(cd ${WRKSRC}/gtk2/pad && ${GMAKE} install)
(cd ${WRKSRC}/gtk2/pref && ${GMAKE} install)
(cd ${WRKSRC}/gtk2/switcher && ${GMAKE} install)
(cd ${WRKSRC}/gtk2/toolbar && ${GMAKE} install)
.include "${MASTERDIR}/Makefile"

1
textproc/uim-gtk3/pkg-plist
View file

@ -7,6 +7,7 @@ lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-uim.a
lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-uim.la
lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-uim.so
libexec/uim-candwin-gtk3
libexec/uim-candwin-horizontal-gtk3
libexec/uim-candwin-tbl-gtk3
@exec gtk-query-immodules-3.0 > %D/etc/gtk-3.0/gtk.immodules
@unexec gtk-query-immodules-3.0 > %D/etc/gtk-3.0/gtk.immodules

6
textproc/uim-kde/Makefile
View file

@ -28,16 +28,16 @@ LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
CXXFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
UIM_SLAVE= yes
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-qt_Makefile.in
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-qt3_toolbar_Makefile.in
.if defined(WITHOUT_X11)
IGNORE= requires X11
.endif
do-build:
(cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} ${GMAKE} uim_panelapplet.la)
(cd ${WRKSRC}/qt3/toolbar && ${SETENV} ${MAKE_ENV} ${GMAKE} uim_panelapplet.la)
do-install:
(cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} ${GMAKE} install-appletLTLIBRARIES install-lnkDATA)
(cd ${WRKSRC}/qt3/toolbar && ${SETENV} ${MAKE_ENV} ${GMAKE} install-appletLTLIBRARIES install-lnkDATA)
.include "${MASTERDIR}/Makefile"

11
textproc/uim-qt/Makefile
View file

@ -25,8 +25,11 @@ LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
CXXFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
UIM_SLAVE= yes
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-qt_Makefile.in \
${PATCHDIR}/extra-patch-qt_chardict_po_Makefile.in.in
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-qt3_candwin_Makefile.in \
${PATCHDIR}/extra-patch-qt3_immodule_Makefile.in \
${PATCHDIR}/extra-patch-qt3_pref_Makefile.in \
${PATCHDIR}/extra-patch-qt3_switcher_Makefile.in \
${PATCHDIR}/extra-patch-qt3_toolbar_Makefile.in
.if defined(WITHOUT_X11)
IGNORE= requires X11
@ -34,9 +37,9 @@ IGNORE= requires X11
do-build:
(cd ${WRKSRC}/uim && ${SETENV} ${MAKE_ENV} ${GMAKE} libuim-counted-init.la)
(cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} ${GMAKE})
(cd ${WRKSRC}/qt3 && ${SETENV} ${MAKE_ENV} ${GMAKE})
do-install:
(cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} ${GMAKE} install)
(cd ${WRKSRC}/qt3 && ${SETENV} ${MAKE_ENV} ${GMAKE} install)
.include "${MASTERDIR}/Makefile"

1
textproc/uim-qt/pkg-plist
View file

@ -5,4 +5,3 @@ bin/uim-toolbar-qt
libexec/uim-candwin-qt
%%DATADIR%%/helperdata/bushu.t
@dirrmtry %%DATADIR%%/helperdata
share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo

1
textproc/uim-qt4/pkg-plist
View file

@ -2,7 +2,6 @@ bin/uim-chardict-qt4
bin/uim-im-switcher-qt4
bin/uim-pref-qt4
bin/uim-toolbar-qt4
share/locale/ja/LC_MESSAGES/uim-chardict-qt4.mo
lib/qt4/plugins/inputmethods/libuiminputcontextplugin.so
libexec/uim-candwin-qt4
%%DATADIR%%/helperdata/bushu.t

14
textproc/uim/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= uim
PORTVERSION= 1.7.3
PORTVERSION= 1.8.0
CATEGORIES?= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
.if !defined(UIM_SLAVE) && defined(WITHOUT_X11)
@ -86,19 +86,23 @@ post-patch:
do-build:
.if !defined(UIM_SLAVE)
.for d in replace sigscheme uim scm xim po fep emacs pixmaps
.for d in replace sigscheme uim scm xim po fep emacs pixmaps tables
cd ${WRKSRC}/${d} && ${GMAKE}
.endfor
cd ${WRKSRC}/helper && ${GMAKE}
.if !defined(WITHOUT_X11)
cd ${WRKSRC}/gtk2/candwin && ${GMAKE}
.endif
.endif
do-install:
.if !defined(UIM_SLAVE)
cd ${WRKSRC} && ${GMAKE} install-data-am
.for d in sigscheme uim scm xim po fep emacs pixmaps
.for d in sigscheme uim scm xim po fep emacs pixmaps tables
cd ${WRKSRC}/${d} && ${GMAKE} install
.endfor
cd ${WRKSRC}/helper && ${GMAKE} install-libexecPROGRAMS
.if !defined(WITHOUT_X11)
cd ${WRKSRC}/gtk2/candwin && ${GMAKE} install
.endif
.endif
.if !defined(UIM_SLAVE)

4
textproc/uim/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (uim-1.7.3.tar.bz2) = d2909d2d624a92677935461ce03413f33b7e5af6e19796410406628e59bd561c
SIZE (uim-1.7.3.tar.bz2) = 6380469
SHA256 (uim-1.8.0.tar.bz2) = bf760f51b37e4d3a2c960357faea2ef52d1bb7ee06252284c47e431cde88ecc6
SIZE (uim-1.8.0.tar.bz2) = 6453678

22
textproc/uim/files/extra-patch-gtk2_dict_Makefile.in Normal file
View file

@ -0,0 +1,22 @@
--- gtk2/dict/Makefile.in.orig 2012-04-01 03:16:41.000000000 +0900
+++ gtk2/dict/Makefile.in 2012-04-01 03:18:52.000000000 +0900
@@ -94,8 +94,6 @@
uim_dict_gtk_OBJECTS = $(am_uim_dict_gtk_OBJECTS)
am__DEPENDENCIES_1 =
@DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_DEPENDENCIES = \
-@DICT_TRUE@@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@DICT_TRUE@@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
@DICT_TRUE@@GTK2_TRUE@ $(am__DEPENDENCIES_1) \
@DICT_TRUE@@GTK2_TRUE@ $(am__DEPENDENCIES_1) \
@DICT_TRUE@@GTK2_TRUE@ $(am__DEPENDENCIES_1)
@@ -419,8 +417,8 @@
@DICT_TRUE@@GTK2_TRUE@ cclass-dialog.h $(am__append_1) \
@DICT_TRUE@@GTK2_TRUE@ $(am__append_4) $(am__append_7)
@DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_LDADD = @GTK2_LIBS@ \
-@DICT_TRUE@@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@DICT_TRUE@@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
+@DICT_TRUE@@GTK2_TRUE@ -luim-scm \
+@DICT_TRUE@@GTK2_TRUE@ -luim \
@DICT_TRUE@@GTK2_TRUE@ $(am__append_2) $(am__append_5) \
@DICT_TRUE@@GTK2_TRUE@ $(am__append_8)
@DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_CPPFLAGS = $(helper_defs) \

18
textproc/uim/files/extra-patch-gtk_Makefile.in → textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in
View file

@ -1,20 +1,16 @@
--- ./gtk/Makefile.in.orig 2011-05-17 06:16:12.000000000 +0200
+++ ./gtk/Makefile.in 2011-05-30 01:30:45.000000000 +0200
@@ -81,11 +81,9 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
--- gtk2/immodule/Makefile.in.orig 2012-04-01 04:00:38.000000000 +0900
+++ gtk2/immodule/Makefile.in 2012-04-01 04:04:21.000000000 +0900
@@ -82,8 +82,7 @@
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(moduledir)"
-LTLIBRARIES = $(module_LTLIBRARIES)
LTLIBRARIES = $(module_LTLIBRARIES)
-@GTK2_TRUE@im_uim_la_DEPENDENCIES = $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-counted-init.la \
+@GTK2_TRUE@im_uim_la_DEPENDENCIES = $(top_builddir)/uim/libuim-counted-init.la \
+@GTK2_TRUE@im_uim_la_DEPENDENCIES = \
@GTK2_TRUE@ $(top_builddir)/uim/libuim-counted-init.la \
@GTK2_TRUE@ $(am__append_1)
+LTLIBRARIES = $(module_LTLIBRARIES)
am__im_uim_la_SOURCES_DIST = gtk-im-uim.c gtk-im-uim.h key-util-gtk.c \
key-util-gtk.h uim-cand-win-gtk.c uim-cand-win-gtk.h \
uim-cand-win-tbl-gtk.c uim-cand-win-tbl-gtk.h \
@@ -443,8 +441,8 @@
@@ -411,8 +410,8 @@
@GTK2_TRUE@module_LTLIBRARIES = $(im_uim_la)
@GTK2_TRUE@im_uim_la_SOURCES = $(IM_UIM_SOURCES)
@GTK2_TRUE@im_uim_la_LDFLAGS = -module -avoid-version @GTK2_LIBS@

24
textproc/uim/files/extra-patch-gtk2_pad_Makefile.in Normal file
View file

@ -0,0 +1,24 @@
--- gtk2/pad/Makefile.in.orig 2012-04-01 03:20:14.000000000 +0900
+++ gtk2/pad/Makefile.in 2012-04-01 03:21:13.000000000 +0900
@@ -63,9 +63,7 @@
@GTK2_TRUE@am_uim_input_pad_ja_OBJECTS = \
@GTK2_TRUE@ uim_input_pad_ja-ja.$(OBJEXT)
uim_input_pad_ja_OBJECTS = $(am_uim_input_pad_ja_OBJECTS)
-@GTK2_TRUE@uim_input_pad_ja_DEPENDENCIES = \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
+@GTK2_TRUE@uim_input_pad_ja_DEPENDENCIES =
uim_input_pad_ja_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_input_pad_ja_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -353,8 +351,8 @@
top_srcdir = @top_srcdir@
uim_pixmapsdir = @uim_pixmapsdir@
@GTK2_TRUE@uim_input_pad_ja_SOURCES = ja.c
-@GTK2_TRUE@uim_input_pad_ja_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
+@GTK2_TRUE@uim_input_pad_ja_LDADD = @GTK2_LIBS@ -luim-scm \
+@GTK2_TRUE@ -luim
@GTK2_TRUE@uim_input_pad_ja_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
@GTK2_TRUE@uim_input_pad_ja_CFLAGS = @GTK2_CFLAGS@

25
textproc/uim/files/extra-patch-gtk2_pref_Makefile.in Normal file
View file

@ -0,0 +1,25 @@
--- gtk2/pref/Makefile.in.orig 2012-04-01 03:22:10.000000000 +0900
+++ gtk2/pref/Makefile.in 2012-04-01 03:28:01.000000000 +0900
@@ -69,9 +69,6 @@
@GTK2_4_TRUE@@PREF_TRUE@ uim_pref_gtk-key-util-gtk.$(OBJEXT)
uim_pref_gtk_OBJECTS = $(am_uim_pref_gtk_OBJECTS)
@GTK2_4_TRUE@@PREF_TRUE@uim_pref_gtk_DEPENDENCIES = \
-@GTK2_4_TRUE@@PREF_TRUE@ $(top_builddir)/uim/libuim-custom.la \
-@GTK2_4_TRUE@@PREF_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_4_TRUE@@PREF_TRUE@ $(top_builddir)/uim/libuim.la \
@GTK2_4_TRUE@@PREF_TRUE@ $(am__append_1)
uim_pref_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_pref_gtk_CFLAGS) \
@@ -367,9 +364,9 @@
@GTK2_4_TRUE@@PREF_TRUE@ ../immodule/key-util-gtk.h
@GTK2_4_TRUE@@PREF_TRUE@uim_pref_gtk_LDADD = @GTK2_LIBS@ \
-@GTK2_4_TRUE@@PREF_TRUE@ $(top_builddir)/uim/libuim-custom.la \
-@GTK2_4_TRUE@@PREF_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_4_TRUE@@PREF_TRUE@ $(top_builddir)/uim/libuim.la \
+@GTK2_4_TRUE@@PREF_TRUE@ -luim-custom \
+@GTK2_4_TRUE@@PREF_TRUE@ -luim-scm \
+@GTK2_4_TRUE@@PREF_TRUE@ -luim \
@GTK2_4_TRUE@@PREF_TRUE@ $(am__append_1)
@GTK2_4_TRUE@@PREF_TRUE@uim_pref_gtk_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
@GTK2_4_TRUE@@PREF_TRUE@uim_pref_gtk_CFLAGS = @GTK2_CFLAGS@

29
textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in Normal file
View file

@ -0,0 +1,29 @@
--- gtk2/switcher/Makefile.in.orig 2012-04-01 03:28:48.000000000 +0900
+++ gtk2/switcher/Makefile.in 2012-04-01 03:30:27.000000000 +0900
@@ -63,11 +63,7 @@
@GTK2_TRUE@am_uim_im_switcher_gtk_OBJECTS = \
@GTK2_TRUE@ uim_im_switcher_gtk-gtk.$(OBJEXT)
uim_im_switcher_gtk_OBJECTS = $(am_uim_im_switcher_gtk_OBJECTS)
-@GTK2_TRUE@uim_im_switcher_gtk_DEPENDENCIES = \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-custom.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
+@GTK2_TRUE@uim_im_switcher_gtk_DEPENDENCIES =
uim_im_switcher_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(uim_im_switcher_gtk_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -356,10 +352,9 @@
top_srcdir = @top_srcdir@
uim_pixmapsdir = @uim_pixmapsdir@
@GTK2_TRUE@uim_im_switcher_gtk_SOURCES = gtk.c
-@GTK2_TRUE@uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-custom.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
+@GTK2_TRUE@uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ -luim-scm \
+@GTK2_TRUE@ -luim-custom \
+@GTK2_TRUE@ -luim
@GTK2_TRUE@uim_im_switcher_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
@GTK2_TRUE@uim_im_switcher_gtk_CFLAGS = @GTK2_CFLAGS@

84
textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in Normal file
View file

@ -0,0 +1,84 @@
--- gtk2/toolbar/Makefile.in.orig 2012-03-30 22:02:18.000000000 +0900
+++ gtk2/toolbar/Makefile.in 2012-04-01 04:11:24.000000000 +0900
@@ -71,10 +71,7 @@
@APPLET_GNOME_TRUE@ uim_toolbar_applet-applet-gnome.$(OBJEXT) \
@APPLET_GNOME_TRUE@ uim_toolbar_applet-common-gtk.$(OBJEXT)
uim_toolbar_applet_OBJECTS = $(am_uim_toolbar_applet_OBJECTS)
-@APPLET_GNOME_TRUE@uim_toolbar_applet_DEPENDENCIES = \
-@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim.la \
-@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim-custom.la
+@APPLET_GNOME_TRUE@uim_toolbar_applet_DEPENDENCIES =
uim_toolbar_applet_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(uim_toolbar_applet_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -82,9 +79,7 @@
am_uim_toolbar_gtk_OBJECTS = uim_toolbar_gtk-standalone-gtk.$(OBJEXT) \
uim_toolbar_gtk-common-gtk.$(OBJEXT)
uim_toolbar_gtk_OBJECTS = $(am_uim_toolbar_gtk_OBJECTS)
-uim_toolbar_gtk_DEPENDENCIES = $(top_builddir)/uim/libuim-scm.la \
- $(top_builddir)/uim/libuim.la \
- $(top_builddir)/uim/libuim-custom.la
+uim_toolbar_gtk_DEPENDENCIES =
uim_toolbar_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_toolbar_gtk_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -94,10 +89,7 @@
uim_toolbar_gtk_systray-eggtrayicon.$(OBJEXT)
uim_toolbar_gtk_systray_OBJECTS = \
$(am_uim_toolbar_gtk_systray_OBJECTS)
-uim_toolbar_gtk_systray_DEPENDENCIES = \
- $(top_builddir)/uim/libuim-scm.la \
- $(top_builddir)/uim/libuim.la \
- $(top_builddir)/uim/libuim-custom.la
+uim_toolbar_gtk_systray_DEPENDENCIES =
uim_toolbar_gtk_systray_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(uim_toolbar_gtk_systray_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -412,16 +404,16 @@
EXTRA_DIST = GNOME_UimApplet.server.in.in
helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\"
@APPLET_GNOME_TRUE@uim_toolbar_applet_LDADD = @GTK2_LIBS@ @APPLET_GNOME_LIBS@ \
-@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim.la \
-@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim-custom.la
+@APPLET_GNOME_TRUE@ -luim-scm \
+@APPLET_GNOME_TRUE@ -luim \
+@APPLET_GNOME_TRUE@ -luim-custom
@APPLET_GNOME_TRUE@uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
@APPLET_GNOME_TRUE@uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @APPLET_GNOME_CFLAGS@
# recent version of gcc has the option to suppress the warning
#uim_toolbar_applet_CFLAGS += -Wno-overlength-strings
@APPLET_GNOME_TRUE@uim_toolbar_applet_SOURCES = applet-gnome.c common-gtk.c
-@APPLET_GNOME_TRUE@serverdir = $(libdir)/bonobo/servers
+@APPLET_GNOME_TRUE@serverdir = $(prefix)/libdata/bonobo/servers
@APPLET_GNOME_TRUE@server_DATA = GNOME_UimApplet.server
@APPLET_GNOME_TRUE@server_in_files = $(server_DATA:=.in)
@APPLET_GNOME_TRUE@server_in_in_files = $(server_in_files:=.in)
@@ -429,9 +421,9 @@
@APPLET_GNOME_TRUE@ GNOME_UimApplet.server.in.tmp
uim_toolbar_gtk_SOURCES = standalone-gtk.c common-gtk.c
-uim_toolbar_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
- $(top_builddir)/uim/libuim.la \
- $(top_builddir)/uim/libuim-custom.la
+uim_toolbar_gtk_LDADD = @GTK2_LIBS@ -luim-scm \
+ -luim \
+ -luim-custom
uim_toolbar_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@
@@ -440,9 +432,9 @@
uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ \
@X11_LIBS@ \
- $(top_builddir)/uim/libuim-scm.la \
- $(top_builddir)/uim/libuim.la \
- $(top_builddir)/uim/libuim-custom.la
+ -luim-scm \
+ -luim \
+ -luim-custom
uim_toolbar_gtk_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
uim_toolbar_gtk_systray_CFLAGS = @GTK2_CFLAGS@

46
textproc/uim/files/extra-patch-gtk3_candwin_Makefile.in
View file

@ -1,7 +1,7 @@
--- gtk3/candwin/Makefile.in.orig 2011-08-06 17:58:24.000000000 +0900
+++ gtk3/candwin/Makefile.in 2011-08-06 17:58:27.000000000 +0900
@@ -67,9 +67,6 @@
@GTK3_TRUE@ uim_candwin_gtk3-candwin-gtk.$(OBJEXT) \
--- gtk3/candwin/Makefile.in.orig 2012-03-30 22:02:18.000000000 +0900
+++ gtk3/candwin/Makefile.in 2012-04-01 04:53:52.000000000 +0900
@@ -68,9 +68,6 @@
@GTK3_TRUE@ uim_candwin_gtk3-gtk.$(OBJEXT) \
@GTK3_TRUE@ uim_candwin_gtk3-caret-state-indicator.$(OBJEXT)
uim_candwin_gtk3_OBJECTS = $(am_uim_candwin_gtk3_OBJECTS)
-@GTK3_TRUE@uim_candwin_gtk3_DEPENDENCIES = \
@ -10,8 +10,19 @@
uim_candwin_gtk3_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_candwin_gtk3_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -81,9 +78,6 @@
@GTK3_TRUE@ uim_candwin_tbl_gtk3-candwin-tbl-gtk.$(OBJEXT) \
@@ -82,9 +79,7 @@
@GTK3_TRUE@ uim_candwin_horizontal_gtk3-caret-state-indicator.$(OBJEXT)
uim_candwin_horizontal_gtk3_OBJECTS = \
$(am_uim_candwin_horizontal_gtk3_OBJECTS)
-@GTK3_TRUE@uim_candwin_horizontal_gtk3_DEPENDENCIES = \
-@GTK3_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@GTK3_TRUE@ $(top_builddir)/uim/libuim.la
+@GTK3_TRUE@uim_candwin_horizontal_gtk3_DEPENDENCIES =
uim_candwin_horizontal_gtk3_LINK = $(LIBTOOL) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(uim_candwin_horizontal_gtk3_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -96,9 +91,6 @@
@GTK3_TRUE@ uim_candwin_tbl_gtk3-tbl-gtk.$(OBJEXT) \
@GTK3_TRUE@ uim_candwin_tbl_gtk3-caret-state-indicator.$(OBJEXT)
uim_candwin_tbl_gtk3_OBJECTS = $(am_uim_candwin_tbl_gtk3_OBJECTS)
-@GTK3_TRUE@uim_candwin_tbl_gtk3_DEPENDENCIES = \
@ -20,9 +31,9 @@
uim_candwin_tbl_gtk3_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(uim_candwin_tbl_gtk3_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -373,8 +367,8 @@
@GTK3_TRUE@ ../../gtk/caret-state-indicator.c \
@GTK3_TRUE@ ../../gtk/caret-state-indicator.h
@@ -394,8 +386,8 @@
@GTK3_TRUE@ ../../gtk2/immodule/caret-state-indicator.c \
@GTK3_TRUE@ ../../gtk2/immodule/caret-state-indicator.h
-@GTK3_TRUE@uim_candwin_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \
-@GTK3_TRUE@ $(top_builddir)/uim/libuim.la
@ -31,9 +42,9 @@
@GTK3_TRUE@uim_candwin_gtk3_CPPFLAGS = -I$(top_srcdir)
@GTK3_TRUE@uim_candwin_gtk3_CFLAGS = @GTK3_CFLAGS@
@@ -382,8 +376,8 @@
@GTK3_TRUE@ ../../gtk/caret-state-indicator.c \
@GTK3_TRUE@ ../../gtk/caret-state-indicator.h
@@ -403,8 +395,8 @@
@GTK3_TRUE@ ../../gtk2/immodule/caret-state-indicator.c \
@GTK3_TRUE@ ../../gtk2/immodule/caret-state-indicator.h
-@GTK3_TRUE@uim_candwin_tbl_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \
-@GTK3_TRUE@ $(top_builddir)/uim/libuim.la
@ -42,3 +53,14 @@
@GTK3_TRUE@uim_candwin_tbl_gtk3_CPPFLAGS = -I$(top_srcdir)
@GTK3_TRUE@uim_candwin_tbl_gtk3_CFLAGS = @GTK3_CFLAGS@
@@ -412,8 +404,8 @@
@GTK3_TRUE@ ../../gtk2/immodule/caret-state-indicator.c \
@GTK3_TRUE@ ../../gtk2/immodule/caret-state-indicator.h
-@GTK3_TRUE@uim_candwin_horizontal_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \
-@GTK3_TRUE@ $(top_builddir)/uim/libuim.la
+@GTK3_TRUE@uim_candwin_horizontal_gtk3_LDADD = @GTK3_LIBS@ -luim-scm \
+@GTK3_TRUE@ -luim
@GTK3_TRUE@uim_candwin_horizontal_gtk3_CPPFLAGS = -I$(top_srcdir)
@GTK3_TRUE@uim_candwin_horizontal_gtk3_CFLAGS = @GTK3_CFLAGS@

10
textproc/uim/files/extra-patch-gtk3_pad_Makefile.in
View file

@ -1,8 +1,8 @@
--- gtk3/pad/Makefile.in.orig 2011-08-06 18:11:41.000000000 +0900
+++ gtk3/pad/Makefile.in 2011-08-06 18:12:29.000000000 +0900
--- gtk3/pad/Makefile.in.orig 2012-03-30 22:02:18.000000000 +0900
+++ gtk3/pad/Makefile.in 2012-04-01 04:45:48.000000000 +0900
@@ -63,9 +63,7 @@
@GTK3_TRUE@am_uim_input_pad_ja_gtk3_OBJECTS = \
@GTK3_TRUE@ uim_input_pad_ja_gtk3-input-pad-ja.$(OBJEXT)
@GTK3_TRUE@ uim_input_pad_ja_gtk3-ja.$(OBJEXT)
uim_input_pad_ja_gtk3_OBJECTS = $(am_uim_input_pad_ja_gtk3_OBJECTS)
-@GTK3_TRUE@uim_input_pad_ja_gtk3_DEPENDENCIES = \
-@GTK3_TRUE@ $(top_builddir)/uim/libuim-scm.la \
@ -11,10 +11,10 @@
uim_input_pad_ja_gtk3_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(uim_input_pad_ja_gtk3_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -351,8 +349,8 @@
@@ -354,8 +352,8 @@
top_srcdir = @top_srcdir@
uim_pixmapsdir = @uim_pixmapsdir@
@GTK3_TRUE@uim_input_pad_ja_gtk3_SOURCES = ../../helper/input-pad-ja.c
@GTK3_TRUE@uim_input_pad_ja_gtk3_SOURCES = ../../gtk2/pad/ja.c
-@GTK3_TRUE@uim_input_pad_ja_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \
-@GTK3_TRUE@ $(top_builddir)/uim/libuim.la
+@GTK3_TRUE@uim_input_pad_ja_gtk3_LDADD = @GTK3_LIBS@ -luim-scm \

15
textproc/uim/files/extra-patch-gtk3_switcher_Makefile.in
View file

@ -1,7 +1,7 @@
--- gtk3/switcher/Makefile.in.orig 2011-08-06 18:16:05.000000000 +0900
+++ gtk3/switcher/Makefile.in 2011-08-06 18:17:47.000000000 +0900
@@ -65,10 +65,9 @@
@GTK3_TRUE@ uim_im_switcher_gtk3-im-switcher-gtk.$(OBJEXT)
--- gtk3/switcher/Makefile.in.orig 2012-03-30 22:02:18.000000000 +0900
+++ gtk3/switcher/Makefile.in 2012-04-01 04:48:26.000000000 +0900
@@ -64,10 +64,9 @@
@GTK3_TRUE@ uim_im_switcher_gtk3-gtk.$(OBJEXT)
uim_im_switcher_gtk3_OBJECTS = $(am_uim_im_switcher_gtk3_OBJECTS)
@GTK3_TRUE@uim_im_switcher_gtk3_DEPENDENCIES = \
-@GTK3_TRUE@ $(top_builddir)/uim/libuim-scm.la \
@ -14,16 +14,17 @@
uim_im_switcher_gtk3_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(uim_im_switcher_gtk3_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -354,10 +353,9 @@
@@ -356,10 +355,10 @@
top_srcdir = @top_srcdir@
uim_pixmapsdir = @uim_pixmapsdir@
@GTK3_TRUE@uim_im_switcher_gtk3_SOURCES = ../../helper/im-switcher-gtk.c
@GTK3_TRUE@uim_im_switcher_gtk3_SOURCES = ../../gtk2/switcher/gtk.c
-@GTK3_TRUE@uim_im_switcher_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \
-@GTK3_TRUE@ $(top_builddir)/uim/libuim-custom.la \
-@GTK3_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@GTK3_TRUE@ $(top_builddir)/uim/libuim.la
+@GTK3_TRUE@uim_im_switcher_gtk3_LDADD = @GTK3_LIBS@ -luim-scm \
+@GTK3_TRUE@uim_im_switcher_gtk3_LDADD = @GTK3_LIBS@ \
+@GTK3_TRUE@ -luim-custom \
+@GTK3_TRUE@ -luim-scm \
+@GTK3_TRUE@ -luim
@GTK3_TRUE@uim_im_switcher_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)

203
textproc/uim/files/extra-patch-helper_Makefile.in
View file

@ -1,203 +0,0 @@
--- helper/Makefile.in.orig 2010-08-11 16:30:56.000000000 +0900
+++ helper/Makefile.in 2010-10-16 21:46:33.000000000 +0900
@@ -101,9 +101,6 @@
@GTK2_TRUE@ uim_candwin_gtk-candwin-gtk.$(OBJEXT) \
@GTK2_TRUE@ uim_candwin_gtk-caret-state-indicator.$(OBJEXT)
uim_candwin_gtk_OBJECTS = $(am_uim_candwin_gtk_OBJECTS)
-@GTK2_TRUE@uim_candwin_gtk_DEPENDENCIES = \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
uim_candwin_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_candwin_gtk_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -113,9 +110,6 @@
@GTK2_TRUE@ uim_candwin_tbl_gtk-candwin-tbl-gtk.$(OBJEXT) \
@GTK2_TRUE@ uim_candwin_tbl_gtk-caret-state-indicator.$(OBJEXT)
uim_candwin_tbl_gtk_OBJECTS = $(am_uim_candwin_tbl_gtk_OBJECTS)
-@GTK2_TRUE@uim_candwin_tbl_gtk_DEPENDENCIES = \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
uim_candwin_tbl_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(uim_candwin_tbl_gtk_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -144,12 +138,6 @@
@DICT_TRUE@@GTK2_TRUE@ $(am__objects_3)
uim_dict_gtk_OBJECTS = $(am_uim_dict_gtk_OBJECTS)
am__DEPENDENCIES_1 =
-@DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_DEPENDENCIES = \
-@DICT_TRUE@@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@DICT_TRUE@@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
-@DICT_TRUE@@GTK2_TRUE@ $(am__DEPENDENCIES_1) \
-@DICT_TRUE@@GTK2_TRUE@ $(am__DEPENDENCIES_1) \
-@DICT_TRUE@@GTK2_TRUE@ $(am__DEPENDENCIES_1)
uim_dict_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_dict_gtk_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -157,11 +145,6 @@
@GTK2_TRUE@am_uim_im_switcher_gtk_OBJECTS = \
@GTK2_TRUE@ uim_im_switcher_gtk-im-switcher-gtk.$(OBJEXT)
uim_im_switcher_gtk_OBJECTS = $(am_uim_im_switcher_gtk_OBJECTS)
-@GTK2_TRUE@uim_im_switcher_gtk_DEPENDENCIES = \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-custom.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
uim_im_switcher_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(uim_im_switcher_gtk_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -170,9 +153,6 @@
@GTK2_TRUE@am_uim_input_pad_ja_OBJECTS = \
@GTK2_TRUE@ uim_input_pad_ja-input-pad-ja.$(OBJEXT)
uim_input_pad_ja_OBJECTS = $(am_uim_input_pad_ja_OBJECTS)
-@GTK2_TRUE@uim_input_pad_ja_DEPENDENCIES = \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
uim_input_pad_ja_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_input_pad_ja_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -183,10 +163,6 @@
@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ uim_pref_gtk-pref-gtk-custom-widgets.$(OBJEXT) \
@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ uim_pref_gtk-key-util-gtk.$(OBJEXT)
uim_pref_gtk_OBJECTS = $(am_uim_pref_gtk_OBJECTS)
-@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_DEPENDENCIES = $(top_builddir)/uim/libuim-custom.la \
-@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ $(top_builddir)/uim/libuim.la \
-@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ $(am__append_5)
uim_pref_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_pref_gtk_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -195,10 +171,6 @@
@APPLET_GNOME_TRUE@am_uim_toolbar_applet_OBJECTS = uim_toolbar_applet-toolbar-applet-gnome.$(OBJEXT) \
@APPLET_GNOME_TRUE@ uim_toolbar_applet-toolbar-common-gtk.$(OBJEXT)
uim_toolbar_applet_OBJECTS = $(am_uim_toolbar_applet_OBJECTS)
-@APPLET_GNOME_TRUE@uim_toolbar_applet_DEPENDENCIES = \
-@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim.la \
-@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim-custom.la
uim_toolbar_applet_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(uim_toolbar_applet_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -209,10 +181,6 @@
@GTK2_TRUE@ uim_toolbar_gtk-toolbar-standalone-gtk.$(OBJEXT) \
@GTK2_TRUE@ uim_toolbar_gtk-toolbar-common-gtk.$(OBJEXT)
uim_toolbar_gtk_OBJECTS = $(am_uim_toolbar_gtk_OBJECTS)
-@GTK2_TRUE@uim_toolbar_gtk_DEPENDENCIES = \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-custom.la
uim_toolbar_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_toolbar_gtk_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -223,10 +191,6 @@
@GTK2_TRUE@ uim_toolbar_gtk_systray-eggtrayicon.$(OBJEXT)
uim_toolbar_gtk_systray_OBJECTS = \
$(am_uim_toolbar_gtk_systray_OBJECTS)
-@GTK2_TRUE@uim_toolbar_gtk_systray_DEPENDENCIES = \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-custom.la
uim_toolbar_gtk_systray_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(uim_toolbar_gtk_systray_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -556,9 +520,9 @@
EXTRA_DIST = GNOME_UimApplet.server.in.in uim-dict-ui.xml.in
helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\"
@APPLET_GNOME_TRUE@uim_toolbar_applet_LDADD = @GTK2_LIBS@ @APPLET_GNOME_LIBS@ \
-@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim.la \
-@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim-custom.la
+@APPLET_GNOME_TRUE@ -luim-scm \
+@APPLET_GNOME_TRUE@ -luim \
+@APPLET_GNOME_TRUE@ -luim-custom
@APPLET_GNOME_TRUE@uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
@APPLET_GNOME_TRUE@uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @APPLET_GNOME_CFLAGS@
@@ -576,8 +540,8 @@
@GTK2_TRUE@ ../gtk/caret-state-indicator.c \
@GTK2_TRUE@ ../gtk/caret-state-indicator.h
-@GTK2_TRUE@uim_candwin_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
+@GTK2_TRUE@uim_candwin_gtk_LDADD = @GTK2_LIBS@ -luim-scm \
+@GTK2_TRUE@ -luim
@GTK2_TRUE@uim_candwin_gtk_CPPFLAGS = -I$(top_srcdir)
@GTK2_TRUE@uim_candwin_gtk_CFLAGS = @GTK2_CFLAGS@
@@ -585,15 +549,15 @@
@GTK2_TRUE@ ../gtk/caret-state-indicator.c \
@GTK2_TRUE@ ../gtk/caret-state-indicator.h
-@GTK2_TRUE@uim_candwin_tbl_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
+@GTK2_TRUE@uim_candwin_tbl_gtk_LDADD = @GTK2_LIBS@ -luim-scm \
+@GTK2_TRUE@ -luim
@GTK2_TRUE@uim_candwin_tbl_gtk_CPPFLAGS = -I$(top_srcdir)
@GTK2_TRUE@uim_candwin_tbl_gtk_CFLAGS = @GTK2_CFLAGS@
@GTK2_TRUE@uim_toolbar_gtk_SOURCES = toolbar-standalone-gtk.c toolbar-common-gtk.c
-@GTK2_TRUE@uim_toolbar_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-custom.la
+@GTK2_TRUE@uim_toolbar_gtk_LDADD = @GTK2_LIBS@ -luim-scm \
+@GTK2_TRUE@ -luim \
+@GTK2_TRUE@ -luim-custom
@GTK2_TRUE@uim_toolbar_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
@GTK2_TRUE@uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@
@@ -602,23 +566,23 @@
@GTK2_TRUE@uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ \
@GTK2_TRUE@ @X11_LIBS@ \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-custom.la
+@GTK2_TRUE@ -luim-scm \
+@GTK2_TRUE@ -luim \
+@GTK2_TRUE@ -luim-custom
@GTK2_TRUE@uim_toolbar_gtk_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
@GTK2_TRUE@uim_toolbar_gtk_systray_CFLAGS = @GTK2_CFLAGS@
@GTK2_TRUE@uim_im_switcher_gtk_SOURCES = im-switcher-gtk.c
-@GTK2_TRUE@uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-custom.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
+@GTK2_TRUE@uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ -luim-scm \
+@GTK2_TRUE@ -luim-custom \
+@GTK2_TRUE@ -luim-scm \
+@GTK2_TRUE@ -luim
@GTK2_TRUE@uim_im_switcher_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
@GTK2_TRUE@uim_im_switcher_gtk_CFLAGS = @GTK2_CFLAGS@
@GTK2_TRUE@uim_input_pad_ja_SOURCES = input-pad-ja.c
-@GTK2_TRUE@uim_input_pad_ja_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
+@GTK2_TRUE@uim_input_pad_ja_LDADD = @GTK2_LIBS@ -luim-scm \
+@GTK2_TRUE@ -luim
@GTK2_TRUE@uim_input_pad_ja_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
@GTK2_TRUE@uim_input_pad_ja_CFLAGS = @GTK2_CFLAGS@
@@ -628,9 +592,9 @@
@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ ../gtk/key-util-gtk.c ../gtk/key-util-gtk.h
@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_LDADD = @GTK2_LIBS@ \
-@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ $(top_builddir)/uim/libuim-custom.la \
-@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ $(top_builddir)/uim/libuim.la \
+@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ -luim-custom \
+@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ -luim-scm \
+@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ -luim \
@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ $(am__append_5)
@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_CFLAGS = @GTK2_CFLAGS@
@@ -646,8 +610,8 @@
@DICT_TRUE@@GTK2_TRUE@ dict-cclass-dialog.h $(am__append_6) \
@DICT_TRUE@@GTK2_TRUE@ $(am__append_9) $(am__append_12)
@DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_LDADD = @GTK2_LIBS@ \
-@DICT_TRUE@@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@DICT_TRUE@@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
+@DICT_TRUE@@GTK2_TRUE@ -luim-scm \
+@DICT_TRUE@@GTK2_TRUE@ -luim \
@DICT_TRUE@@GTK2_TRUE@ $(am__append_7) $(am__append_10) \
@DICT_TRUE@@GTK2_TRUE@ $(am__append_13)
@DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_CPPFLAGS = $(helper_defs) \

24
textproc/uim/files/extra-patch-qt3_candwin_Makefile.in Normal file
View file

@ -0,0 +1,24 @@
--- qt3/candwin/Makefile.in.orig 2012-03-30 22:02:19.000000000 +0900
+++ qt3/candwin/Makefile.in 2012-04-01 05:53:45.000000000 +0900
@@ -63,9 +63,7 @@
am__uim_candwin_qt_SOURCES_DIST = qt.cpp qt.h ../qtgettext.h
@QT_TRUE@am_uim_candwin_qt_OBJECTS = uim_candwin_qt-qt.$(OBJEXT)
uim_candwin_qt_OBJECTS = $(am_uim_candwin_qt_OBJECTS)
-@QT_TRUE@uim_candwin_qt_DEPENDENCIES = \
-@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la
+@QT_TRUE@uim_candwin_qt_DEPENDENCIES =
uim_candwin_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(uim_candwin_qt_CXXFLAGS) $(CXXFLAGS) \
@@ -369,8 +367,8 @@
@QT_TRUE@uim_candwin_qt_SOURCES = qt.cpp qt.h ../qtgettext.h
@QT_TRUE@uim_candwin_qt_CXXFLAGS = $(UIM_QT_CXXFLAGS)
@QT_TRUE@uim_candwin_qt_LDFLAGS = $(UIM_QT_LDFLAGS)
-@QT_TRUE@uim_candwin_qt_LDADD = $(top_builddir)/uim/libuim-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la
+@QT_TRUE@uim_candwin_qt_LDADD = -luim-scm \
+@QT_TRUE@ -luim
@QT_TRUE@CLEANFILES = \
@QT_TRUE@ $(MOC_FILES) \

22
textproc/uim/files/extra-patch-qt3_immodule_Makefile.in Normal file
View file

@ -0,0 +1,22 @@
--- qt3/immodule/Makefile.in.orig 2012-04-01 05:20:05.000000000 +0900
+++ qt3/immodule/Makefile.in 2012-04-01 05:21:12.000000000 +0900
@@ -87,8 +87,6 @@
am__installdirs = "$(DESTDIR)$(extradir)"
LTLIBRARIES = $(extra_LTLIBRARIES)
@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_DEPENDENCIES = $(top_builddir)/uim/libuim-counted-init.la \
-@QT_IMMODULE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@QT_IMMODULE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la \
@QT_IMMODULE_TRUE@@QT_TRUE@ $(am__append_3)
am__libquiminputcontextplugin_la_SOURCES_DIST = candidatewindow.cpp \
qhelpermanager.cpp plugin.cpp plugin.h candidatewindow.h \
@@ -444,8 +442,8 @@
@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_CXXFLAGS = $(QT_CXXFLAGS) @X_CFLAGS@
@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_LDFLAGS = $(QT_LDFLAGS) -avoid-version
@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_LIBADD = $(top_builddir)/uim/libuim-counted-init.la \
-@QT_IMMODULE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@QT_IMMODULE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la \
+@QT_IMMODULE_TRUE@@QT_TRUE@ -luim-scm \
+@QT_IMMODULE_TRUE@@QT_TRUE@ -luim \
@QT_IMMODULE_TRUE@@QT_TRUE@ $(am__append_3)
@QT_TRUE@CLEANFILES = \
@QT_TRUE@ $(MOC_FILES) \

27
textproc/uim/files/extra-patch-qt3_pref_Makefile.in Normal file
View file

@ -0,0 +1,27 @@
--- qt3/pref/Makefile.in.orig 2012-03-30 22:02:19.000000000 +0900
+++ qt3/pref/Makefile.in 2012-04-01 05:56:43.000000000 +0900
@@ -72,10 +72,7 @@
@PREF_TRUE@@QT_TRUE@ uim_pref_qt-keyeditformbase.$(OBJEXT)
uim_pref_qt_OBJECTS = $(am_uim_pref_qt_OBJECTS) \
$(nodist_uim_pref_qt_OBJECTS)
-@PREF_TRUE@@QT_TRUE@uim_pref_qt_DEPENDENCIES = $(top_builddir)/uim/libuim-counted-init.la \
-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-custom.la \
-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la
+@PREF_TRUE@@QT_TRUE@uim_pref_qt_DEPENDENCIES = $(top_builddir)/uim/libuim-counted-init.la
uim_pref_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(uim_pref_qt_CXXFLAGS) \
$(CXXFLAGS) $(uim_pref_qt_LDFLAGS) $(LDFLAGS) -o $@
@@ -407,9 +404,9 @@
@PREF_TRUE@@QT_TRUE@uim_pref_qt_CXXFLAGS = $(UIM_QT_CXXFLAGS)
@PREF_TRUE@@QT_TRUE@uim_pref_qt_LDFLAGS = $(UIM_QT_LDFLAGS)
@PREF_TRUE@@QT_TRUE@uim_pref_qt_LDADD = $(top_builddir)/uim/libuim-counted-init.la \
-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-custom.la \
-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la
+@PREF_TRUE@@QT_TRUE@ -luim-custom \
+@PREF_TRUE@@QT_TRUE@ -luim-scm \
+@PREF_TRUE@@QT_TRUE@ -luim
@QT_TRUE@CLEANFILES = \
@QT_TRUE@ $(MOC_FILES) \

27
textproc/uim/files/extra-patch-qt3_switcher_Makefile.in Normal file
View file

@ -0,0 +1,27 @@
--- qt3/switcher/Makefile.in.orig 2012-04-01 05:24:28.000000000 +0900
+++ qt3/switcher/Makefile.in 2012-04-01 05:25:16.000000000 +0900
@@ -66,10 +66,7 @@
@QT_TRUE@am_uim_im_switcher_qt_OBJECTS = \
@QT_TRUE@ uim_im_switcher_qt-qt.$(OBJEXT)
uim_im_switcher_qt_OBJECTS = $(am_uim_im_switcher_qt_OBJECTS)
-@QT_TRUE@uim_im_switcher_qt_DEPENDENCIES = \
-@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim-custom.la
+@QT_TRUE@uim_im_switcher_qt_DEPENDENCIES =
uim_im_switcher_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(uim_im_switcher_qt_CXXFLAGS) $(CXXFLAGS) \
@@ -376,9 +373,9 @@
@QT_TRUE@uim_im_switcher_qt_SOURCES = qt.cpp qt.h ../qtgettext.h
@QT_TRUE@uim_im_switcher_qt_CXXFLAGS = $(UIM_QT_CXXFLAGS)
@QT_TRUE@uim_im_switcher_qt_LDFLAGS = $(UIM_QT_LDFLAGS)
-@QT_TRUE@uim_im_switcher_qt_LDADD = $(top_builddir)/uim/libuim-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim-custom.la
+@QT_TRUE@uim_im_switcher_qt_LDADD = -luim-scm \
+@QT_TRUE@ -luim \
+@QT_TRUE@ -luim-custom
@QT_TRUE@CLEANFILES = \
@QT_TRUE@ $(MOC_FILES) \

65
textproc/uim/files/extra-patch-qt3_toolbar_Makefile.in Normal file
View file

@ -0,0 +1,65 @@
--- qt3/toolbar/Makefile.in.orig 2012-04-01 05:26:40.000000000 +0900
+++ qt3/toolbar/Makefile.in 2012-04-01 05:29:33.000000000 +0900
@@ -92,9 +92,7 @@
am__installdirs = "$(DESTDIR)$(appletdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(lnkdir)"
LTLIBRARIES = $(applet_LTLIBRARIES) $(noinst_LTLIBRARIES)
-@QT_TRUE@libtoolbarcommon_la_DEPENDENCIES = \
-@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la
+@QT_TRUE@libtoolbarcommon_la_DEPENDENCIES =
am__libtoolbarcommon_la_SOURCES_DIST = common-quimhelpertoolbar.cpp \
common-uimstateindicator.cpp ../qtgettext.h \
common-quimhelpertoolbar.h common-uimstateindicator.h
@@ -108,8 +106,6 @@
$(libtoolbarcommon_la_LDFLAGS) $(LDFLAGS) -o $@
@QT_TRUE@am_libtoolbarcommon_la_rpath =
@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_DEPENDENCIES = \
-@APPLET_KDE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@APPLET_KDE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la \
@APPLET_KDE_TRUE@@QT_TRUE@ libtoolbarcommon.la
am__uim_panelapplet_la_SOURCES_DIST = applet-kde.cpp applet-kde.h \
../qtgettext.h common-quimhelpertoolbar.h \
@@ -131,8 +127,7 @@
@QT_TRUE@ uim_toolbar_qt-standalone-qt.$(OBJEXT)
uim_toolbar_qt_OBJECTS = $(am_uim_toolbar_qt_OBJECTS)
@QT_TRUE@uim_toolbar_qt_DEPENDENCIES = \
-@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la ./libtoolbarcommon.la
+@QT_TRUE@ ./libtoolbarcommon.la
uim_toolbar_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(uim_toolbar_qt_CXXFLAGS) $(CXXFLAGS) \
@@ -458,8 +453,8 @@
@QT_TRUE@libtoolbarcommon_la_CXXFLAGS = $(QT_CXXFLAGS)
@QT_TRUE@libtoolbarcommon_la_LDFLAGS = $(QT_LDFLAGS) -avoid-version
-@QT_TRUE@libtoolbarcommon_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la
+@QT_TRUE@libtoolbarcommon_la_LIBADD = -luim-scm \
+@QT_TRUE@ -luim
# Toolbar Standalone
@@ -468,8 +463,8 @@
@QT_TRUE@uim_toolbar_qt_CXXFLAGS = $(QT_CXXFLAGS)
@QT_TRUE@uim_toolbar_qt_LDFLAGS = $(QT_LDFLAGS)
-@QT_TRUE@uim_toolbar_qt_LDADD = $(top_builddir)/uim/libuim-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la ./libtoolbarcommon.la
+@QT_TRUE@uim_toolbar_qt_LDADD = -luim-scm \
+@QT_TRUE@ -luim ./libtoolbarcommon.la
# Toolbar applet
@@ -478,8 +473,8 @@
@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_CXXFLAGS = -I@KDE_INCLUDE_DIR@ $(QT_CXXFLAGS)
@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LDFLAGS = -avoid-version -module -no-undefined -Wl,--no-undefined -Wl,--allow-shlib-undefined -L@KDE_LIB_DIR@ $(QT_LDFLAGS)
-@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
-@APPLET_KDE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la \
+@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LIBADD = -luim-scm \
+@APPLET_KDE_TRUE@@QT_TRUE@ -luim \
@APPLET_KDE_TRUE@@QT_TRUE@ libtoolbarcommon.la -lkdeui -lkdecore
@QT_TRUE@CLEANFILES = \

157
textproc/uim/files/extra-patch-qt_Makefile.in
View file

@ -1,157 +0,0 @@
--- qt/Makefile.in.orig 2010-08-11 16:30:56.000000000 +0900
+++ qt/Makefile.in 2010-10-16 23:05:41.000000000 +0900
@@ -127,10 +127,6 @@
"$(DESTDIR)$(lnkdir)"
LTLIBRARIES = $(applet_LTLIBRARIES) $(extra_LTLIBRARIES) \
$(noinst_LTLIBRARIES)
-@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_DEPENDENCIES = $(top_builddir)/uim/libuim-counted-init.la \
-@QT_IMMODULE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@QT_IMMODULE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la \
-@QT_IMMODULE_TRUE@@QT_TRUE@ $(am__append_10)
am__libquiminputcontextplugin_la_SOURCES_DIST = \
immodule-candidatewindow.cpp immodule-qhelpermanager.cpp \
immodule-plugin.cpp immodule-plugin.h \
@@ -161,9 +157,6 @@
$(libquiminputcontextplugin_la_LDFLAGS) $(LDFLAGS) -o $@
@QT_IMMODULE_TRUE@@QT_TRUE@am_libquiminputcontextplugin_la_rpath = \
@QT_IMMODULE_TRUE@@QT_TRUE@ -rpath $(extradir)
-@QT_TRUE@libtoolbarcommon_la_DEPENDENCIES = \
-@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la
am__libtoolbarcommon_la_SOURCES_DIST = \
toolbar-common-quimhelpertoolbar.cpp \
toolbar-common-uimstateindicator.cpp qtgettext.h \
@@ -178,8 +171,6 @@
$(libtoolbarcommon_la_LDFLAGS) $(LDFLAGS) -o $@
@QT_TRUE@am_libtoolbarcommon_la_rpath =
@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_DEPENDENCIES = \
-@APPLET_KDE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@APPLET_KDE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la \
@APPLET_KDE_TRUE@@QT_TRUE@ libtoolbarcommon.la
am__uim_panelapplet_la_SOURCES_DIST = toolbar-applet-kde.cpp \
toolbar-applet-kde.h qtgettext.h \
@@ -201,8 +192,8 @@
@QT_TRUE@ uim_candwin_qt-candwin-qt.$(OBJEXT)
uim_candwin_qt_OBJECTS = $(am_uim_candwin_qt_OBJECTS)
@QT_TRUE@uim_candwin_qt_DEPENDENCIES = \
-@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la
+@QT_TRUE@ -luim-scm \
+@QT_TRUE@ -luim
uim_candwin_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(uim_candwin_qt_CXXFLAGS) $(CXXFLAGS) \
@@ -213,9 +204,9 @@
@QT_TRUE@ uim_im_switcher_qt-switcher-qt.$(OBJEXT)
uim_im_switcher_qt_OBJECTS = $(am_uim_im_switcher_qt_OBJECTS)
@QT_TRUE@uim_im_switcher_qt_DEPENDENCIES = \
-@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim-custom.la
+@QT_TRUE@ -luim-scm \
+@QT_TRUE@ -luim \
+@QT_TRUE@ -luim-custom
uim_im_switcher_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(uim_im_switcher_qt_CXXFLAGS) $(CXXFLAGS) \
@@ -231,10 +222,6 @@
@PREF_TRUE@@QT_TRUE@ uim_pref_qt-pref-keyeditformbase.$(OBJEXT)
uim_pref_qt_OBJECTS = $(am_uim_pref_qt_OBJECTS) \
$(nodist_uim_pref_qt_OBJECTS)
-@PREF_TRUE@@QT_TRUE@uim_pref_qt_DEPENDENCIES = $(top_builddir)/uim/libuim-counted-init.la \
-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-custom.la \
-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la
uim_pref_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(uim_pref_qt_CXXFLAGS) \
$(CXXFLAGS) $(uim_pref_qt_LDFLAGS) $(LDFLAGS) -o $@
@@ -245,9 +232,6 @@
@QT_TRUE@am_uim_toolbar_qt_OBJECTS = \
@QT_TRUE@ uim_toolbar_qt-toolbar-standalone-qt.$(OBJEXT)
uim_toolbar_qt_OBJECTS = $(am_uim_toolbar_qt_OBJECTS)
-@QT_TRUE@uim_toolbar_qt_DEPENDENCIES = \
-@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la ./libtoolbarcommon.la
uim_toolbar_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(uim_toolbar_qt_CXXFLAGS) $(CXXFLAGS) \
@@ -655,8 +639,8 @@
@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_CXXFLAGS = $(QT_CXXFLAGS) @X_CFLAGS@
@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_LDFLAGS = $(QT_LDFLAGS) -avoid-version
@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_LIBADD = $(top_builddir)/uim/libuim-counted-init.la \
-@QT_IMMODULE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@QT_IMMODULE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la \
+@QT_IMMODULE_TRUE@@QT_TRUE@ -luim-scm \
+@QT_IMMODULE_TRUE@@QT_TRUE@ -luim \
@QT_IMMODULE_TRUE@@QT_TRUE@ $(am__append_10)
# Toolbar Common
@@ -666,8 +650,8 @@
@QT_TRUE@libtoolbarcommon_la_CXXFLAGS = $(QT_CXXFLAGS)
@QT_TRUE@libtoolbarcommon_la_LDFLAGS = $(QT_LDFLAGS) -avoid-version
-@QT_TRUE@libtoolbarcommon_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la
+@QT_TRUE@libtoolbarcommon_la_LIBADD = -luim-scm \
+@QT_TRUE@ -luim
# Toolbar Standalone
@@ -676,8 +660,8 @@
@QT_TRUE@uim_toolbar_qt_CXXFLAGS = $(QT_CXXFLAGS)
@QT_TRUE@uim_toolbar_qt_LDFLAGS = $(QT_LDFLAGS)
-@QT_TRUE@uim_toolbar_qt_LDADD = $(top_builddir)/uim/libuim-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la ./libtoolbarcommon.la
+@QT_TRUE@uim_toolbar_qt_LDADD = -luim-scm \
+@QT_TRUE@ -luim ./libtoolbarcommon.la
# Toolbar applet
@@ -686,8 +670,8 @@
@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_CXXFLAGS = -I@KDE_INCLUDE_DIR@ $(QT_CXXFLAGS)
@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LDFLAGS = -avoid-version -module -no-undefined -Wl,--no-undefined -Wl,--allow-shlib-undefined -L@KDE_LIB_DIR@ $(QT_LDFLAGS)
-@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
-@APPLET_KDE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la \
+@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LIBADD = -luim-scm \
+@APPLET_KDE_TRUE@@QT_TRUE@ -luim \
@APPLET_KDE_TRUE@@QT_TRUE@ libtoolbarcommon.la -lkdeui -lkdecore
@@ -695,17 +679,17 @@
@QT_TRUE@uim_candwin_qt_SOURCES = candwin-qt.cpp candwin-qt.h qtgettext.h
@QT_TRUE@uim_candwin_qt_CXXFLAGS = $(QT_CXXFLAGS)
@QT_TRUE@uim_candwin_qt_LDFLAGS = $(QT_LDFLAGS)
-@QT_TRUE@uim_candwin_qt_LDADD = $(top_builddir)/uim/libuim-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la
+@QT_TRUE@uim_candwin_qt_LDADD = -luim-scm \
+@QT_TRUE@ -luim
# Switcher
@QT_TRUE@uim_im_switcher_qt_SOURCES = switcher-qt.cpp switcher-qt.h qtgettext.h
@QT_TRUE@uim_im_switcher_qt_CXXFLAGS = $(QT_CXXFLAGS)
@QT_TRUE@uim_im_switcher_qt_LDFLAGS = $(QT_LDFLAGS)
-@QT_TRUE@uim_im_switcher_qt_LDADD = $(top_builddir)/uim/libuim-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim-custom.la
+@QT_TRUE@uim_im_switcher_qt_LDADD = -luim-scm \
+@QT_TRUE@ -luim \
+@QT_TRUE@ -luim-custom
# Pref
@@ -723,9 +707,9 @@
@PREF_TRUE@@QT_TRUE@uim_pref_qt_CXXFLAGS = $(QT_CXXFLAGS)
@PREF_TRUE@@QT_TRUE@uim_pref_qt_LDFLAGS = $(QT_LDFLAGS)
@PREF_TRUE@@QT_TRUE@uim_pref_qt_LDADD = $(top_builddir)/uim/libuim-counted-init.la \
-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-custom.la \
-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la
+@PREF_TRUE@@QT_TRUE@ -luim-custom \
+@PREF_TRUE@@QT_TRUE@ -luim-scm \
+@PREF_TRUE@@QT_TRUE@ -luim
@QT_TRUE@CLEANFILES = \
@QT_TRUE@ $(MOC_FILES) \

75
textproc/uim/files/extra-patch-uim_Makefile.in
View file

@ -1,48 +1,35 @@
--- uim/Makefile.in.orig 2010-08-11 16:30:58.000000000 +0900
+++ uim/Makefile.in 2010-10-17 13:04:46.000000000 +0900
@@ -125,8 +125,6 @@
@EB_TRUE@am_lib_eb_static_la_OBJECTS = lib_eb_static_la-uim-eb.lo
lib_eb_static_la_OBJECTS = $(am_lib_eb_static_la_OBJECTS)
@EB_TRUE@am_lib_eb_static_la_rpath =
--- uim/Makefile.in.orig 2012-04-01 06:38:21.000000000 +0900
+++ uim/Makefile.in 2012-04-01 06:50:03.000000000 +0900
@@ -117,8 +117,7 @@
"$(DESTDIR)$(pkgincludedir)"
LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) \
$(uim_plugin_LTLIBRARIES)
-@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@libuim_anthy_utf8_la_DEPENDENCIES = libuim-scm.la \
-@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@ libuim.la
+@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@libuim_anthy_utf8_la_DEPENDENCIES =
am__libuim_anthy_utf8_la_SOURCES_DIST = anthy-utf8.c
@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@am_libuim_anthy_utf8_la_OBJECTS = libuim_anthy_utf8_la-anthy-utf8.lo
libuim_anthy_utf8_la_OBJECTS = $(am_libuim_anthy_utf8_la_OBJECTS)
@@ -136,8 +134,6 @@
@@ -128,8 +127,7 @@
@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@am_libuim_anthy_utf8_la_rpath = \
@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@ -rpath \
@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@ $(uim_plugindir)
-@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_DEPENDENCIES = \
-@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@ libuim-scm.la libuim.la
+@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_DEPENDENCIES =
am__libuim_anthy_la_SOURCES_DIST = anthy.c
@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@am_libuim_anthy_la_OBJECTS = libuim_anthy_la-anthy.lo
libuim_anthy_la_OBJECTS = $(am_libuim_anthy_la_OBJECTS)
@@ -230,7 +226,6 @@
@@ -222,7 +220,7 @@
libuim_look_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libuim_look_la_LDFLAGS) $(LDFLAGS) -o $@
-@M17NLIB_TRUE@libuim_m17nlib_la_DEPENDENCIES = libuim-scm.la libuim.la
+@M17NLIB_TRUE@libuim_m17nlib_la_DEPENDENCIES =
am__libuim_m17nlib_la_SOURCES_DIST = m17nlib.c
@M17NLIB_TRUE@am_libuim_m17nlib_la_OBJECTS = \
@M17NLIB_TRUE@ libuim_m17nlib_la-m17nlib.lo
@@ -239,7 +234,6 @@
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libuim_m17nlib_la_LDFLAGS) $(LDFLAGS) -o $@
@M17NLIB_TRUE@am_libuim_m17nlib_la_rpath = -rpath $(uim_plugindir)
-@MANA_TRUE@libuim_mana_la_DEPENDENCIES = libuim-scm.la libuim.la
am__libuim_mana_la_SOURCES_DIST = mana.c
@MANA_TRUE@am_libuim_mana_la_OBJECTS = libuim_mana_la-mana.lo
libuim_mana_la_OBJECTS = $(am_libuim_mana_la_OBJECTS)
@@ -299,7 +293,6 @@
$(libuim_sqlite3_la_LDFLAGS) $(LDFLAGS) -o $@
@SQLITE3_TRUE@am_libuim_sqlite3_la_rpath = -rpath $(uim_plugindir)
am__DEPENDENCIES_1 =
-@WNN_TRUE@libuim_wnn_la_DEPENDENCIES = libuim.la $(am__DEPENDENCIES_1)
am__libuim_wnn_la_SOURCES_DIST = wnnlib.h wnnlib.c
@WNN_TRUE@am_libuim_wnn_la_OBJECTS = libuim_wnn_la-wnnlib.lo
libuim_wnn_la_OBJECTS = $(am_libuim_wnn_la_OBJECTS)
@@ -763,47 +756,47 @@
@@ -767,7 +765,7 @@
libuim_process_la_CPPFLAGS = -I$(top_srcdir)
libuim_custom_la_SOURCES = uim-custom.c
@M17NLIB_TRUE@libuim_m17nlib_la_SOURCES = m17nlib.c
@ -51,13 +38,7 @@
@M17NLIB_TRUE@libuim_m17nlib_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
@M17NLIB_TRUE@libuim_m17nlib_la_CPPFLAGS = -I$(top_srcdir) @M17NLIB_CFLAGS@
@SCIM_TRUE@libuim_scim_la_SOURCES = scim.cpp
-@SCIM_TRUE@libuim_scim_la_LIBADD = @SCIM_LIBS@ libuim-scm.la libuim.la
+@SCIM_TRUE@libuim_scim_la_LIBADD = @SCIM_LIBS@ -luim-scm -luim
@SCIM_TRUE@libuim_scim_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
@SCIM_TRUE@libuim_scim_la_CXXFLAGS = -I$(top_srcdir) @SCIM_CFLAGS@
@WNN_TRUE@libuim_wnn_la_SOURCES = wnnlib.h wnnlib.c
-@WNN_TRUE@libuim_wnn_la_LIBADD = libuim.la $(WNN_LIBS) -lwnn @WNN_LIBADD@
+@WNN_TRUE@libuim_wnn_la_LIBADD = -luim $(WNN_LIBS) -lwnn @WNN_LIBADD@
@@ -779,11 +777,11 @@
@WNN_TRUE@libuim_wnn_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
@WNN_TRUE@libuim_wnn_la_CPPFLAGS = -I$(top_srcdir) $(WNN_CPPFLAGS)
@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_SOURCES = anthy.c
@ -71,33 +52,3 @@
@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@libuim_anthy_utf8_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@libuim_anthy_utf8_la_CPPFLAGS = -I$(top_srcdir) @ANTHY_UTF8_CFLAGS@
@MANA_TRUE@libuim_mana_la_SOURCES = mana.c
-@MANA_TRUE@libuim_mana_la_LIBADD = libuim-scm.la libuim.la
+@MANA_TRUE@libuim_mana_la_LIBADD = -luim-scm -luim
@MANA_TRUE@libuim_mana_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
@MANA_TRUE@libuim_mana_la_CPPFLAGS = -I$(top_srcdir)
@CURL_TRUE@libuim_curl_la_SOURCES = curl.c
-@CURL_TRUE@libuim_curl_la_LIBADD = @CURL_LIBS@ libuim.la
+@CURL_TRUE@libuim_curl_la_LIBADD = @CURL_LIBS@ -luim
@CURL_TRUE@libuim_curl_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
@CURL_TRUE@libuim_curl_la_CPPFLAGS = -I$(top_srcdir) @CURL_CFLAGS@
@EXPAT_TRUE@libuim_expat_la_SOURCES = expat.c
-@EXPAT_TRUE@libuim_expat_la_LIBADD = @EXPAT_LIBS@ libuim.la
+@EXPAT_TRUE@libuim_expat_la_LIBADD = @EXPAT_LIBS@ -luim
@EXPAT_TRUE@libuim_expat_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
@EXPAT_TRUE@libuim_expat_la_CPPFLAGS = -I$(top_srcdir) @EXPAT_CFLAGS@
@OPENSSL_TRUE@libuim_openssl_la_SOURCES = openssl.c
-@OPENSSL_TRUE@libuim_openssl_la_LIBADD = @OPENSSL_LIBS@ libuim.la
+@OPENSSL_TRUE@libuim_openssl_la_LIBADD = @OPENSSL_LIBS@ -luim
@OPENSSL_TRUE@libuim_openssl_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
@OPENSSL_TRUE@libuim_openssl_la_CPPFLAGS = -I$(top_srcdir) @OPENSSL_CPPFLAGS@
@SQLITE3_TRUE@libuim_sqlite3_la_SOURCES = sqlite3.c
-@SQLITE3_TRUE@libuim_sqlite3_la_LIBADD = @SQLITE3_LIBS@ libuim.la
+@SQLITE3_TRUE@libuim_sqlite3_la_LIBADD = @SQLITE3_LIBS@ -luim
@SQLITE3_TRUE@libuim_sqlite3_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
@SQLITE3_TRUE@libuim_sqlite3_la_CPPFLAGS = -I$(top_srcdir) @SQLITE3_CFLAGS@
@FFI_TRUE@libuim_ffi_la_SOURCES = ffi.c
-@FFI_TRUE@libuim_ffi_la_LIBADD = @FFI_LIBS@ libuim.la
+@FFI_TRUE@libuim_ffi_la_LIBADD = @FFI_LIBS@ -luim
@FFI_TRUE@libuim_ffi_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
@FFI_TRUE@libuim_ffi_la_CPPFLAGS = -I$(top_srcdir) @FFI_CFLAGS@
@EB_TRUE@lib_eb_static_la_SOURCES = uim-eb.c uim-eb.h

33
textproc/uim/files/patch-gtk:Makefile.in
View file

@ -1,33 +0,0 @@
--- gtk/Makefile.in.orig 2010-08-11 16:30:55.000000000 +0900
+++ gtk/Makefile.in 2010-10-16 19:56:10.000000000 +0900
@@ -501,18 +501,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-moduleLTLIBRARIES: $(module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
- @list='$(module_LTLIBRARIES)'; test -n "$(moduledir)" || list=; \
- list2=; for p in $$list; do \
- if test -f $$p; then \
- list2="$$list2 $$p"; \
- else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(moduledir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(moduledir)"; \
- }
+@GTK2_TRUE@ @$(NORMAL_INSTALL)
+@GTK2_TRUE@ test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+@GTK2_TRUE@ @list='$(module_LTLIBRARIES)'; test -n "$(moduledir)" || list=; \
+@GTK2_TRUE@ list2=; for p in $$list; do \
+@GTK2_TRUE@ if test -f $$p; then \
+@GTK2_TRUE@ list2="$$list2 $$p"; \
+@GTK2_TRUE@ else :; fi; \
+@GTK2_TRUE@ done; \
+@GTK2_TRUE@ test -z "$$list2" || { \
+@GTK2_TRUE@ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(moduledir)'"; \
+@GTK2_TRUE@ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(moduledir)"; \
+@GTK2_TRUE@ }
uninstall-moduleLTLIBRARIES:
@$(NORMAL_UNINSTALL)

11
textproc/uim/files/patch-helper:Makefile.in
View file

@ -1,11 +0,0 @@
--- helper/Makefile.in.orig Wed Jan 3 21:40:57 2007
+++ helper/Makefile.in Wed Jan 3 21:41:05 2007
@@ -442,7 +442,7 @@
# recent version of gcc has the option to suppress the warning
#uim_toolbar_applet_CFLAGS += -Wno-overlength-strings
@APPLET_GNOME_TRUE@uim_toolbar_applet_SOURCES = toolbar-applet-gnome.c toolbar-common-gtk.c
-@APPLET_GNOME_TRUE@serverdir = $(libdir)/bonobo/servers
+@APPLET_GNOME_TRUE@serverdir = $(prefix)/libdata/bonobo/servers
@APPLET_GNOME_TRUE@server_DATA = GNOME_UimApplet.server
@APPLET_GNOME_TRUE@server_in_files = $(server_DATA:=.in)
@APPLET_GNOME_TRUE@server_in_in_files = $(server_in_files:=.in)

20
textproc/uim/pkg-plist
View file

@ -60,6 +60,7 @@ lib/uim/plugin/libuim-socket.so
libdata/pkgconfig/gcroots.pc
libdata/pkgconfig/uim.pc
%%X11%%libexec/uim-candwin-gtk
%%X11%%libexec/uim-candwin-horizontal-gtk
%%X11%%libexec/uim-candwin-tbl-gtk
libexec/uim-helper-server
share/applications/uim.desktop
@ -75,15 +76,20 @@ share/locale/ko/LC_MESSAGES/uim.mo
%%DATADIR%%/ajax-ime-custom.scm
%%DATADIR%%/ajax-ime-key-custom.scm
%%DATADIR%%/ajax-ime.scm
%%DATADIR%%/annotation-custom.scm
%%DATADIR%%/annotation-dict.scm
%%DATADIR%%/annotation-eb.scm
%%DATADIR%%/annotation-filter.scm
%%DATADIR%%/annotation-osx-dcs.scm
%%DATADIR%%/annotation.scm
%%DATADIR%%/anthy-custom.scm
%%DATADIR%%/anthy-key-custom.scm
%%DATADIR%%/anthy-utf8-custom.scm
%%DATADIR%%/anthy-utf8.scm
%%DATADIR%%/anthy.scm
%%DATADIR%%/baidu-olime-jp-custom.scm
%%DATADIR%%/baidu-olime-jp-key-custom.scm
%%DATADIR%%/baidu-olime-jp.scm
%%DATADIR%%/byeoru-custom.scm
%%DATADIR%%/byeoru-key-custom.scm
%%DATADIR%%/byeoru-symbols.scm
@ -111,6 +117,9 @@ share/locale/ko/LC_MESSAGES/uim.mo
%%DATADIR%%/generic-key-custom.scm
%%DATADIR%%/generic-predict.scm
%%DATADIR%%/generic.scm
%%DATADIR%%/google-cgiapi-jp-custom.scm
%%DATADIR%%/google-cgiapi-jp-key-custom.scm
%%DATADIR%%/google-cgiapi-jp.scm
%%DATADIR%%/hangul.scm
%%DATADIR%%/hangul2.scm
%%DATADIR%%/hangul3.scm
@ -132,6 +141,8 @@ share/locale/ko/LC_MESSAGES/uim.mo
%%DATADIR%%/japanese-kana.scm
%%DATADIR%%/japanese-kzik.scm
%%DATADIR%%/japanese.scm
%%DATADIR%%/json-parser-expanded.scm
%%DATADIR%%/json.scm
%%DATADIR%%/key.scm
%%DATADIR%%/latin.scm
%%DATADIR%%/lazy-load.scm
@ -151,6 +162,7 @@ share/locale/ko/LC_MESSAGES/uim.mo
%%DATADIR%%/look-custom.scm
%%DATADIR%%/look.scm
%%DATADIR%%/m17nlib.scm
%%DATADIR%%/m17nlib-custom.scm
%%DATADIR%%/mana-custom.scm
%%DATADIR%%/mana-key-custom.scm
%%DATADIR%%/mana.scm
@ -158,10 +170,13 @@ share/locale/ko/LC_MESSAGES/uim.mo
%%DATADIR%%/ng-action.scm
%%DATADIR%%/ng-key.scm
%%DATADIR%%/openssl.scm
%%DATADIR%%/packrat.scm
%%DATADIR%%/pinyin-big5.scm
%%DATADIR%%/pixmaps/ajax-ime.png
%%DATADIR%%/pixmaps/ajax-ime.svg
%%DATADIR%%/pixmaps/anthy.png
%%DATADIR%%/pixmaps/baidu-olime-jp.png
%%DATADIR%%/pixmaps/baidu-olime-jp.svg
%%DATADIR%%/pixmaps/byeoru.png
%%DATADIR%%/pixmaps/byeoru.svg
%%DATADIR%%/pixmaps/canna.png
@ -175,6 +190,8 @@ share/locale/ko/LC_MESSAGES/uim.mo
%%DATADIR%%/pixmaps/direct_input_dark_background.svg
%%DATADIR%%/pixmaps/elatin.png
%%DATADIR%%/pixmaps/elatin.svg
%%DATADIR%%/pixmaps/google-cgiapi-jp.png
%%DATADIR%%/pixmaps/google-cgiapi-jp.svg
%%DATADIR%%/pixmaps/hangul2.png
%%DATADIR%%/pixmaps/hangul2.svg
%%DATADIR%%/pixmaps/hangul3.png
@ -318,6 +335,8 @@ share/locale/ko/LC_MESSAGES/uim.mo
%%DATADIR%%/pixmaps/zm.svg
%%DATADIR%%/pixmaps/zm_dark_background.png
%%DATADIR%%/pixmaps/zm_dark_background.svg
%%DATADIR%%/tables/wb86.table
%%DATADIR%%/tables/zm.table
%%DATADIR%%/plugin.scm
%%DATADIR%%/predict-custom.scm
%%DATADIR%%/predict-google-suggest.scm
@ -391,4 +410,5 @@ share/locale/ko/LC_MESSAGES/uim.mo
@dirrm %%DATADIR%%/helperdata
@dirrm %%DATADIR%%/lib
@dirrm %%DATADIR%%/pixmaps
@dirrm %%DATADIR%%/tables
@dirrm %%DATADIR%%