[uim-commit] r1364 - trunk/qt

[tkng at freedesktop.org]

Author: tkng
Date: 2005-08-31 05:11:37 -0700 (Wed, 31 Aug 2005)
New Revision: 1364

Modified:
   trunk/qt/Makefile.am
Log:
* qt/Makefile.am: Use moc and uic in Qt3 explicitly, because Qt4 also has a moc/uic.
 - All MOC was replaced with MOC_QT3
 - All UIC was replaced with UIC_QT3


Modified: trunk/qt/Makefile.am
===================================================================
--- trunk/qt/Makefile.am	2005-08-31 12:07:14 UTC (rev 1363)
+++ trunk/qt/Makefile.am	2005-08-31 12:11:37 UTC (rev 1364)
@@ -25,7 +25,7 @@
 	chardict-chargridview.h \
 	chardict-kseparator.h \
 	chardict-qt.h
-MOC_FILES = \
+MOC_QT3_FILES = \
 	toolbar-common-quimhelpertoolbar.moc \
 	toolbar-common-uimstateindicator.moc \
 	toolbar-standalone-qt.moc \
@@ -65,7 +65,7 @@
 	immodule-candidatewindow.h immodule-qhelpermanager.h \
 	immodule-quiminputcontext.h immodule-quiminputcontext_with_slave.h \
 	immodule-subwindow.h
-MOC_FILES += \
+MOC_QT3_FILES += \
 	immodule-candidatewindow.moc immodule-qhelpermanager.moc \
 	immodule-quiminputcontext.moc immodule-quiminputcontext_with_slave.moc \
 	immodule-subwindow.moc
@@ -138,18 +138,18 @@
 pref-kseparator.cpp: pref-kseparator.moc
 
 pref-olisteditformbase.cpp: pref-olisteditformbase.h pref-olisteditformbase.moc
-	$(UIC) $(top_srcdir)/qt/pref-olisteditformbase.ui -i pref-olisteditformbase.h > pref-olisteditformbase.cpp.tmp
+	$(UIC_QT3) $(top_srcdir)/qt/pref-olisteditformbase.ui -i pref-olisteditformbase.h > pref-olisteditformbase.cpp.tmp
 	echo '#include "pref-olisteditformbase.moc"' >> pref-olisteditformbase.cpp.tmp
 	mv pref-olisteditformbase.cpp.tmp pref-olisteditformbase.cpp
 pref-olisteditformbase.h:
-	$(UIC) $(top_srcdir)/qt/pref-olisteditformbase.ui -o pref-olisteditformbase.h
+	$(UIC_QT3) $(top_srcdir)/qt/pref-olisteditformbase.ui -o pref-olisteditformbase.h
 
 pref-keyeditformbase.cpp: pref-keyeditformbase.h pref-keyeditformbase.moc
-	$(UIC) $(top_srcdir)/qt/pref-keyeditformbase.ui -i pref-keyeditformbase.h > pref-keyeditformbase.cpp.tmp
+	$(UIC_QT3) $(top_srcdir)/qt/pref-keyeditformbase.ui -i pref-keyeditformbase.h > pref-keyeditformbase.cpp.tmp
 	echo '#include "pref-keyeditformbase.moc"' >> pref-keyeditformbase.cpp.tmp
 	mv pref-keyeditformbase.cpp.tmp pref-keyeditformbase.cpp
 pref-keyeditformbase.h:
-	$(UIC) $(top_srcdir)/qt/pref-keyeditformbase.ui -o pref-keyeditformbase.h
+	$(UIC_QT3) $(top_srcdir)/qt/pref-keyeditformbase.ui -o pref-keyeditformbase.h
 
 uim_chardict_qt_SOURCES = \
 	chardict-qt.cpp chardict-qt.h \
@@ -172,12 +172,12 @@
 helperdata_DATA = bushu.t
 
 CLEANFILES = \
-	$(MOC_FILES) \
+	$(MOC_QT3_FILES) \
 	$(UI_TMP_FILES)
 
 .h.moc: 
-	$(MOC) $< -o $*.moc
+	$(MOC_QT3) $< -o $*.moc
 .ui.h: 
-	$(UIC) $< -o $*.h
+	$(UIC_QT3) $< -o $*.h
 endif