Revision: 6013
Author: ek.kato
Date: Sat Sep 26 12:33:47 2009
Log: * configure.ac (default-toolkit) : Add qt4.
* qt4/pref/Makefile.am : Don't enclose with PREF to avoid
problem with make clean.
http://code.google.com/p/uim/source/detail?r=6013
Modified:
/trunk/configure.ac
/trunk/qt4/pref/Makefile.am
=======================================
--- /trunk/configure.ac Sat Sep 26 11:30:24 2009
+++ /trunk/configure.ac Sat Sep 26 12:33:47 2009
@@ -1356,16 +1356,18 @@
;;
esac ],
[
- if test x"$default_toolkit" = "xgtk" && test x"$use_gtk2_4" = "xyes";
then
+ if test x"$default_toolkit" = "xgtk" && \
+ test x"$use_gtk2_4" = "xyes"; then
use_pref="yes"
- else
- if test x"$default_toolkit" = "xqt" && \
+ elif test x"$default_toolkit" = "xqt" && \
test x"$use_qt" = "xyes"; then
- use_pref="yes"
- else
- use_pref="no"
- AC_MSG_WARN([uim pref needs Gtk+ or Qt toolkit, disabled...])
- fi
+ use_pref="yes"
+ elif test x"$default_toolkit" = "xqt4" && \
+ test x"$use_qt4" = "xyes"; then
+ use_pref="yes"
+ else
+ use_pref="no"
+ AC_MSG_WARN([uim pref needs Gtk+ or Qt toolkit, disabled...])
fi
])
AM_CONDITIONAL(PREF, test x"$use_pref" = "xyes")
=======================================
--- /trunk/qt4/pref/Makefile.am Fri Sep 25 08:52:02 2009
+++ /trunk/qt4/pref/Makefile.am Sat Sep 26 12:33:47 2009
@@ -1,8 +1,7 @@
.PHONY: mocclean FORCE
-# Makefile.qmake is only exist when --enable-pref and --enable-qt4
+# Makefile.qmake is only exist when --enable-qt4
if QT4
-if PREF
all clean mocclean install uninstall:
$(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake INSTALL_ROOT=$(DESTDIR) $@
@@ -11,7 +10,6 @@
$(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake $@
$(MAKE) $(AM_MAKEFLAGS) distclean-am
-rm -f Makefile uim-pref-qt4.pro
-endif
else
distclean:
-rm -f Makefile uim-pref-qt4.pro
