Annotation of pkgsrc/inputmethod/Chinput/patches/patch-aa, revision 1.2

1.2     ! wiz         1: $NetBSD: patch-aa,v 1.1.1.1 2002/06/15 09:31:39 shell Exp $
1.1       shell       2: 
1.2     ! wiz         3: --- src/Makefile.orig  2000-07-09 10:46:45.000000000 +0000
1.1       shell       4: +++ src/Makefile
                      5: @@ -1,20 +1,16 @@
                      6:  
                      7: -CC = gcc
                      8:  
                      9:  # do you have imlib?
                     10:  #No, I don't have that strange library
                     11:  #IMLIB = 
                     12:  #LIBIMLIB =
                     13: -#Yes I have
                     14: -IMLIB = -DIMLIB
                     15: -LIBIMLIB = -lImlib
                     16:  
                     17:  #CFLAGS =  -Wall -g -DFOR_PILOT_COMPAT -O2 -fno-strength-reduce  -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE=500L -D_BSD_SOURCE -D_SVID_SOURCE   -DFUNCPROTO=15 -DNARROWPROTO
                     18: -CFLAGS =  -Wall -g -DFOR_PILOT_COMPAT -O2 -fno-strength-reduce
1.2     ! wiz        19: +CFLAGS +=  -Wall -DFOR_PILOT_COMPAT -O2 -fno-strength-reduce -Wno-implicit-function-declaration
1.1       shell      20:  
                     21:  INC = -I./include -I./IMdkit/include -I/usr/include -I/usr/X11R6/include   
                     22:  
                     23: -LIB = -L/usr/X11R6/lib -lXext -lX11 ./IMdkit/lib/libXimd.a -L/usr/lib/unicon2 -limmclient -Wl,-rpath=/usr/lib/unicon2 -limm_server -lpth -ldl
                     24: +LIB = -lXext -lX11 ./IMdkit/lib/libXimd.a -limmclient -limm_server -lpth
                     25:  
                     26:  SRC = chinput.c init.c server.c config.c color.c util.c convert.c IC.c XIM.c focus.c root.c overspot.c onspot.c offspot.c voice.c keyboard.c handw.c hwengine.c loop.c 
                     27:  
1.2     ! wiz        28: @@ -23,7 +19,7 @@ OBJ = $(SRC:.c=.o)
1.1       shell      29:  all: chinput
                     30:  
                     31:  chinput: IMdkit/lib/libXimd.a $(OBJ) 
                     32: -      g++ -o chinput $(OBJ) $(LIB) $(LIBIMLIB)
                     33: +      $(CC) -o chinput $(OBJ) $(LDFLAGS) $(LIB) $(LIBIMLIB)
                     34:  
                     35:  .c.o:
                     36:        $(CC) -c $(CFLAGS) $(IMLIB) $(INC) $<

CVSweb <webmaster@jp.NetBSD.org>