head	1.3;
access;
symbols
	RELEASE_8_1_0:1.2
	RELEASE_7_3_0:1.2
	RELEASE_8_0_0:1.2
	RELEASE_7_2_0:1.2
	RELEASE_7_1_0:1.1
	RELEASE_6_4_0:1.1;
locks; strict;
comment	@# @;


1.3
date	2010.08.31.15.13.42;	author garga;	state dead;
branches;
next	1.2;

1.2
date	2009.03.24.17.59.47;	author chinsan;	state Exp;
branches;
next	1.1;

1.1
date	2008.08.12.09.49.33;	author chinsan;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Remove chinese/gcin-devel, older than stable, broken and unmaintained
@
text
@--- qt4-im/Makefile.orig	2009-03-25 01:38:49.000000000 +0800
+++ qt4-im/Makefile	2009-03-25 01:41:30.000000000 +0800
@@@@ -1,29 +1,29 @@@@
 include ../config.mak
 QT=qt4
-QTIM=$(QT)/plugins/lib/inputmethods
-IMMODULES=$(libdir)/$(QTIM)
+QTIM=$(QT)/plugins/inputmethods
+IMMODULES=/usr/local/lib/$(QTIM)
 ifeq ($(LIB), lib64)
 	IMMODULES_LOCAL=/usr/$(LIB)/qt4/plugins/lib64/inputmethods
 else
-	IMMODULES_LOCAL=/usr/$(LIB)/$(QTIM)
+	IMMODULES_LOCAL=$(IMMODULES)
 endif
-QTINC=/usr/lib/$(QT)/include
+QTINC=/usr/local/include/$(QT)
 
-INCS=-I../im-client -I$(QTINC) -I/usr/include/X11 -I$(QTINC)/QtGui -I$(QTINC)/QtCore
+INCS=-I../im-client -I$(QTINC) -I/usr/local/include -I$(QTINC)/QtGui -I$(QTINC)/QtCore
 CXXFLAGS=$(OPTFLAGS) $(INCS) -Wall -D_REENTRANT -fPIC  -DQT4 -DQT_SHARED \
 -DQT_IMMODULE -DPIC
 OBJS= moc_gcin-qt.o gcin-qt.o im-gcin-qt.o gcin-imcontext-qt.o
 .SUFFIXES:	.c .cpp .a .so .E .h
-LDFLAGS=-L/usr/lib/$(QT)/$(LIB) -L/usr/X11R6/$(LIB) -L../im-client -lQtGui -lQtCore -lmng -ljpeg -lpng -lz \
+LDFLAGS=-L/usr/local/lib/$(QT) -L/usr/local/lib -L../im-client -lQtGui -lQtCore -lmng -ljpeg -lpng -lz \
 -lXrender -lXrandr  -lXft -lfontconfig -lgcin-im-client \
--lXext -lX11 -lm -lSM -lICE -ldl -lpthread
+-lXext -lX11 -lm -lSM -lICE -lpthread
 all:    im-gcin.so
 
 .cpp.E:
 	$(CXX) -E $(CFLAGS) $(INCS) $< > $@@
 
 moc_gcin-qt.cpp:	gcin-qt.h
-	/usr/lib/$(QT)/bin/moc $< -o moc_gcin-qt.cpp
+	/usr/local/bin/moc-qt4 $< -o moc_gcin-qt.cpp
 
 im-gcin.so: $(OBJS)
 	export LD_RUN_PATH=$(gcinlibdir) ;\
@


1.2
log
@- Update to 1.4.5.pre2
@
text
@@


1.1
log
@- Update to 1.4.3.pre5
- Add QT_IM_MODULE knob.
- Add some qt4 patch from Edward Lee.
- Add conflicts with chinese/gcin
@
text
@d1 2
a2 2
--- qt4-im/Makefile.orig	2008-08-04 23:55:57.000000000 +0800
+++ qt4-im/Makefile	2008-08-11 16:42:23.000000000 +0800
d11 1
a11 1
 	IMMODULES_LOCAL=/usr/lib/qt4/plugins/lib64/inputmethods
d13 1
a13 1
-	IMMODULES_LOCAL=/usr/lib/$(QTIM)
@

