Revision: 6042
Author: ek.kato
Date: Sun Oct 25 22:41:24 2009
Log: * qt4/candwin/uim-candwin-qt4.pro.in
* qt4/chardict/uim-chardict-qt4.pro.in
* qt4/immodule/quiminputcontextplugin.pro.in
* qt4/pref/uim-pref-qt4.pro.in
* qt4/switcher/uim-im-switcher-qt4.pro.in
* qt4/toolbar/uim-toolbar-qt4.pro.in
- Fix build outside the source directory.
http://code.google.com/p/uim/source/detail?r=6042
Modified:
/trunk/qt4/candwin/uim-candwin-qt4.pro.in
/trunk/qt4/chardict/uim-chardict-qt4.pro.in
/trunk/qt4/immodule/quiminputcontextplugin.pro.in
/trunk/qt4/pref/uim-pref-qt4.pro.in
/trunk/qt4/switcher/uim-im-switcher-qt4.pro.in
/trunk/qt4/toolbar/uim-toolbar-qt4.pro.in
=======================================
--- /trunk/qt4/candwin/uim-candwin-qt4.pro.in Tue Oct 20 21:18:26 2009
+++ /trunk/qt4/candwin/uim-candwin-qt4.pro.in Sun Oct 25 22:41:24 2009
@@ -2,8 +2,9 @@
CONFIG += @QT_CONFIG_OPTS@
QT += qt3support
-INCLUDEPATH += @abs_top_builddir@ @abs_top_builddir@/uim \
- @abs_top_builddir@/replace ..
+INCLUDEPATH += @top_builddir@ @top_builddir@/uim \
+ @top_srcdir@ @top_srcdir@/uim \
+ @top_srcdir@/replace @srcdir@/..
QMAKE_LIBDIR += @abs_top_builddir@/uim
QMAKE_LIBDIR += @abs_top_builddir@/replace
QMAKE_LIBDIR += @abs_top_builddir@/uim/.libs
@@ -16,8 +17,8 @@
QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
# Input
-HEADERS += qt4.h
-SOURCES += qt4.cpp
+HEADERS += @srcdir@/qt4.h
+SOURCES += @srcdir@/qt4.cpp
TARGET = uim-candwin-qt4
=======================================
--- /trunk/qt4/chardict/uim-chardict-qt4.pro.in Tue Oct 20 21:18:26 2009
+++ /trunk/qt4/chardict/uim-chardict-qt4.pro.in Sun Oct 25 22:41:24 2009
@@ -1,8 +1,9 @@
TEMPLATE = app
CONFIG += @QT_CONFIG_OPTS@
-INCLUDEPATH += @abs_top_builddir@ @abs_top_builddir@/uim \
- @abs_top_builddir@/replace
+INCLUDEPATH += @top_builddir@ @top_builddir@/uim \
+ @top_srcdir@ @top_srcdir@/uim \
+ @top_srcdir@/replace
QMAKE_LIBDIR += @abs_top_builddir@/uim
QMAKE_LIBDIR += @abs_top_builddir@/replace
QMAKE_LIBDIR += @abs_top_builddir@/uim/.libs
@@ -15,17 +16,17 @@
QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
# Input
-HEADERS += bushuviewwidget.h \
- chargridview.h \
- kseparator.h \
- qt4.h \
- qtgettext.h \
- unicodeviewwidget.h
-SOURCES += bushuviewwidget.cpp \
- chargridview.cpp \
- kseparator.cpp \
- qt4.cpp \
- unicodeviewwidget.cpp
+HEADERS += @srcdir@/bushuviewwidget.h \
+ @srcdir@/chargridview.h \
+ @srcdir@/kseparator.h \
+ @srcdir@/qt4.h \
+ @srcdir@/qtgettext.h \
+ @srcdir@/unicodeviewwidget.h
+SOURCES += @srcdir@/bushuviewwidget.cpp \
+ @srcdir@/chargridview.cpp \
+ @srcdir@/kseparator.cpp \
+ @srcdir@/qt4.cpp \
+ @srcdir@/unicodeviewwidget.cpp
TARGET = uim-chardict-qt4
=======================================
--- /trunk/qt4/immodule/quiminputcontextplugin.pro.in Thu Oct 23 18:37:47
2008
+++ /trunk/qt4/immodule/quiminputcontextplugin.pro.in Sun Oct 25 22:41:24
2009
@@ -6,8 +6,9 @@
CONFIG += qt plugin thread @QT_CONFIG_OPTS@
QT += qt3support
-INCLUDEPATH += @abs_top_builddir@ @abs_top_builddir@/uim \
- @abs_top_builddir@/replace
+INCLUDEPATH += @top_builddir@ @top_builddir@/uim \
+ @top_srcdir@ @top_srcdir@/uim \
+ @abs_top_srcdir@/replace
QMAKE_LIBDIR += @abs_top_builddir@/uim
QMAKE_LIBDIR += @abs_top_builddir@/replace
# Since the plugin linked with libtool did not work, link the
@@ -23,24 +24,24 @@
# Input
-HEADERS += debug.h \
- qhelpermanager.h \
- quiminputcontext.h \
- quiminputcontext_compose.h \
- plugin.h \
- candidatewindow.h \
- subwindow.h \
- quiminfomanager.h \
- qtextutil.h
-
-SOURCES += plugin.cpp \
- qhelpermanager.cpp \
- quiminputcontext.cpp \
- quiminputcontext_compose.cpp \
- candidatewindow.cpp \
- subwindow.cpp \
- quiminfomanager.cpp \
- qtextutil.cpp
+HEADERS += @srcdir@/debug.h \
+ @srcdir@/qhelpermanager.h \
+ @srcdir@/quiminputcontext.h \
+ @srcdir@/quiminputcontext_compose.h \
+ @srcdir@/plugin.h \
+ @srcdir@/candidatewindow.h \
+ @srcdir@/subwindow.h \
+ @srcdir@/quiminfomanager.h \
+ @srcdir@/qtextutil.h
+
+SOURCES += @srcdir@/plugin.cpp \
+ @srcdir@/qhelpermanager.cpp \
+ @srcdir@/quiminputcontext.cpp \
+ @srcdir@/quiminputcontext_compose.cpp \
+ @srcdir@/candidatewindow.cpp \
+ @srcdir@/subwindow.cpp \
+ @srcdir@/quiminfomanager.cpp \
+ @srcdir@/qtextutil.cpp
TARGET = uiminputcontextplugin
=======================================
--- /trunk/qt4/pref/uim-pref-qt4.pro.in Tue Oct 20 21:18:26 2009
+++ /trunk/qt4/pref/uim-pref-qt4.pro.in Sun Oct 25 22:41:24 2009
@@ -1,8 +1,9 @@
TEMPLATE = app
CONFIG += @QT_CONFIG_OPTS@
-INCLUDEPATH += @abs_top_builddir@ @abs_top_builddir@/uim \
- @abs_top_builddir@/replace ..
+INCLUDEPATH += @top_builddir@ @top_builddir@/uim \
+ @top_srcdir@ @top_srcdir@/uim \
+ @top_srcdir@/replace @srcdir@/..
QMAKE_LIBDIR += @abs_top_builddir@/uim
QMAKE_LIBDIR += @abs_top_builddir@/replace
QMAKE_LIBDIR += @abs_top_builddir@/uim/.libs
@@ -15,9 +16,9 @@
QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
# Input
-HEADERS += customwidgets.h kseparator.h qt4.h
-FORMS += keyeditformbase.ui olisteditformbase.ui
-SOURCES += customwidgets.cpp kseparator.cpp qt4.cpp
+HEADERS += @srcdir@/customwidgets.h @srcdir@/kseparator.h @srcdir@/qt4.h
+FORMS += @srcdir@/keyeditformbase.ui @srcdir@/olisteditformbase.ui
+SOURCES += @srcdir@/customwidgets.cpp @srcdir@/kseparator.cpp
@srcdir@/qt4.cpp
TARGET = uim-pref-qt4
=======================================
--- /trunk/qt4/switcher/uim-im-switcher-qt4.pro.in Tue Oct 20 21:18:26 2009
+++ /trunk/qt4/switcher/uim-im-switcher-qt4.pro.in Sun Oct 25 22:41:24 2009
@@ -1,8 +1,9 @@
TEMPLATE = app
CONFIG += @QT_CONFIG_OPTS@
-INCLUDEPATH += @abs_top_builddir@ @abs_top_builddir@/uim \
- @abs_top_builddir@/replace ..
+INCLUDEPATH += @top_builddir@ @top_builddir@/uim \
+ @top_srcdir@ @top_srcdir@/uim \
+ @top_srcdir@/replace @srcdir@/..
QMAKE_LIBDIR += @abs_top_builddir@/uim
QMAKE_LIBDIR += @abs_top_builddir@/replace
QMAKE_LIBDIR += @abs_top_builddir@/uim/.libs
@@ -15,8 +16,8 @@
QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
# Input
-HEADERS += qt4.h
-SOURCES += qt4.cpp
+HEADERS += @srcdir@/qt4.h
+SOURCES += @srcdir@/qt4.cpp
TARGET = uim-im-switcher-qt4
=======================================
--- /trunk/qt4/toolbar/uim-toolbar-qt4.pro.in Tue Oct 20 21:18:26 2009
+++ /trunk/qt4/toolbar/uim-toolbar-qt4.pro.in Sun Oct 25 22:41:24 2009
@@ -1,8 +1,9 @@
TEMPLATE = app
CONFIG += @QT_CONFIG_OPTS@
-INCLUDEPATH += @abs_top_builddir@ @abs_top_builddir@/uim \
- @abs_top_builddir@/replace ..
+INCLUDEPATH += @top_builddir@ @top_builddir@/uim \
+ @top_srcdir@ @top_srcdir@/uim \
+ @top_srcdir@/replace @srcdir@/..
QMAKE_LIBDIR += @abs_top_builddir@/uim
QMAKE_LIBDIR += @abs_top_builddir@/replace
QMAKE_LIBDIR += @abs_top_builddir@/uim/.libs
@@ -15,12 +16,12 @@
QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
# Input
-HEADERS += common-quimhelpertoolbar.h \
- common-uimstateindicator.h \
- standalone-qt4.h
-SOURCES += common-quimhelpertoolbar.cpp \
- common-uimstateindicator.cpp \
- standalone-qt4.cpp
+HEADERS += @srcdir@/common-quimhelpertoolbar.h \
+ @srcdir@/common-uimstateindicator.h \
+ @srcdir@/standalone-qt4.h
+SOURCES += @srcdir@/common-quimhelpertoolbar.cpp \
+ @srcdir@/common-uimstateindicator.cpp \
+ @srcdir@/standalone-qt4.cpp
TARGET = uim-toolbar-qt4
