Author: yamakenz
Date: Fri Sep 21 13:44:49 2007
New Revision: 5002
Modified:
trunk/qt4/immodule/quiminputcontext_compose.cpp
trunk/qt4/immodule/quiminputcontextplugin.pro.in
Log:
* qt4/immodule/quiminputcontext_compose.cpp
- Include config.h
- (XLIB_DIR): Removed and replaced with configured one
- (strlcpy): Removed and replaced with libreplace
* qt4/immodule/quiminputcontextplugin.pro.in
- (INCLUDEPATH, QMAKE_LIBDIR): Add replace/
- (LIBS): Add -lreplace
- (QMAKE_CFLAGS_DEBUG, QMAKE_CFLAGS_RELEASE, QMAKE_CXXFLAGS_DEBUG,
QMAKE_CXXFLAGS_RELEASE): Add @X_CFLAGS@
- (QMAKE_LINK_SHLIB_CMD): Define as libtool --mode=link to handle
libreplace.la
Modified: trunk/qt4/immodule/quiminputcontext_compose.cpp
==============================================================================
--- trunk/qt4/immodule/quiminputcontext_compose.cpp (original)
+++ trunk/qt4/immodule/quiminputcontext_compose.cpp Fri Sep 21 13:44:49 2007
@@ -30,10 +30,7 @@
SUCH DAMAGE.
*/
-//#include <config.h>
-// FIXME: define via configure
-#define XLIB_DIR "/usr/share"
-#define strlcpy(dst, src, len) strcpy((dst), (src))
+#include <config.h>
#include <stdio.h>
#include <ctype.h>
Modified: trunk/qt4/immodule/quiminputcontextplugin.pro.in
==============================================================================
--- trunk/qt4/immodule/quiminputcontextplugin.pro.in (original)
+++ trunk/qt4/immodule/quiminputcontextplugin.pro.in Fri Sep 21 13:44:49 2007
@@ -3,17 +3,29 @@
######################################################################
TEMPLATE = lib
-INCLUDEPATH += @abs_top_builddir@ @abs_top_builddir@/uim
CONFIG += qt plugin thread @QT_CONFIG_OPTS@
QT += qt3support
-LIBS += -luim -luim-scm
-QMAKE_LIBDIR += @abs_top_builddir@/uim
-QMAKE_CFLAGS_DEBUG += @CFLAGS@
-QMAKE_CFLAGS_RELEASE += @CFLAGS@
-QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@
-QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@
+INCLUDEPATH += @abs_top_builddir@ @abs_top_builddir@/uim \
+ @abs_top_builddir@/replace
+QMAKE_LIBDIR += @abs_top_builddir@/uim @abs_top_builddir@/replace
+LIBS += -lreplace -luim -luim-scm
+QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
+QMAKE_CFLAGS_RELEASE += @CFLAGS@ @X_CFLAGS@
+QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@ @X_CFLAGS@
+QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
+
+
+# I don't know how to set a make variable in qmake project
+# file. So the @LIBTOOL@ is expanded as '@SH@ @top_builddir@/libtool' manually.
+# SHELL = @SH@
+# top_builddir = @top_builddir@
+#QMAKE_LINK_SHLIB_CMD = @LIBTOOL@ --tag=CXX $(AM_LIBTOOLFLAGS)
+QMAKE_LINK_SHLIB_CMD = @SH@ @top_builddir@/libtool --tag=CXX \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(LINK) \
+ $(CXXFLAGS) $(LDFLAGS) \
+ $(LFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) $(OBJCOMP)
# Input
HEADERS += qhelpermanager.h \
