[uim-commit] r544 - trunk/qt

[tkng at freedesktop.org]

Author: tkng
Date: 2005-02-05 02:10:25 -0800 (Sat, 05 Feb 2005)
New Revision: 544

Modified:
   trunk/qt/Makefile.am
Log:
* qt/Makefile.am: Added suffix rules. .ui -> .h and .h -> .moc


Modified: trunk/qt/Makefile.am
===================================================================
--- trunk/qt/Makefile.am	2005-02-05 09:39:16 UTC (rev 543)
+++ trunk/qt/Makefile.am	2005-02-05 10:10:25 UTC (rev 544)
@@ -103,11 +103,7 @@
 libtoolbarcommon_la_LDFLAGS  = $(QT_LDFLAGS)
 libtoolbarcommon_la_LIBADD   = $(top_builddir)/uim/libuim.la
 toolbar-common-quimhelpertoolbar.cpp: toolbar-common-quimhelpertoolbar.moc
-toolbar-common-quimhelpertoolbar.moc: toolbar-common-quimhelpertoolbar.h
-	$(MOC) toolbar-common-quimhelpertoolbar.h -o toolbar-common-quimhelpertoolbar.moc
 toolbar-common-uimstateindicator.cpp: toolbar-common-uimstateindicator.moc
-toolbar-common-uimstateindicator.moc: toolbar-common-uimstateindicator.h
-	$(MOC) toolbar-common-uimstateindicator.h -o toolbar-common-uimstateindicator.moc
 
 # Toolbar Standalone
 uim_toolbar_qt_SOURCES = toolbar-standalone-qt.cpp
@@ -115,17 +111,13 @@
 uim_toolbar_qt_LDFLAGS  = $(QT_LDFLAGS)
 uim_toolbar_qt_LDADD    = $(top_builddir)/uim/libuim.la ./libtoolbarcommon.la
 toolbar-standalone-qt.cpp: toolbar-standalone-qt.moc
-toolbar-standalone-qt.moc: toolbar-standalone-qt.h
-	$(MOC) toolbar-standalone-qt.h -o toolbar-standalone-qt.moc
 
 # Candidate Window
-uim_candwin_qt_SOURCES  = candwin-qt.cpp
+uim_candwin_qt_SOURCES  = candwin-qt.cpp qtgettext.h
 uim_candwin_qt_CXXFLAGS = $(QT_CXXFLAGS)
 uim_candwin_qt_LDFLAGS  = $(QT_LDFLAGS)
 uim_candwin_qt_LDADD = $(top_builddir)/uim/libuim.la
 candwin-qt.cpp: candwin-qt.moc
-candwin-qt.moc: candwin-qt.h
-	$(MOC) candwin-qt.h -o candwin-qt.moc
 
 # Switcher
 uim_im_switcher_qt_SOURCES  = switcher-qt.cpp
@@ -133,13 +125,11 @@
 uim_im_switcher_qt_LDFLAGS  = $(QT_LDFLAGS)
 uim_im_switcher_qt_LDADD    = $(top_builddir)/uim/libuim.la
 switcher-qt.cpp: switcher-qt.moc
-switcher-qt.moc: switcher-qt.h
-	$(MOC) switcher-qt.h -o switcher-qt.moc
 
 # Pref
 uim_pref_qt_SOURCES = \
 	pref-olisteditformbase.cpp pref-keyeditformbase.cpp pref-keygrabformbase.cpp \
-	pref-qt.cpp pref-customwidgets.cpp pref-kseparator.cpp
+	pref-qt.cpp pref-customwidgets.cpp pref-kseparator.cpp 
 
 uim_pref_qt_CXXFLAGS = $(QT_CXXFLAGS)
 uim_pref_qt_LDFLAGS  = $(QT_LDFLAGS)
@@ -149,33 +139,21 @@
 pref-qt.h:pref-olisteditformbase.h pref-keyeditformbase.h pref-keygrabformbase.h
 
 pref-qt.cpp: pref-qt.moc
-pref-qt.moc: pref-qt.h
-	$(MOC) pref-qt.h -o pref-qt.moc
 pref-customwidgets.cpp: pref-customwidgets.moc
-pref-customwidgets.moc: pref-customwidgets.h
-	$(MOC) pref-customwidgets.h -o pref-customwidgets.moc
 pref-kseparator.cpp: pref-kseparator.moc
-pref-kseparator.moc: pref-kseparator.h
-	$(MOC) pref-kseparator.h -o pref-kseparator.moc
 
-pref-olisteditformbase.h: pref-olisteditformbase.ui
-	$(UIC) pref-olisteditformbase.ui -o pref-olisteditformbase.h
 pref-olisteditformbase.cpp:pref-olisteditformbase.h
 	$(UIC) pref-olisteditformbase.ui -i pref-olisteditformbase.h > pref-olisteditformbase.cpp.tmp
 	$(MOC) pref-olisteditformbase.h -o pref-olisteditformbase.moc
 	echo '#include "pref-olisteditformbase.moc"' >> pref-olisteditformbase.cpp.tmp
 	mv pref-olisteditformbase.cpp.tmp pref-olisteditformbase.cpp
 
-pref-keyeditformbase.h: pref-keyeditformbase.ui
-	$(UIC) pref-keyeditformbase.ui -o pref-keyeditformbase.h
 pref-keyeditformbase.cpp: pref-keyeditformbase.h
 	$(UIC) pref-keyeditformbase.ui -i pref-keyeditformbase.h > pref-keyeditformbase.cpp.tmp
 	$(MOC) pref-keyeditformbase.h -o pref-keyeditformbase.moc
 	echo '#include "pref-keyeditformbase.moc"' >> pref-keyeditformbase.cpp.tmp
 	mv pref-keyeditformbase.cpp.tmp pref-keyeditformbase.cpp
 
-pref-keygrabformbase.h: pref-keygrabformbase.ui
-	$(UIC) pref-keygrabformbase.ui -o pref-keygrabformbase.h
 pref-keygrabformbase.cpp: pref-keygrabformbase.h
 	$(UIC) pref-keygrabformbase.ui -i pref-keygrabformbase.h > pref-keygrabformbase.cpp.tmp
 	$(MOC) pref-keygrabformbase.h -o pref-keygrabformbase.moc
@@ -192,8 +170,7 @@
 uim_chardict_qt_LDFLAGS  = $(QT_LDFLAGS)
 uim_chardict_qt_LDADD    = $(top_builddir)/uim/libuim.la
 chardict-qt.cpp: chardict-qt.moc
-chardict-qt.moc: chardict-qt.h
-	$(MOC) chardict-qt.h -o chardict-qt.moc
+
 chardict-bushuviewwidget.cpp: chardict-bushuviewwidget.moc
 chardict-bushuviewwidget.moc: chardict-bushuviewwidget.h
 	$(MOC) chardict-bushuviewwidget.h -o chardict-bushuviewwidget.moc
@@ -214,6 +191,9 @@
 	$(MOC_FILES) \
 	$(UI_TMP_FILES)
 
-
+.h.moc: 
+	$(MOC) $< -o $*.moc
+.ui.h: 
+	$(UIC) $< -o $*.h
 endif