[uim-commit] r1524 - in trunk: . qt

[ekato at freedesktop.org]

Author: ekato
Date: 2005-09-18 22:29:40 -0700 (Sun, 18 Sep 2005)
New Revision: 1524

Modified:
   trunk/configure.ac
   trunk/qt/Makefile.am
Log:
* configure.ac : Don't use MOC-QT3 and UIC-QT3 as in branches/0.4.
* qt/Makefile.am : Ditto. Add $(top_srcdir) and $(top_builddir) as
  include path again.


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-09-19 04:39:50 UTC (rev 1523)
+++ trunk/configure.ac	2005-09-19 05:29:40 UTC (rev 1524)
@@ -619,46 +619,24 @@
     if test -x "$QTDIR/bin/moc"; then
       HOST_MOC="$QTDIR/bin/moc"
     else
-      AC_CHECK_PROGS(HOST_MOC, moc, "")
+      AC_CHECK_PROGS(HOST_MOC, moc-qt3 moc, "")
     fi
     if test -z "$HOST_MOC"; then
       AC_MSG_ERROR([no acceptable moc( meta object compiler ) found])
     fi
     MOC=$HOST_MOC
 
-    # Check For moc-qt3
-    if test -x "$QTDIR/bin/moc-qt3"; then
-      HOST_MOC_QT3="$QTDIR/bin/moc-qt3"
-    else
-      AC_CHECK_PROGS(HOST_MOC_QT3, moc-qt3, "")
-    fi
-    if test -z "$HOST_MOC_QT3"; then
-      AC_MSG_ERROR([No acceptable moc (meta object compiler) found])
-    fi
-    MOC_QT3=$HOST_MOC_QT3
-
     # Check For UIC
     if test -x "$QTDIR/bin/uic"; then
       HOST_UIC="$QTDIR/bin/uic"
     else
-      AC_CHECK_PROGS(HOST_UIC, uic, "")
+      AC_CHECK_PROGS(HOST_UIC, uic-qt3 uic, "")
     fi
     if test -z "$HOST_UIC"; then
       AC_MSG_ERROR([no acceptable uic( user interface compiler ) found])
     fi
     UIC=$HOST_UIC
 
-    # Check for uic-qt3
-    if test -x "$QTDIR/bin/uic-qt3"; then
-      HOST_UIC_QT3="$QTDIR/bin/uic-qt3"
-    else
-      AC_CHECK_PROGS(HOST_UIC_QT3, uic-qt3, "")
-    fi
-    if test -z "$HOST_UIC_QT3"; then
-      AC_MSG_ERROR([No acceptable uic-qt3 (user interface compiler) found])
-    fi
-    UIC_QT3=$HOST_UIC_QT3
-
     # GUESS plugins dir for immodule installation
     AC_MSG_CHECKING(for qt-immodule plugins dir)
     if test ! -d "$QTDIR/plugins"; then
@@ -718,9 +696,7 @@
     UIM_QT_CXXFLAGS=$QT_CXXFLAGS
 
     AC_SUBST(MOC)
-    AC_SUBST(MOC_QT3)
     AC_SUBST(UIC)
-    AC_SUBST(UIC_QT3)
     AC_SUBST(UIM_QT_CXXFLAGS)
     AC_SUBST(UIM_QT_LDFLAGS)
 fi

Modified: trunk/qt/Makefile.am
===================================================================
--- trunk/qt/Makefile.am	2005-09-19 04:39:50 UTC (rev 1523)
+++ trunk/qt/Makefile.am	2005-09-19 05:29:40 UTC (rev 1524)
@@ -1,6 +1,7 @@
 EXTRA_DIST = pref-keyeditformbase.ui  pref-olisteditformbase.ui bushu.t
 
 if QT
+INCLUDES += -I$(top_srcdir) -I$(top_builddir)
 QT_CXXFLAGS = $(UIM_QT_CXXFLAGS)
 QT_LDFLAGS  = $(UIM_QT_LDFLAGS)
 
@@ -22,7 +23,7 @@
 	chardict-chargridview.h \
 	chardict-kseparator.h \
 	chardict-qt.h
-MOC_QT3_FILES = \
+MOC_FILES = \
 	toolbar-common-quimhelpertoolbar.moc \
 	toolbar-common-uimstateindicator.moc \
 	toolbar-standalone-qt.moc \
@@ -63,7 +64,7 @@
 	immodule-candidatewindow.h immodule-qhelpermanager.h \
 	immodule-quiminputcontext.h immodule-quiminputcontext_with_slave.h \
 	immodule-subwindow.h
-MOC_QT3_FILES += \
+MOC_FILES += \
 	immodule-candidatewindow.moc immodule-qhelpermanager.moc \
 	immodule-quiminputcontext.moc immodule-quiminputcontext_with_slave.moc \
 	immodule-subwindow.moc
@@ -136,18 +137,18 @@
 pref-kseparator.cpp: pref-kseparator.moc
 
 pref-olisteditformbase.cpp: pref-olisteditformbase.h pref-olisteditformbase.moc
-	$(UIC_QT3) $(top_srcdir)/qt/pref-olisteditformbase.ui -i pref-olisteditformbase.h > pref-olisteditformbase.cpp.tmp
+	$(UIC) $(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_QT3) $(top_srcdir)/qt/pref-olisteditformbase.ui -o pref-olisteditformbase.h
+	$(UIC) $(top_srcdir)/qt/pref-olisteditformbase.ui -o pref-olisteditformbase.h
 
 pref-keyeditformbase.cpp: pref-keyeditformbase.h pref-keyeditformbase.moc
-	$(UIC_QT3) $(top_srcdir)/qt/pref-keyeditformbase.ui -i pref-keyeditformbase.h > pref-keyeditformbase.cpp.tmp
+	$(UIC) $(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_QT3) $(top_srcdir)/qt/pref-keyeditformbase.ui -o pref-keyeditformbase.h
+	$(UIC) $(top_srcdir)/qt/pref-keyeditformbase.ui -o pref-keyeditformbase.h
 
 uim_chardict_qt_SOURCES = \
 	chardict-qt.cpp chardict-qt.h \
@@ -170,12 +171,12 @@
 helperdata_DATA = bushu.t
 
 CLEANFILES = \
-	$(MOC_QT3_FILES) \
+	$(MOC_FILES) \
 	$(UI_TMP_FILES)
 
 .h.moc: 
-	$(MOC_QT3) $< -o $*.moc
+	$(MOC) $< -o $*.moc
 .ui.h: 
-	$(UIC_QT3) $< -o $*.h
+	$(UIC) $< -o $*.h
 endif