--- cce-0.51.orig/configure.in +++ cce-0.51/configure.in @@ -382,7 +382,7 @@ esac]) if test "$enable_debug" = "yes"; then - AC_DEFINE(ENABLE_DEBUG, 1, [Define this to enable the debug]) + AC_DEFINE(DEBUG, 1, [Define this to enable the debug]) CFLAGS="$CFLAGS -g" CXXFLAGS="$CXXFLAGS -g" fi @@ -512,7 +512,10 @@ AC_SUBST(CCE_LIBS) AC_SUBST(CCE_DL_LIB) -AC_DEFINE(CONFIG_NAME, [ CCELIB "/cce.cfg" ], [CCE's configuration file]) +dnl AC_DEFINE(CONFIG_NAME, [ CCELIB "/cce.cfg" ], [CCE's configuration file]) +dnl Move Config File to etc/cce.cfg +AC_DEFINE_UNQUOTED(CONFIG_NAME, "$DESTDIR" "/etc/cce.cfg", [CCE's configuration file]) + AC_OUTPUT([Makefile src/Makefile src/font/Makefile src/input/Makefile src/kbmouse/Makefile --- cce-0.51.orig/doc/Makefile.am +++ cce-0.51/doc/Makefile.am @@ -2,12 +2,22 @@ man1_MANS = cce.1 cceconv.1 -install-data-local: - $(mkinstalldirs) $(mandir)/man1/ - $(INSTALL_DATA) $(srcdir)/cce.1 $(mandir)/man1/cce.1 - $(INSTALL_DATA) $(srcdir)/cceconv.1 $(mandir)/man1/cceconv.1 +CCEM = cce.1 +CCEM_SYMLINKS = ccegbk.1 cceb5.1 ccejis.1 cceksc.1 +install-data-local: + $(mkinstalldirs) $(DESTDIR)$(mandir)/man1/ + $(INSTALL_DATA) $(srcdir)/cceconv.1 $(DESTDIR)$(mandir)/man1/cceconv.1 + $(INSTALL_DATA) $(srcdir)/cce.1 $(DESTDIR)$(mandir)/man1/cce.1 + @list='$(CCEM_SYMLINKS)'; for p in $$list; do \ + if [ ! -f $(DESTDIR)$(mandir)/man1/$$p ] ; then \ + $(LN_S) -f $(CCEM) $(DESTDIR)$(mandir)/man1/$$p; \ + fi ; \ + done + uninstall-local: - -rm -f $(mandir)/man1/cce.1 - -rm -f $(mandir)/man1/cceconv.1 - + -rm -f $(DESTDIR)$(mandir)/man1/cce.1 + -rm -f $(DESTDIR)$(mandir)/man1/cceconv.1 + @list='$(CCEM_SYMLINKS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(mandir)/man1/$$p; \ + done --- cce-0.51.orig/include/config.h.in +++ cce-0.51/include/config.h.in @@ -22,7 +22,7 @@ #undef CONFIG_NAME /* Define this to enable the debug */ -#undef ENABLE_DEBUG +#undef DEBUG /* Define to 1 if you have the `basename' function. */ #undef HAVE_BASENAME --- cce-0.51.orig/include/defs.h +++ cce-0.51/include/defs.h @@ -38,6 +38,7 @@ #endif #include "osdep.h" +#include #undef FALSE #undef TRUE @@ -55,51 +56,90 @@ #define CCE_PATHNAME_MAX 255 +/* Fix deprecated cast-as-lvalue, which will cause warnings in GCC >= 3.3.4 */ static inline void bzero2(void *head, int n) -{ - while (n-- > 0) - *((unsigned char *)head)++ = (unsigned char)0x0; +{ + while (n-- > 0){ +/* *((unsigned char *)head)++ = (unsigned char)0x0; */ + unsigned char *temp = (unsigned char *)head; + *temp = (unsigned char)0x0; + head = temp; + head = (unsigned char *)head + 1; + } } static inline void wzero(void *head, int n) { n >>= 1; - while (n-- > 0) - *((unsigned short *)head)++ = (unsigned short)0x0; - + while (n-- > 0){ +/* *((unsigned short *)head)++ = (unsigned short)0x0; */ + unsigned short *temp = (unsigned short *)head; + *temp = (unsigned short)0x0; + head = temp; + head = (unsigned short *)head + 1; + } } static inline void lzero(void *head, int n) { n >>= 2; - while (n-- > 0) - *((unsigned int *)head)++ = (unsigned int)0x0; + while (n-- > 0){ +/* *((unsigned int *)head)++ = (unsigned int)0x0; */ + unsigned int *temp = (unsigned int *)head; + *temp = (unsigned int)0x0; + head = temp; + head = (unsigned int *)head + 1; + } } static inline void bmove(void *dst, void *src, int n) { - while(n-- > 0) - *((unsigned char *)dst)++ = *((unsigned char *)src)++; + while(n-- > 0){ +/* *((unsigned char *)dst)++ = *((unsigned char *)src)++; */ + unsigned char *temp = (unsigned char *)dst; + *temp = *(unsigned char *)src; + dst = temp; + dst = (unsigned char *)dst + 1; + src = (unsigned char *)src + 1; + } } static inline void brmove(void *dst, void *src, int n) { - while(n-- > 0) - *--((unsigned char *)dst) = *--((unsigned char *)src); + while(n-- > 0){ +/* *--((unsigned char *)dst) = *--((unsigned char *)src); */ + dst = (unsigned char *)dst - 1; + src = (unsigned char *)src - 1; + unsigned char *temp = (unsigned char *)dst; + *temp = *(unsigned char *)src; + dst = temp; + } } static inline void wmove(void *dst, void *src, int n) { n >>= 1; - while(n-- > 0) - *((unsigned short *)dst)++ = *((unsigned short *)src)++; + while(n-- > 0){ +/* *((unsigned short *)dst)++ = *((unsigned short *)src)++; */ + unsigned short *temp = (unsigned short *)dst; + *temp = *(unsigned short *)src; + dst = temp; + dst = (unsigned short *)dst + 1; + src = (unsigned short *)src + 1; + } } static inline void lmove(void *dst, void *src, int n) { n >>= 2; - while(n-- > 0) - *((unsigned int *)dst)++ = *((unsigned int *)src)++; + while(n-- > 0){ +/* *((unsigned int *)dst)++ = *((unsigned int *)src)++; */ + unsigned int *temp = (unsigned int *)dst; + *temp = *(unsigned int *)src; + dst = temp; + dst = (unsigned int *)dst + 1; + src = (unsigned int *)src + 1; + } } static inline void SafeFree(void **p) --- cce-0.51.orig/include/fb.h +++ cce-0.51/include/fb.h @@ -46,7 +46,7 @@ #if defined(linux) #define DEFAULT_FB "/dev/fb" -#define DEFAULT_FB_DEVFS "/dev/fb/0" +#define DEFAULT_FB_DEVFS "/dev/fb0" #elif defined(__FreeBSD__) extern int fbwidth, fbheight, fbdepth; --- cce-0.51.orig/include/mouse.h +++ cce-0.51/include/mouse.h @@ -72,5 +72,6 @@ extern void MouseHandleEvent(int fd); extern void MouseDetach(void); extern void MouseCleanup(void); +extern void HandleMouseSelection(void); #endif /* __CCE_MOUSE_H__ */ --- cce-0.51.orig/include/term.h +++ cce-0.51/include/term.h @@ -52,5 +52,6 @@ extern int VtNum; extern int GGIAvail, SDLAvail, UseGGIFirst, UseSDLFirst; extern int StartFromConsole; +extern int IsSDLAvailable(void); #endif /* __CCE_TERM_H__ */ --- cce-0.51.orig/include/font.h +++ cce-0.51/include/font.h @@ -96,6 +96,8 @@ int MmapFont(int encoding, FontRegs *fr); int MunmapFont(int encoding, FontRegs *fr); +int CodingByRegistry(char *reg); + extern u_char *GetX11FontBits(void *fr, int codepoint); /* return NULL for failure */ #if 0 --- cce-0.51.orig/src/Makefile.am +++ cce-0.51/src/Makefile.am @@ -5,9 +5,9 @@ cce_SOURCES = child.c errors.c main.c convert.c encfilter.c fileconv.c getcap.c # Order is also important, some *.a depends on other *.a -cce_LDADD = @CCE_EXTRALIBS@ @OSDEP_LIB@ \ - term/libterm.a kbmouse/libkbmouse.a input/libinput.a display/libdisplay.a \ - font/libfont.a osdep/libosdep.a +cce_LDADD = term/libterm.a kbmouse/libkbmouse.a input/libinput.a display/libdisplay.a \ + font/libfont.a osdep/libosdep.a \ + @CCE_EXTRALIBS@ @OSDEP_LIB@ SUBDIRS = input font display osdep kbmouse term @@ -54,16 +54,16 @@ # make it suid-root @list='$(CCE_SYMLINKS)'; for p in $$list; do \ if [ ! -f $(DESTDIR)$(bindir)/$$p ] ; then \ - $(LN_S) -f $(DESTDIR)$(bindir)/$(CCE) $(DESTDIR)$(bindir)/$$p ; \ + $(LN_S) -f $(CCE) $(DESTDIR)$(bindir)/$$p ; \ fi ; \ done install-data-local: - $(mkinstalldirs) $(CCE_SHARE_DIR)/cce - $(INSTALL_DATA) $(srcdir)/cce.cfg $(CCE_SHARE_DIR)/cce/cce.cfg + $(mkinstalldirs) $(DESTDIR)/etc + $(INSTALL_DATA) $(srcdir)/cce.cfg $(DESTDIR)/etc/cce.cfg uninstall-local: - -rm -f $(CCE_SHARE_DIR)/cce/cce.cfg + -rm -f $(DESTDIR)/etc/cce.cfg @list='$(CCE_SYMLINKS)'; for p in $$list; do \ rm -f $(DESTDIR)$(bindir)/$$p; \ done --- cce-0.51.orig/src/child.c +++ cce-0.51/src/child.c @@ -41,6 +41,7 @@ #include "vc.h" #include "term.h" #include "font.h" +#include "errors.h" #ifdef HAVE_SYS_WAIT_H #include --- cce-0.51.orig/src/main.c +++ cce-0.51/src/main.c @@ -41,6 +41,7 @@ #include #include #include +#include #ifdef SUPPORT_FREETYPE_FONT #include #endif --- cce-0.51.orig/src/convert.c +++ cce-0.51/src/convert.c @@ -34,9 +34,10 @@ #include #include -#include -#include -#include +#include "defs.h" +#include "convert.h" +#include "errors.h" + #ifdef HAVE_SYS_MMAN_H #include @@ -203,7 +204,7 @@ memcpy( &ConvertTableSize, Header->ConvertTableSize, sizeof(ConvertTableSize)); #ifdef DEBUG - message("Mmapped CCE conversion table %s size %d at address %p\r\n", + fprintf(stderr, "Mmapped CCE conversion table %s size %d at address %p\r\n", filename, size, p); #endif @@ -218,7 +219,7 @@ { #ifdef DEBUG - message("Munmapped CCE conversion table size %d at address %p\r\n", + fprintf(stderr, "Munmapped CCE conversion table size %d at address %p\r\n", Header->size, Header); #endif --- cce-0.51.orig/src/encfilter.c +++ cce-0.51/src/encfilter.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "config.h" #include "errors.h" --- cce-0.51.orig/src/kbmouse/gii.c +++ cce-0.51/src/kbmouse/gii.c @@ -48,7 +48,7 @@ static int GIIProcessSpecialKeys(uint32 sym, int tty_fd) { - char buf[16]; + /* char buf[16]; */ switch (sym) { --- cce-0.51.orig/src/kbmouse/sdlinput.c +++ cce-0.51/src/kbmouse/sdlinput.c @@ -17,7 +17,7 @@ static int SDLProcessSpecialKeys(SDLKey sym, int tty_fd) { - char buf[16]; +/* char buf[16]; */ switch (sym) { @@ -161,7 +161,7 @@ static void SDLProcessMouseEvents(SDL_Event *ev, int tty_fd) { u_char btn; - static int dx, dy; + /* static int dx, dy; */ switch(ev->type) { --- cce-0.51.orig/src/term/vc.c +++ cce-0.51/src/term/vc.c @@ -36,6 +36,7 @@ #include #include #include +#include #include "defs.h" #include "errors.h" @@ -79,12 +80,17 @@ static char tmpFileName[CCE_PATHNAME_MAX]; +/* Fix deprecated cast-as-lvalue, which will cause warnings in GCC >= 3.3.4 */ static inline void blatch(void *head, int n) { while (n-- > 0) { - (*(unsigned char *)head) &= (unsigned char)0x7F; - ((unsigned char *)head)++; +/* (*(unsigned char *)head) &= (unsigned char)0x7F; + ((unsigned char *)head)++; */ + unsigned char *temp = (unsigned char *)head; + *temp &= (unsigned char)0x7F; + head = temp; + head = (unsigned char *)head + 1; } } @@ -93,8 +99,12 @@ n >>= 2; /* convert into 32 bits */ while (n-- > 0) { - (*(unsigned int *)head) &= (unsigned long)0x7F7F7F7F; - ((unsigned int *)head)++; +/* (*(unsigned int *)head) &= (unsigned long)0x7F7F7F7F; + ((unsigned int *)head)++; */ + unsigned int *temp = (unsigned int *)head; + *temp &= (unsigned long)0x7F7F7F7F; + head = temp; + head = (unsigned int *)head + 1; } } @@ -427,7 +437,7 @@ void TextPaste(ConInfo *con) { - u_char ch; + /* u_char ch; */ int fd, i; size_t nRead; @@ -897,7 +907,7 @@ static int ConfigDisplay(const char *confstr) { - int fd = -1; +/* int fd = -1; */ if (strlen(confstr) < 10) /* buffer overflow? */ { --- cce-0.51.orig/src/term/term.c +++ cce-0.51/src/term/term.c @@ -47,6 +47,7 @@ #include "key.h" #include "vga.h" #include "hzinput.h" +#include "term.h" #ifdef HAVE_PWD_H #include @@ -209,7 +210,7 @@ static void ConsoleHandler(void) { static u_char buff[BUFSIZ]; - int remain_bytes; +/* int remain_bytes; */ fd_set readFds; int j,k, nRead; #ifdef HAVE_SELECT @@ -402,8 +403,8 @@ static void GetConsoleVtNum(void) { - int cfd, mode; + int cfd; #if defined(linux) || defined(__Lynx__) struct vt_stat vts; #endif --- cce-0.51.orig/src/font/font.c +++ cce-0.51/src/font/font.c @@ -349,7 +349,7 @@ { fr->fi = (FontInfo *)0x0; /* make it non -1 */ #ifdef DEBUG - message("Attach %dx%d X11 font for encoding %d\r\n", fr->width, fr->height, encoding); + fprintf(stderr, "Attach %dx%d X11 font for encoding %d\r\n", fr->width, fr->height, encoding); #endif } else @@ -368,7 +368,7 @@ fr->stat = FR_ATTACH; #ifdef DEBUG - message("Mmapped %dx%d font at address %p: %d Bytes\r\n", + fprintf(stderr, "Mmapped %dx%d font at address %p: %d Bytes\r\n", fr->width, fr->height, fr->fi, fr->size ); #endif } @@ -388,7 +388,7 @@ if (fr->stat == FR_FREETYPEFONT) { #ifdef DEBUG - message("Detaching Freetype Font %s.\r\n", TTFontPathName); + fprintf(stderr, "Detaching Freetype Font %s.\r\n", TTFontPathName); #endif } else @@ -397,7 +397,7 @@ if (fr->stat == FR_X11FONT) { #ifdef DEBUG - message("Detach %dx%d X11 font for encoding %d\r\n", + fprintf(stderr, "Detach %dx%d X11 font for encoding %d\r\n", fr->width, fr->height, encoding); #endif } @@ -407,7 +407,7 @@ if (munmap(fr->fi, sizeof(FontInfo) + fr->size)) return -1; /* failed to unmapped? */ #ifdef DEBUG - message("Munmapped %dx%d font at address %p: %d Bytes\r\n", + fprintf(stderr, "Munmapped %dx%d font at address %p: %d Bytes\r\n", fr->width, fr->height, fr->fi, fr->size ); #endif } --- cce-0.51.orig/src/font/ftfont.c +++ cce-0.51/src/font/ftfont.c @@ -33,6 +33,7 @@ #include "defs.h" #include "vc.h" +#include "errors.h" #ifdef SUPPORT_FREETYPE_FONT --- cce-0.51.orig/src/font/xfont.c +++ cce-0.51/src/font/xfont.c @@ -42,6 +42,7 @@ #include #include #include +#include #include "fontxlfd.h" #include "fontmisc.h" @@ -53,6 +54,7 @@ #include "defs.h" #include "font.h" +#include "errors.h" #ifdef HAVE_SYS_MMAN_H #include @@ -106,10 +108,10 @@ FontFilePtr input = NULL; readfontfunc *readfont = NULL; - FontInfo fi; +/* FontInfo fi; */ char *registry; FontRegs *FReg; - int n, encoding, width, height, fw; + int n, encoding, width, height; if (!pathName || pathName[0] == '\0') return -1; --- cce-0.51.orig/src/display/vga.c +++ cce-0.51/src/display/vga.c @@ -39,6 +39,7 @@ #include #include #include +#include #include "getcap.h" #include "defs.h" --- cce-0.51.orig/src/display/vgaop.c +++ cce-0.51/src/display/vgaop.c @@ -47,6 +47,7 @@ #include #include #include +#include "errors.h" #if defined(SUPPORT_VGA) || defined(SUPPORT_FRAMEBUF) @@ -232,7 +233,7 @@ #endif - if (gramMem == (char *)MAP_FAILED) + if (gramMem == (unsigned char *)MAP_FAILED) { Perror("mmap graphics memory failed"); return FAILURE; --- cce-0.51.orig/src/display/fb.c +++ cce-0.51/src/display/fb.c @@ -31,6 +31,7 @@ #include #include #include +#include #include "defs.h" #include "errors.h" @@ -290,9 +291,9 @@ void FBDrawFreeTypeChar(int xpos, int ypos, FT_GlyphSlot glyph, int fc, int bc, int width, int height) { int i,j, k; - u_char bits, *code; + u_char bits = 0, *code; u_char *dest, *line; - u_int pix; + u_int pix = 0; int top, left, row, col, pitch; u_short red,green, blue; @@ -362,6 +363,7 @@ k++; } +/* Fix deprecated cast-as-lvalue, which will cause warnings in GCC >= 3.3.4 */ switch(dispInfo.bpp) { case 8: @@ -372,17 +374,29 @@ break; case 15: case 16: - *((u_short *)dest)++ = (u_short)(pix); + { +/* *((u_short *)dest)++ = (u_short)(pix); */ + u_short *temp = (u_short *)dest; + *temp = (u_short)(pix); + dest = (u_char *)temp; + dest = (u_char *)((u_short *)dest + 1); break; + } case 24: *dest++ = (u_char)(pix); pix >>= 8; *dest++ = (u_char)(pix); pix >>= 8; *dest++ = (u_char)(pix); break; case 32: - *((u_int *)dest)++ = (u_int)(pix); + { +/* *((u_int *)dest)++ = (u_int)(pix); */ + u_int *temp = (u_int *)dest; + *temp = (u_int)(pix); + dest = (u_char *)temp; + dest = (u_char *)((u_int *)dest + 1); break; } + } } line += dispInfo.glineByte; @@ -398,7 +412,7 @@ static int InitLinuxFB(void) { - int fd, res; + int fd; struct fb_fix_screeninfo fix; struct fb_var_screeninfo var; --- cce-0.51.orig/src/display/lrmi.c +++ cce-0.51/src/display/lrmi.c @@ -89,44 +89,44 @@ struct mem_block blocks[REAL_MEM_BLOCKS]; } mem_info = { 0 }; -static int -real_mem_init(void) -{ - void *m; - int fd_zero; - - if (mem_info.ready) - return 1; - -#if defined(__OpenBSD__) - fd_zero = open("/dev/xf86", O_RDWR); -#else - fd_zero = open("/dev/zero", O_RDONLY); -#endif - if (fd_zero == -1) { - perror("open /dev/zero"); - return 0; - } +/* static int */ +/* real_mem_init(void) */ +/* { */ +/* void *m; */ +/* int fd_zero; */ + +/* if (mem_info.ready) */ +/* return 1; */ + +/* #if defined(__OpenBSD__) */ +/* fd_zero = open("/dev/xf86", O_RDWR); */ +/* #else */ +/* fd_zero = open("/dev/zero", O_RDONLY); */ +/* #endif */ +/* if (fd_zero == -1) { */ +/* perror("open /dev/zero"); */ +/* return 0; */ +/* } */ + +/* m = mmap((void *)REAL_MEM_BASE, REAL_MEM_SIZE, */ +/* PROT_READ | PROT_WRITE | PROT_EXEC, */ +/* MAP_FIXED | MAP_PRIVATE, fd_zero, 0); */ + +/* if (m == (void *)-1) { */ +/* perror("mmap /dev/zero"); */ +/* close(fd_zero); */ +/* return 0; */ +/* } */ + +/* close(fd_zero); */ + +/* mem_info.ready = 1; */ +/* mem_info.count = 1; */ +/* mem_info.blocks[0].size = REAL_MEM_SIZE; */ +/* mem_info.blocks[0].free = 1; */ - m = mmap((void *)REAL_MEM_BASE, REAL_MEM_SIZE, - PROT_READ | PROT_WRITE | PROT_EXEC, - MAP_FIXED | MAP_PRIVATE, fd_zero, 0); - - if (m == (void *)-1) { - perror("mmap /dev/zero"); - close(fd_zero); - return 0; - } - - close(fd_zero); - - mem_info.ready = 1; - mem_info.count = 1; - mem_info.blocks[0].size = REAL_MEM_SIZE; - mem_info.blocks[0].free = 1; - - return 1; -} +/* return 1; */ +/* } */ static void real_mem_deinit(void) @@ -722,7 +722,7 @@ static void debug_info(int vret) { -#ifdef LRMI_DEBUG +#ifdef DEBUG int i; unsigned char *p; @@ -885,7 +885,7 @@ run_vm86(void) { if (context.old_sighandler) { -#ifdef LRMI_DEBUG +#ifdef DEBUG fprintf(stderr, "run_vm86: callback already installed\n"); #endif return (0); @@ -899,7 +899,7 @@ if (context.old_sighandler == (void *)-1) { context.old_sighandler = NULL; -#ifdef LRMI_DEBUG +#ifdef DEBUG fprintf(stderr, "run_vm86: cannot install callback\n"); #endif return (0); @@ -974,7 +974,7 @@ off = get_int_off(i); if (seg < 0xa000 || (seg << 4) + off >= 0x100000) { -#ifdef LRMI_DEBUG +#ifdef DEBUG fprintf(stderr, "Int 0x%x is not in rom (%04x:%04x)\n", i, seg, off); #endif return 0; --- cce-0.51.orig/src/display/vidmode.c +++ cce-0.51/src/display/vidmode.c @@ -226,7 +226,7 @@ { FT_GlyphSlot glyph; - int err = FreetypeGetGlyph(encoding, ch1, ch2, &glyph); /* 0 for success */ + FreetypeGetGlyph(encoding, ch1, ch2, &glyph); /* 0 for success */ switch(dispInfo.type) { @@ -271,9 +271,9 @@ if (reg->stat == FR_X11FONT) /* bdf or pcf font */ { if (ch2 == 0) /* single byte */ - code = GetX11BitmapFontBits(reg->bitmap, ch1); + code = GetX11FontBits(reg->bitmap, ch1); else - code = GetX11BitmapFontBits(reg->bitmap, (ch1 << 8) | ch2); + code = GetX11FontBits(reg->bitmap, (ch1 << 8) | ch2); } else /* mmaped */ #endif --- cce-0.51.orig/src/display/ggi.c +++ cce-0.51/src/display/ggi.c @@ -273,9 +273,9 @@ void GGIDrawFreeTypeChar(int xpos, int ypos, FT_GlyphSlot glyph, int fc, int bc, int width, int height) { int i,j,k; - u_char bits, *code; + u_char bits = 0, *code; uint8 *dest = (uint8 *)ggiPixBuf; - ggi_pixel pix; + ggi_pixel pix = 0; int top, left, row, col, pitch; if (glyph == NULL) @@ -325,23 +325,36 @@ k++; } +/* Fix deprecated cast-as-lvalue, which will cause warnings in GCC >= 3.3.4 */ switch(ggiPixBytes) { case 1: *dest++ = (uint8)(pix); /* palette-based, no anti-alias */ break; case 2: - *((uint16 *)dest)++ = (uint16)(pix); + { +/* *((uint16 *)dest)++ = (uint16)(pix); */ + uint16 *temp = (uint16 *)dest; + *temp = (uint16)(pix); + dest = (uint8 *)temp; + dest = (uint8 *)((uint16 *)dest + 1); break; + } case 3: *dest++ = (uint8)(pix); pix >>= 8; *dest++ = (uint8)(pix); pix >>= 8; *dest++ = (uint8)(pix); break; case 4: - *((uint32 *)dest)++ = (uint32)(pix); + { +/* *((uint32 *)dest)++ = (uint32)(pix); */ + uint32 *temp = (uint32 *)dest; + *temp = (uint32)(pix); + dest = (uint8 *)temp; + dest = (uint8 *)((uint32 *)dest + 1); break; } + } } /* for j */ @@ -357,7 +370,7 @@ static inline void GGIGenPixelBuf(u_char *code, int fc, int bc, int width, int height) { int i,j; - u_char bits; + u_char bits = 0; uint8 *dest = (uint8 *)ggiPixBuf; ggi_pixel pix; @@ -367,23 +380,37 @@ { if ((j & 0x7) == 0) bits = *code++; /* j % 8 == 0 */ pix = ggiPix[ bits & (0x80 >> (j & 0x7)) ? fc : bc ]; + +/* Fix deprecated cast-as-lvalue, which will cause warnings in GCC >= 3.3.4 */ switch(ggiPixBytes) { case 1: *dest++ = (uint8)(pix); break; case 2: - *((uint16 *)dest)++ = (uint16)(pix); + { +/* *((uint16 *)dest)++ = (uint16)(pix); */ + uint16 *temp = (uint16 *)dest; + *temp = (uint16)(pix); + dest = (uint8 *)temp; + dest = (uint8 *)((uint16 *)dest + 1); break; + } case 3: *dest++ = (uint8)(pix); pix >>= 8; *dest++ = (uint8)(pix); pix >>= 8; *dest++ = (uint8)(pix); break; case 4: - *((uint32 *)dest)++ = (uint32)(pix); + { +/* *((uint32 *)dest)++ = (uint32)(pix); */ + uint32 *temp = (uint32 *)dest; + *temp = (uint32)(pix); + dest = (uint8 *)temp; + dest = (uint8 *)((uint32 *)dest + 1); break; } + } } } } --- cce-0.51.orig/src/display/sdl.c +++ cce-0.51/src/display/sdl.c @@ -270,7 +270,7 @@ int SDLInit(void) { - int res; + /* int res; */ Uint32 flags = SDL_HWSURFACE | SDL_ANYFORMAT; if (SDLAvail && dispInfo.type != TYPE_SDL) /* haven't test it yet, do it now */ @@ -371,7 +371,7 @@ void SDLOpDraw(int xpos, int ypos, u_char *code, int fc, int bc, int width, int height) { int i,j; - u_char bits; + u_char bits = 0; Uint8 *dest, *line; Uint32 pix; @@ -386,23 +386,37 @@ { if ((j & 0x7) == 0) bits = *code++; /* j % 8 == 0 */ pix = sdlPix[ bits & (0x80 >> (j & 0x7)) ? fc : bc ]; + +/* Fix deprecated cast-as-lvalue, which will cause warnings in GCC >= 3.3.4 */ switch(sdlPixBytes) { case 1: *dest++ = (Uint8)(pix); break; case 2: - *((Uint16 *)dest)++ = (Uint16)(pix); + { +/* *((Uint16 *)dest)++ = (Uint16)(pix); */ + Uint16 *temp = (Uint16 *)dest; + *temp = (Uint16)(pix); + dest = (Uint8 *)temp; + dest = (Uint8 *)((Uint16 *)dest + 1); break; + } case 3: *dest++ = (Uint8)(pix); pix >>= 8; *dest++ = (Uint8)(pix); pix >>= 8; *dest++ = (Uint8)(pix); break; case 4: - *((Uint32 *)dest)++ = (Uint32)(pix); + { +/* *((Uint32 *)dest)++ = (Uint32)(pix); */ + Uint32 *temp = (Uint32 *)dest; + *temp = (Uint32)(pix); + dest = (Uint8 *)temp; + dest = (Uint8 *)((Uint32 *)dest + 1); break; } + } } line += sdlScreen->pitch; } @@ -460,7 +474,7 @@ void SDLDrawFreeTypeChar(int xpos, int ypos, FT_GlyphSlot glyph, int fc, int bc, int width, int height) { int i,j, k; - u_char bits, *code; + u_char bits = 0, *code; Uint8 *dest, *line; Uint32 pix; int top, left, row, col, pitch; @@ -516,23 +530,36 @@ k++; } +/* Fix deprecated cast-as-lvalue, which will cause warnings in GCC >= 3.3.4 */ switch(sdlPixBytes) { case 1: *dest++ = (Uint8)(pix); break; case 2: - *((Uint16 *)dest)++ = (Uint16)(pix); + { +/* *((Uint16 *)dest)++ = (Uint16)(pix); */ + Uint16 *temp = (Uint16 *)dest; + *temp = (Uint16)(pix); + dest = (Uint8 *)temp; + dest = (Uint8 *)((Uint16 *)dest + 1); break; + } case 3: *dest++ = (Uint8)(pix); pix >>= 8; *dest++ = (Uint8)(pix); pix >>= 8; *dest++ = (Uint8)(pix); break; case 4: - *((Uint32 *)dest)++ = (Uint32)(pix); + { +/* *((Uint32 *)dest)++ = (Uint32)(pix); */ + Uint32 *temp = (Uint32 *)dest; + *temp = (Uint32)(pix); + dest = (Uint8 *)temp; + dest = (Uint8 *)((Uint32 *)dest + 1); break; } + } } line += sdlScreen->pitch; --- cce-0.51.orig/src/input/pinyin.c +++ cce-0.51/src/input/pinyin.c @@ -77,11 +77,11 @@ #include #endif -static int SaveUsrPhrase(PinyinModule *inmd, char *pathname); +/* static int SaveUsrPhrase(PinyinModule *inmd, char *pathname); */ static int LoadUsrPhrase(PinyinModule *inmd, char *pathname); static int LoadSysPhrase(PinyinModule *inmd, char *pathname); static void SortCandidates(PinyinModule *inmd); -static int AdjustPhraseFreq(PinyinModule *inmd); +/* static int AdjustPhraseFreq(PinyinModule *inmd); */ void RefreshPinyinInput(void); void ChangePinyinKeyboardMap(int offset); @@ -200,77 +200,77 @@ } -static int SaveUsrPhrase(PinyinModule *inmd, char *pathname) -{ - int i,fsize = 0, tmpcount; - FILE *out; - UsrPhrase *p0,*q0; - u_short total; - u_short len,count; - - if ((out = fopen(pathname, W_CNTRL)) == NULL) - { - warn("Failed to save user phrase, no enough memory\r\n"); - return -1; - } - - for (i=1; iusrph[i]; - if (p0 == NULL) - { - fwrite(&total,sizeof(total),1,out); - continue; - } - - total++; - for (p0 = p0->next; p0 != NULL; p0 = p0->next) - { - len = p0->len; - for (q0 = inmd->usrph[i]; q0 != p0; q0 = q0->next) - if (q0->len == len && !memcmp(p0->key, q0->key, len+1)) break; - if (p0 == q0) total++; - } - - fwrite(&total,sizeof(total),1,out); - - for (p0 = inmd->usrph[i]; p0 != NULL; p0 = p0->next) - { - if (p0->count == 0) continue; - - tmpcount = p0->count; - len = p0->len; - for(q0 = p0->next; q0 != NULL; q0 = q0->next) - if (q0->len == len && !memcmp(q0->key,p0->key,PYKEYLEN(len))) - tmpcount += q0->count; - - if (tmpcount >= 65535 /* 255 */) - fatal("More than 65535 phrases use the same pinyin!"); - else count = (u_short)tmpcount; +/* static int SaveUsrPhrase(PinyinModule *inmd, char *pathname) */ +/* { */ +/* int i,fsize = 0, tmpcount; */ +/* FILE *out; */ +/* UsrPhrase *p0,*q0; */ +/* u_short total; */ +/* u_short len,count; */ + +/* if ((out = fopen(pathname, W_CNTRL)) == NULL) */ +/* { */ +/* warn("Failed to save user phrase, no enough memory\r\n"); */ +/* return -1; */ +/* } */ + +/* for (i=1; iusrph[i]; */ +/* if (p0 == NULL) */ +/* { */ +/* fwrite(&total,sizeof(total),1,out); */ +/* continue; */ +/* } */ + +/* total++; */ +/* for (p0 = p0->next; p0 != NULL; p0 = p0->next) */ +/* { */ +/* len = p0->len; */ +/* for (q0 = inmd->usrph[i]; q0 != p0; q0 = q0->next) */ +/* if (q0->len == len && !memcmp(p0->key, q0->key, len+1)) break; */ +/* if (p0 == q0) total++; */ +/* } */ + +/* fwrite(&total,sizeof(total),1,out); */ + +/* for (p0 = inmd->usrph[i]; p0 != NULL; p0 = p0->next) */ +/* { */ +/* if (p0->count == 0) continue; */ + +/* tmpcount = p0->count; */ +/* len = p0->len; */ +/* for(q0 = p0->next; q0 != NULL; q0 = q0->next) */ +/* if (q0->len == len && !memcmp(q0->key,p0->key,PYKEYLEN(len))) */ +/* tmpcount += q0->count; */ + +/* if (tmpcount >= 65535 /\* 255 *\/) */ +/* fatal("More than 65535 phrases use the same pinyin!"); */ +/* else count = (u_short)tmpcount; */ - fsize += SizeOfPhrase(len,count); +/* fsize += SizeOfPhrase(len,count); */ - fwrite(&len,sizeof(len),1,out); - fwrite(&count,sizeof(count),1,out); - fwrite(p0->key, PYKEYLEN(len),1,out); - - for(q0 = p0; q0 != NULL; q0 = q0->next) - if (q0->len == len && !memcmp(q0->key,p0->key,PYKEYLEN(len))) - { - fwrite(q0->key+PYKEYLEN(len),q0->count*LenOfPhrase(len),1,out); - q0->count = 0; - } - } - } +/* fwrite(&len,sizeof(len),1,out); */ +/* fwrite(&count,sizeof(count),1,out); */ +/* fwrite(p0->key, PYKEYLEN(len),1,out); */ + +/* for(q0 = p0; q0 != NULL; q0 = q0->next) */ +/* if (q0->len == len && !memcmp(q0->key,p0->key,PYKEYLEN(len))) */ +/* { */ +/* fwrite(q0->key+PYKEYLEN(len),q0->count*LenOfPhrase(len),1,out); */ +/* q0->count = 0; */ +/* } */ +/* } */ +/* } */ - fwrite(&fsize,sizeof(fsize),1,out); - fclose(out); +/* fwrite(&fsize,sizeof(fsize),1,out); */ +/* fclose(out); */ - return 0; -} +/* return 0; */ +/* } */ #if 0 /* not necessary since we share with R/W frequencies is updated */ static int SaveSysPhrase(PinyinModule *inmd, char *pathname, int remove) @@ -443,46 +443,46 @@ } } -static int AdjustPhraseFreq(PinyinModule *inmd) -{ - UsrPhrase *uph; - SysPhrase *sysph; - Phrase *sph; - int i,j,k,index; - PYFREQTYPE *pFreq; - char *p; +/* static int AdjustPhraseFreq(PinyinModule *inmd) */ +/* { */ +/* UsrPhrase *uph; */ +/* SysPhrase *sysph; */ +/* Phrase *sph; */ +/* int i,j,k,index; */ +/* PYFREQTYPE *pFreq; */ +/* char *p; */ + +/* for(i = 1; i < MAX_PY_NUM; i++) */ +/* { */ +/* for(uph = inmd->usrph[i]; uph != NULL; uph = uph->next) */ +/* { */ +/* for(k =0; k < uph->count; k++) */ +/* { */ +/* index = FreqOffsetOfPhrase(uph->len, k); */ +/* pFreq = (PYFREQTYPE *)&(uph->key[index]); */ +/* if (*pFreq > 25) */ +/* *pFreq = 25 + (*pFreq-25)/10; */ +/* } */ +/* } */ + +/* sysph = inmd->sysph[i]; */ +/* p = (char*)sysph->phrase; /\* count = total pinyin number *\/ */ +/* for(j = 0; j < sysph->count; j++) */ +/* { */ +/* sph = (Phrase *)p; */ +/* for(k = 0; k < sph->count; k++) */ +/* { */ +/* index = FreqOffsetOfPhrase(sph->len, k); */ +/* pFreq = (PYFREQTYPE *)&(sph->key[index]); */ +/* if (*pFreq > 25) */ +/* *pFreq = 25 + (*pFreq - 25)/10; */ +/* } */ +/* p += SizeOfPhrase(sph->len,sph->count); */ +/* } */ +/* } */ - for(i = 1; i < MAX_PY_NUM; i++) - { - for(uph = inmd->usrph[i]; uph != NULL; uph = uph->next) - { - for(k =0; k < uph->count; k++) - { - index = FreqOffsetOfPhrase(uph->len, k); - pFreq = (PYFREQTYPE *)&(uph->key[index]); - if (*pFreq > 25) - *pFreq = 25 + (*pFreq-25)/10; - } - } - - sysph = inmd->sysph[i]; - p = (char*)sysph->phrase; /* count = total pinyin number */ - for(j = 0; j < sysph->count; j++) - { - sph = (Phrase *)p; - for(k = 0; k < sph->count; k++) - { - index = FreqOffsetOfPhrase(sph->len, k); - pFreq = (PYFREQTYPE *)&(sph->key[index]); - if (*pFreq > 25) - *pFreq = 25 + (*pFreq - 25)/10; - } - p += SizeOfPhrase(sph->len,sph->count); - } - } - - return SUCCESS; -} +/* return SUCCESS; */ +/* } */ static int QueryPhrase(PinyinModule *inmd, u_char *key, int len, int PYNum) { --- cce-0.51.orig/fonts/Makefile.am +++ cce-0.51/fonts/Makefile.am @@ -1,7 +1,7 @@ CCE_BDF2BIN := ./bdf2bin$(EXEEXT) -CCE_SHARE_DIR = $(DESTDIR)$(datadir) +CCE_SHARE_DIR = $(datadir) INCLUDES = -I$(top_srcdir)/include --- cce-0.51.orig/inputs/utils/Makefile.am +++ cce-0.51/inputs/utils/Makefile.am @@ -1,5 +1,5 @@ -CCE_SHARE_DIR = $(DESTDIR)$(datadir) +CCE_SHARE_DIR = $(datadir) cin2tab_bindir = $(CCE_SHARE_DIR)/cce cin2tab_bin_PROGRAMS = cin2tab --- cce-0.51.orig/inputs/utils/table_cin.c +++ cce-0.51/inputs/utils/table_cin.c @@ -487,9 +487,9 @@ { #ifdef DEBUG fprintf(stderr, "Eliminated: CurIndex=%d key1=%08X key2=%08X char=%c%c%c%c ch=%08X\n", - ItemTable[i].occur_seq, ItemTable[i].key1, ItemTable[i].key2, ItemTable[i].phrase[0], ItemTable[i].phrase[1], - ItemTable[i].phrase[2] ? ItemTable[i].phrase[2] : ' ', ItemTable[i].phrase[3] ? ItemTable[i].phrase[3] : ' ', - ItemTable[i].ch); + ItemTable[i].occur_seq, ItemTable[i].key1, ItemTable[i].key2, ItemTable[i].phr.phrase[0], ItemTable[i].phr.phrase[1], + ItemTable[i].phr.phrase[2] ? ItemTable[i].phr.phrase[2] : ' ', ItemTable[i].phr.phrase[3] ? ItemTable[i].phr.phrase[3] : ' ', + ItemTable[i].phr.ch); #endif } } --- cce-0.51.orig/inputs/all/Makefile.am +++ cce-0.51/inputs/all/Makefile.am @@ -1,5 +1,5 @@ -CCE_SHARE_DIR = $(DESTDIR)$(datadir) +CCE_SHARE_DIR = $(datadir) CIN2TAB = ../utils/cin2tab$(EXEEXT) INPUT_TABS := intcode.tab zhiyin.tab zhiyin.tab.usr ciyin.tab ciyingb.tab @@ -9,9 +9,9 @@ # some input method tables need the encoding conversion (table may not be there yet) .check_convtab: - @if [ ! -f $(CCE_SHARE_DIR)/cce/cceconv.tab ] ; then \ + @if [ ! -f $(DESTDIR)$(CCE_SHARE_DIR)/cce/cceconv.tab ] ; then \ $(NORMAL_INSTALL) ; \ - $(mkinstalldirs) $(CCE_SHARE_DIR)/cce ; \ + $(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce ; \ $(INSTALL_DATA) $(srcdir)/../utils/cceconv.tab $(CCE_SHARE_DIR)/cce/cceconv.tab ; \ fi @@ -47,10 +47,10 @@ -rm -f *.tab *.tab.usr allinstall: $(CIN2TAB) - $(mkinstalldirs) $(CCE_SHARE_DIR)/cce - $(mkinstalldirs) $(CCE_SHARE_DIR)/cce/all - $(INSTALL_DATA) $(srcdir)/*.tab $(CCE_SHARE_DIR)/cce/all - $(INSTALL_DATA) $(srcdir)/*.tab.usr $(CCE_SHARE_DIR)/cce/all - $(INSTALL_DATA) $(srcdir)/shuangpin.map $(CCE_SHARE_DIR)/cce/all + $(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce + $(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce/all + $(INSTALL_DATA) $(srcdir)/*.tab $(DESTDIR)$(CCE_SHARE_DIR)/cce/all + $(INSTALL_DATA) $(srcdir)/*.tab.usr $(DESTDIR)$(CCE_SHARE_DIR)/cce/all + $(INSTALL_DATA) $(srcdir)/shuangpin.map $(DESTDIR)$(CCE_SHARE_DIR)/cce/all --- cce-0.51.orig/inputs/gb/Makefile.am +++ cce-0.51/inputs/gb/Makefile.am @@ -1,7 +1,7 @@ CIN2TAB = ../utils/cin2tab$(EXEEXT) -CCE_SHARE_DIR = $(DESTDIR)$(datadir) +CCE_SHARE_DIR = $(datadir) GBLXSRC = ../all/sysphrase_gbk.py GBLX = gb.lx @@ -32,10 +32,10 @@ -rm -f core core.* *.lx *.tab allinstall: $(CIN2TAB) $(GBLX) - $(mkinstalldirs) $(CCE_SHARE_DIR)/cce - $(mkinstalldirs) $(CCE_SHARE_DIR)/cce/gb - $(INSTALL_DATA) $(srcdir)/*.tab $(CCE_SHARE_DIR)/cce/gb - $(INSTALL_DATA) $(srcdir)/*.lx $(CCE_SHARE_DIR)/cce/gb + $(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce + $(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce/gb + $(INSTALL_DATA) $(srcdir)/*.tab $(DESTDIR)$(CCE_SHARE_DIR)/cce/gb + $(INSTALL_DATA) $(srcdir)/*.lx $(DESTDIR)$(CCE_SHARE_DIR)/cce/gb gb.lx: $(CIN2TAB) $(GBLXSRC) @$(CIN2TAB) -gb -lx1 $(srcdir)/$(GBLXSRC) -o gb.lx --- cce-0.51.orig/inputs/gbk/Makefile.am +++ cce-0.51/inputs/gbk/Makefile.am @@ -1,6 +1,6 @@ CIN2TAB = ../utils/cin2tab$(EXEEXT) -CCE_SHARE_DIR = $(DESTDIR)$(datadir) +CCE_SHARE_DIR = $(datadir) # You may add your favorite input method here # @@ -23,9 +23,9 @@ -rm -f core core.* *.tab *.lx allinstall: $(CIN2TAB) - $(mkinstalldirs) $(CCE_SHARE_DIR)/cce - $(mkinstalldirs) $(CCE_SHARE_DIR)/cce/gbk - $(INSTALL_DATA) $(srcdir)/*.tab $(CCE_SHARE_DIR)/cce/gbk + $(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce + $(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce/gbk + $(INSTALL_DATA) $(srcdir)/*.tab $(DESTDIR)$(CCE_SHARE_DIR)/cce/gbk gbk-winbxm.tab gbk-winzm.tab: @echo --- cce-0.51.orig/inputs/big5/Makefile.am +++ cce-0.51/inputs/big5/Makefile.am @@ -1,6 +1,6 @@ CIN2TAB = ../utils/cin2tab$(EXEEXT) -CCE_SHARE_DIR = $(DESTDIR)$(datadir) +CCE_SHARE_DIR = $(datadir) # You may add your favorite input method here # zhuyin.cin is better than table-based phone.cin? @@ -32,10 +32,10 @@ -rm -f core core.* *.lx *.tab allinstall: $(CIN2TAB) $(BIG5LX) - $(mkinstalldirs) $(CCE_SHARE_DIR)/cce - $(mkinstalldirs) $(CCE_SHARE_DIR)/cce/big5 - $(INSTALL_DATA) $(srcdir)/*.tab $(CCE_SHARE_DIR)/cce/big5 - $(INSTALL_DATA) $(srcdir)/*.lx $(CCE_SHARE_DIR)/cce/big5 + $(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce + $(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce/big5 + $(INSTALL_DATA) $(srcdir)/*.tab $(DESTDIR)$(CCE_SHARE_DIR)/cce/big5 + $(INSTALL_DATA) $(srcdir)/*.lx $(DESTDIR)$(CCE_SHARE_DIR)/cce/big5 # CIN from cxterm, put multiple chars in the same line --- cce-0.51.orig/inputs/jis/Makefile.am +++ cce-0.51/inputs/jis/Makefile.am @@ -1,7 +1,7 @@ CIN2TAB = ../utils/cin2tab$(EXEEXT) JISLX = jis.lx -CCE_SHARE_DIR = $(DESTDIR)$(datadir) +CCE_SHARE_DIR = $(datadir) # You may add your favorite input method here # @@ -30,10 +30,10 @@ -rm -f core core.* *.lx *.tab allinstall: $(CIN2TAB) $(JISLX) - $(mkinstalldirs) $(CCE_SHARE_DIR)/cce - $(mkinstalldirs) $(CCE_SHARE_DIR)/cce/jis - $(INSTALL_DATA) $(srcdir)/*.tab $(CCE_SHARE_DIR)/cce/jis - $(INSTALL_DATA) $(srcdir)/*.lx $(CCE_SHARE_DIR)/cce/jis + $(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce + $(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce/jis + $(INSTALL_DATA) $(srcdir)/*.tab $(DESTDIR)$(CCE_SHARE_DIR)/cce/jis + $(INSTALL_DATA) $(srcdir)/*.lx $(DESTDIR)$(CCE_SHARE_DIR)/cce/jis CLEANFILES = *.tab *.lx --- cce-0.51.orig/inputs/ksc/Makefile.am +++ cce-0.51/inputs/ksc/Makefile.am @@ -2,7 +2,7 @@ CIN2TAB = ../utils/cin2tab$(EXEEXT) KSCLX = ksc.lx -CCE_SHARE_DIR = $(DESTDIR)$(datadir) +CCE_SHARE_DIR = $(datadir) # You may add your favorite input method here # @@ -21,10 +21,10 @@ -rm -f core core.* *.lx *.tab allinstall: $(CIN2TAB) $(KSCLX) - $(mkinstalldirs) $(CCE_SHARE_DIR)/cce - $(mkinstalldirs) $(CCE_SHARE_DIR)/cce/ksc - $(INSTALL_DATA) $(srcdir)/*.tab $(CCE_SHARE_DIR)/cce/ksc - $(INSTALL_DATA) $(srcdir)/*.lx $(CCE_SHARE_DIR)/cce/ksc + $(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce + $(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce/ksc + $(INSTALL_DATA) $(srcdir)/*.tab $(DESTDIR)$(CCE_SHARE_DIR)/cce/ksc + $(INSTALL_DATA) $(srcdir)/*.lx $(DESTDIR)$(CCE_SHARE_DIR)/cce/ksc #%.tab: %.cin $(CIN2TAB)