Author: yamakenz
Date: Sat Sep 22 04:28:21 2007
New Revision: 5005
Added:
trunk/qt4/edittest/Makefile.am
trunk/qt4/immodule/Makefile.am
Modified:
trunk/Makefile.am
trunk/configure.ac
trunk/pixmaps/Makefile.am
trunk/pixmaps/uim-m17nlib-relink-icons.in
trunk/po/POTFILES.in
Log:
* This commit make 'make distcheck' passed
* configure.ac
- Add AM_CONDITIONAL QT4_IMMODULE
- Add qt4/immodule/Makefile qt4/edittest/Makefile to AC_CONFIG_FILES
- Prepend ${ac_abs_top_{src,build}dir} to qmake invocation
* Makefile.am
- (SUBDIRS): Make qt4 optional in accordance with QT4_IMMODULE
* qt4/edittest/Makefile.am
* qt4/immodule/Makefile.am
- New file to handle 'make dist'
- Add delegation to Makefile.qmake
* pixmaps/Makefile.am
* pixmaps/uim-m17nlib-relink-icons.in
- Fix DESTDIR handling
* po/POTFILES.in
- Update
- Remove spellcheck-custom.scm and qtgettext.h
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Sat Sep 22 04:28:21 2007
@@ -2,8 +2,12 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = m4 doc replace sigscheme uim scm test \
- gtk helper qt qt4 xim fep emacs \
- po pixmaps examples
+ gtk helper qt
+if QT4_IMMODULE
+SUBDIRS += qt4
+endif
+SUBDIRS += xim fep emacs po pixmaps examples
+
EXTRA_DIST = RELNOTE ChangeLog.old autogen.sh make-dist.sh \
uim.pc.in uim.desktop uim.spec.in uim.spec \
intltool-extract.in intltool-merge.in intltool-update.in
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sat Sep 22 04:28:21 2007
@@ -1213,6 +1213,7 @@
AM_CONDITIONAL(QT, test x$use_qt = xyes)
AM_CONDITIONAL(QT_IMMODULE, test x$use_qtimmodule = xyes)
AM_CONDITIONAL(APPLET_KDE, test x$use_applet_kde = xyes)
+AM_CONDITIONAL(QT4_IMMODULE, test x$use_qt4_immodule = xyes)
AC_ARG_ENABLE(pref,
AC_HELP_STRING([--enable-pref],
@@ -1409,6 +1410,8 @@
qt/uimapplet.desktop
qt4/Makefile
qt4/immodule/quiminputcontextplugin.pro
+ qt4/immodule/Makefile
+ qt4/edittest/Makefile
xim/Makefile
fep/Makefile
emacs/Makefile
@@ -1427,9 +1430,10 @@
# Generate Makefiles for Qt4 by qmake
if test x$use_qt4_immodule = xyes; then
- ${QMAKE_QT4} -o qt4/immodule/Makefile \
- qt4/immodule/quiminputcontextplugin.pro
- ${QMAKE_QT4} -o qt4/edittest/Makefile qt4/edittest/edittest.pro
+ ${QMAKE_QT4} -o ${ac_abs_top_builddir}/qt4/immodule/Makefile.qmake \
+ ${ac_abs_top_srcdir}/qt4/immodule/quiminputcontextplugin.pro
+ ${QMAKE_QT4} -o ${ac_abs_top_builddir}/qt4/edittest/Makefile.qmake \
+ ${ac_abs_top_srcdir}/qt4/edittest/edittest.pro
fi
AC_MSG_RESULT([
Modified: trunk/pixmaps/Makefile.am
==============================================================================
--- trunk/pixmaps/Makefile.am (original)
+++ trunk/pixmaps/Makefile.am Sat Sep 22 04:28:21 2007
@@ -108,5 +108,5 @@
install-data-hook:
if M17NLIB
- $(SH) $(srcdir)/uim-m17nlib-relink-icons
+ DESTDIR="$(DESTDIR)" $(SH) $(builddir)/uim-m17nlib-relink-icons
endif
Modified: trunk/pixmaps/uim-m17nlib-relink-icons.in
==============================================================================
--- trunk/pixmaps/uim-m17nlib-relink-icons.in (original)
+++ trunk/pixmaps/uim-m17nlib-relink-icons.in Sat Sep 22 04:28:21 2007
@@ -33,6 +33,6 @@
for f in @m17n_db_dir@/icons/*.png; do
if test -f "$f"; then
- @LN_S@ -f "$f" @DESTDIR@@uim_pixmapsdir@/m17n-`basename "$f"`
+ @LN_S@ -f "$f" [EMAIL PROTECTED]@/m17n-`basename "$f"`
fi
done
Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in (original)
+++ trunk/po/POTFILES.in Sat Sep 22 04:28:21 2007
@@ -3,10 +3,10 @@
helper/dict-canna.c
helper/dict-cclass-dialog.c
helper/dict-main-gtk.c
-helper/dict-word.c
helper/dict-word-list-view-gtk.c
helper/dict-word-list-win-gtk.c
helper/dict-word-win-gtk.c
+helper/dict-word.c
helper/eggtrayicon.c
helper/im-switcher-gtk.c
helper/input-pad-ja.c
@@ -17,12 +17,12 @@
helper/toolbar-standalone-gtk.c
qt/pref-customwidgets.cpp
qt/pref-qt.cpp
-qt/qtgettext.h
qt/switcher-qt.cpp
qt/toolbar-common-quimhelpertoolbar.cpp
scm/action.scm
scm/anthy-custom.scm
scm/anthy-key-custom.scm
+scm/anthy-utf8-custom.scm
scm/byeoru-custom.scm
scm/byeoru-key-custom.scm
scm/canna-custom.scm
@@ -37,6 +37,8 @@
scm/ipa-x-sampa.scm
scm/iso-639-1.scm
scm/latin.scm
+scm/look-custom.scm
+scm/look.scm
scm/m17nlib.scm
scm/mana-custom.scm
scm/mana-key-custom.scm
@@ -46,8 +48,9 @@
scm/scim.scm
scm/skk-custom.scm
scm/skk-key-custom.scm
-scm/spellcheck-custom.scm
scm/tcode.scm
+scm/trycode.scm
+scm/tutcode-custom.scm
scm/tutcode-key-custom.scm
scm/tutcode.scm
scm/viqr.scm
Added: trunk/qt4/edittest/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/qt4/edittest/Makefile.am Sat Sep 22 04:28:21 2007
@@ -0,0 +1,17 @@
+.PHONY: mocclean FORCE
+
+# Makefile.qmake is only exist when --enable-qt4-immodule
+if QT4_IMMODULE
+all clean mocclean install uninstall:
+ $(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake $@
+
+# *.pro is required to run Makefile.qmake. So distclean-am is deferred.
+distclean:
+ $(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake $@
+ $(MAKE) $(AM_MAKEFLAGS) distclean-am
+ -rm -f Makefile
+endif
+
+FORCE:
+
+EXTRA_DIST = README edittest.pro main.cpp
Added: trunk/qt4/immodule/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/qt4/immodule/Makefile.am Sat Sep 22 04:28:21 2007
@@ -0,0 +1,38 @@
+.PHONY: mocclean FORCE
+
+# Makefile.qmake is only exist when --enable-qt4-immodule
+if QT4_IMMODULE
+all clean mocclean install uninstall:
+ $(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake $@
+
+# *.pro is required to run Makefile.qmake. So distclean-am is deferred.
+distclean:
+ $(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake $@
+ $(MAKE) $(AM_MAKEFLAGS) distclean-am
+ -rm -f Makefile
+endif
+
+FORCE:
+
+EXTRA_DIST = COPYING README.en README.ja INDENT \
+ quiminputcontextplugin.pro.in \
+ quiminputcontext_with_slave.h \
+ quiminputcontext_with_slave.cpp
+
+EXTRA_DIST += qhelpermanager.h \
+ quiminputcontext.h \
+ quiminputcontext_compose.h \
+ plugin.h \
+ candidatewindow.h \
+ subwindow.h \
+ quiminfomanager.h \
+ qtextutil.h
+
+EXTRA_DIST += plugin.cpp \
+ qhelpermanager.cpp \
+ quiminputcontext.cpp \
+ quiminputcontext_compose.cpp \
+ candidatewindow.cpp \
+ subwindow.cpp \
+ quiminfomanager.cpp \
+ qtextutil.cpp
