Revision: 6298 Author: ek.kato Date: Mon Mar 29 21:24:26 2010 Log: * qt4/chardict/Makefile.am * qt4/toolbar/Makefile.am * qt4/candwin/Makefile.am * qt4/edittest/Makefile.am * qt4/switcher/Makefile.am * qt4/immodule/Makefile.am * qt4/pref/Makefile.am - Fix warnings ([uim-ja 191], Kiwamu Okabe).
http://code.google.com/p/uim/source/detail?r=6298 Modified: /trunk/qt4/candwin/Makefile.am /trunk/qt4/chardict/Makefile.am /trunk/qt4/edittest/Makefile.am /trunk/qt4/immodule/Makefile.am /trunk/qt4/pref/Makefile.am /trunk/qt4/switcher/Makefile.am /trunk/qt4/toolbar/Makefile.am ======================================= --- /trunk/qt4/candwin/Makefile.am Sat Sep 26 11:30:24 2009 +++ /trunk/qt4/candwin/Makefile.am Mon Mar 29 21:24:26 2010 @@ -4,16 +4,15 @@ if QT4 all clean mocclean install uninstall: $(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake INSTALL_ROOT=$(DESTDIR) $@ +endif # *.pro is required to run Makefile.qmake. So distclean-am is deferred. distclean: +if QT4 $(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake $@ $(MAKE) $(AM_MAKEFLAGS) distclean-am - -rm -f Makefile uim-candwin-qt4.pro -else -distclean: - -rm -f Makefile uim-candwin-qt4.pro endif + -rm -f Makefile uim-candwin-qt4.pro FORCE: ======================================= --- /trunk/qt4/chardict/Makefile.am Thu Nov 19 20:47:20 2009 +++ /trunk/qt4/chardict/Makefile.am Mon Mar 29 21:24:26 2010 @@ -9,16 +9,15 @@ helperdatadir = $(datadir)/uim/helperdata helperdata_DATA = bushu.t +endif # *.pro is required to run Makefile.qmake. So distclean-am is deferred. distclean: +if QT4 $(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake $@ $(MAKE) $(AM_MAKEFLAGS) distclean-am - -rm -f Makefile uim-chardict-qt4.pro -else -distclean: - -rm -f Makefile uim-chardict-qt4.pro endif + -rm -f Makefile uim-chardict-qt4.pro FORCE: ======================================= --- /trunk/qt4/edittest/Makefile.am Thu Jan 3 21:13:57 2008 +++ /trunk/qt4/edittest/Makefile.am Mon Mar 29 21:24:26 2010 @@ -4,16 +4,15 @@ if QT4_IMMODULE all clean mocclean install uninstall: $(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake $@ +endif # *.pro is required to run Makefile.qmake. So distclean-am is deferred. distclean: +if QT4_IMMODULE $(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake $@ $(MAKE) $(AM_MAKEFLAGS) distclean-am - -rm -f Makefile -else -distclean: - -rm -f Makefile endif + -rm -f Makefile FORCE: ======================================= --- /trunk/qt4/immodule/Makefile.am Wed Mar 24 15:04:21 2010 +++ /trunk/qt4/immodule/Makefile.am Mon Mar 29 21:24:26 2010 @@ -4,16 +4,15 @@ if QT4_IMMODULE all clean mocclean install uninstall: $(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake INSTALL_ROOT=$(DESTDIR) $@ +endif # *.pro is required to run Makefile.qmake. So distclean-am is deferred. distclean: +if QT4_IMMODULE $(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake $@ $(MAKE) $(AM_MAKEFLAGS) distclean-am - -rm -f Makefile quiminputcontextplugin.pro -else -distclean: - -rm -f Makefile quiminputcontextplugin.pro endif + -rm -f Makefile quiminputcontextplugin.pro FORCE: ======================================= --- /trunk/qt4/pref/Makefile.am Sat Sep 26 12:33:47 2009 +++ /trunk/qt4/pref/Makefile.am Mon Mar 29 21:24:26 2010 @@ -4,16 +4,15 @@ if QT4 all clean mocclean install uninstall: $(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake INSTALL_ROOT=$(DESTDIR) $@ +endif # *.pro is required to run Makefile.qmake. So distclean-am is deferred. distclean: +if QT4 $(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake $@ $(MAKE) $(AM_MAKEFLAGS) distclean-am - -rm -f Makefile uim-pref-qt4.pro -else -distclean: - -rm -f Makefile uim-pref-qt4.pro endif + -rm -f Makefile uim-pref-qt4.pro FORCE: ======================================= --- /trunk/qt4/switcher/Makefile.am Fri Sep 25 08:52:02 2009 +++ /trunk/qt4/switcher/Makefile.am Mon Mar 29 21:24:26 2010 @@ -4,16 +4,15 @@ if QT4 all clean mocclean install uninstall: $(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake INSTALL_ROOT=$(DESTDIR) $@ +endif # *.pro is required to run Makefile.qmake. So distclean-am is deferred. distclean: +if QT4 $(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake $@ $(MAKE) $(AM_MAKEFLAGS) distclean-am - -rm -f Makefile uim-im-switcher-qt4.pro -else -distclean: - -rm -f Makefile uim-im-switcher-qt4.pro endif + -rm -f Makefile uim-im-switcher-qt4.pro FORCE: ======================================= --- /trunk/qt4/toolbar/Makefile.am Sun Oct 25 11:05:11 2009 +++ /trunk/qt4/toolbar/Makefile.am Mon Mar 29 21:24:26 2010 @@ -7,18 +7,16 @@ if APPLET_KDE4 ( cd build; $(MAKE) $(AM_MAKEFLAGS) $@ ) endif +endif # *.pro is required to run Makefile.qmake. So distclean-am is deferred. distclean: +if QT4 $(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake $@ $(MAKE) $(AM_MAKEFLAGS) distclean-am +endif -rm -f Makefile uim-toolbar-qt4.pro -rm -rf build/* -else -distclean: - -rm -f Makefile uim-toolbar-qt4.pro - -rm -rf build/* -endif FORCE: To unsubscribe from this group, send email to uim-commit+unsubscribegooglegroups.com or reply to this email with the words "REMOVE ME" as the subject.
