*** ./cnv/rlatorle.c Thu Apr 30 09:58:33 1992 --- ../urt-3.1b/./cnv/rlatorle.c Thu Aug 27 15:27:15 1998 *************** *** 162,168 **** } VPRINTF(stderr, "Channel color space %s\n", head.rla_head.chan); if ( rlb_flag ) ! VPRINTF(stderr, "Interlaced? %s\n", head.rlb_head.filter_type); else VPRINTF(stderr, "Interlaced? %s\n", "-unused-"); if (do_matte) --- 162,168 ---- } VPRINTF(stderr, "Channel color space %s\n", head.rla_head.chan); if ( rlb_flag ) ! VPRINTF(stderr, "Interlaced? %hd\n", head.rlb_head.filter_type); else VPRINTF(stderr, "Interlaced? %s\n", "-unused-"); if (do_matte) *** ./cnv/iristorle.c Thu Apr 30 09:56:43 1992 --- ../urt-3.1b/./cnv/iristorle.c Wed Aug 19 16:47:26 1998 *************** *** 25,31 **** * Paul Haeberli - 1990 */ #include "stdio.h" ! #include "image.h" #include "rle.h" short rbuf[8192]; --- 25,31 ---- * Paul Haeberli - 1990 */ #include "stdio.h" ! #include #include "rle.h" short rbuf[8192]; *** ./cnv/makefile.src Mon Dec 11 09:58:05 1995 --- ../urt-3.1b/./cnv/makefile.src Wed Aug 19 16:49:02 1998 *************** *** 95,104 **** # iristorle/rletoiris - Convert between RLE and SGI image format. # iristorle.out: iristorle.c ! $(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new mv $*.new $@ rletoiris.out: rletoiris.c ! $(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new mv $*.new $@ #endif --- 95,104 ---- # iristorle/rletoiris - Convert between RLE and SGI image format. # iristorle.out: iristorle.c ! $(CC) $(CFLAGS) $(INCGL) $*.c $(LIBS) $(LIBGL) -o $*.new mv $*.new $@ rletoiris.out: rletoiris.c ! $(CC) $(CFLAGS) $(INCGL) $*.c $(LIBS) $(LIBGL) -o $*.new mv $*.new $@ #endif *** ./get/getx11/XGetHClrs.c Thu Apr 30 10:16:23 1992 --- ../urt-3.1b/./get/getx11/XGetHClrs.c Wed Aug 19 17:31:10 1998 *************** *** 1,5 **** #ifndef XLIBINT_H_NOT_AVAILABLE ! #include /* $XConsortium: XGetHClrs.c,v 11.10 88/09/06 16:07:50 martin Exp $ */ /* Copyright Massachusetts Institute of Technology 1986 */ --- 1,5 ---- #ifndef XLIBINT_H_NOT_AVAILABLE ! /* #include */ /* $XConsortium: XGetHClrs.c,v 11.10 88/09/06 16:07:50 martin Exp $ */ /* Copyright Massachusetts Institute of Technology 1986 */ *** ./get/getx11/map_scan.c Thu Aug 13 13:24:01 1992 --- ../urt-3.1b/./get/getx11/map_scan.c Thu Aug 27 15:51:33 1998 *************** *** 2195,2201 **** if (!img->divN || !img->modN || !img->dm16 ) { ! fprintf( stderr, "%s: malloc error getting dither arrays\n"); exit (1); } } --- 2195,2201 ---- if (!img->divN || !img->modN || !img->dm16 ) { ! fprintf( stderr, "%s: malloc error getting dither arrays\n", progname ); exit (1); } } *** ./get/getx11/x11_stuff.c Fri May 13 21:05:44 1994 --- ../urt-3.1b/./get/getx11/x11_stuff.c Thu Aug 27 15:31:28 1998 *************** *** 333,339 **** if (( img->pixmap != NULL && reallocate ) || ( img->pixmap != NULL && (img->pix_w < iw || img->pix_h < ih ))){ ! free_X_pixmap( dpy, img->pixmap ); img->pixmap = NULL; } --- 333,339 ---- if (( img->pixmap != NULL && reallocate ) || ( img->pixmap != NULL && (img->pix_w < iw || img->pix_h < ih ))){ ! free_X_pixmap( img, img->pixmap ); img->pixmap = NULL; } *** ./lib/makefile.src Wed Mar 4 14:32:53 1992 --- ../urt-3.1b/./lib/makefile.src Wed Aug 19 17:58:12 1998 *************** *** 27,32 **** --- 27,35 ---- $(OPT_OBJS) LIBNAME = librle.a + #ifdef USE_SHARED_LIB + SHLIBNAME = librle.so + #endif # Just rebuild the object files. objs: $(OBJS) *************** *** 36,41 **** --- 39,45 ---- # is more useful to have a non-debug version than nothing at all.) # Do nothing if $(DEST) is empty (or not defined) install: buildlib + #ifndef NO_STATIC_LIB @sh -c "if test '$(DEST)x' != x ; then \ echo cp $(LIBNAME) $(DEST)/$(LIBNAME) ; \ cp $(LIBNAME) $(DEST)/$(LIBNAME) ; \ *************** *** 60,69 **** --- 64,91 ---- else \ true ; \ fi" + #endif + #ifdef USE_SHARED_LIB + @sh -c "if test '$(DEST)x' != x ; then \ + echo cp $(SHLIBVERSNAME) $(DEST)/ ; \ + cp $(SHLIBVERSNAME) $(DEST)/ ; \ + ln -s $(SHLIBVERSNAME) $(DEST)/$(SHLIBNAME) ; \ + if test -d $(DEST)/debug ; then \ + echo cp $(SHLIBVERSNAME) $(DEST)/debug/ ; \ + cp $(SHLIBVERSNAME) $(DEST)/debug/ ; \ + ln -s $(SHLIBVERSNAME) $(DEST)/debug/$(SHLIBNAME) ; \ + else \ + true ; \ + fi ; \ + else \ + true ; \ + fi" + #endif touch install # Rebuild the library from all the .o files. buildlib: $(OBJS) + #ifndef NO_STATIC_LIB -rm -f $(LIBNAME) ar rc $(LIBNAME) ar q $(LIBNAME) $(OBJS) *************** *** 70,75 **** --- 92,103 ---- #ifndef NO_RANLIB ranlib $(LIBNAME) #endif + #endif + #ifdef USE_SHARED_LIB + -rm -f $(SHLIBNAME) $(SHLIBVERSNAME) + $(CC) -o $(SHLIBVERSNAME) $(LDFLAGS) $(SHLIB_FLAGS) $(OBJS) $(DIRLIBS) ${EXTRALIBS} + ln -s $(SHLIBVERSNAME) $(SHLIBNAME) + #endif touch buildlib # Clean up installed stuff and binaries *************** *** 78,85 **** echo rm -f $(DEST)/$(LIBNAME) $(DEST)/debug/$(LIBNAME) ; \ rm -f $(DEST)/$(LIBNAME) $(DEST)/debug/$(LIBNAME) ; \ else \ ! echo rm -f $(LIBNAME) ; \ ! rm -f $(LIBNAME) ; \ fi -rm -f install --- 106,113 ---- echo rm -f $(DEST)/$(LIBNAME) $(DEST)/debug/$(LIBNAME) ; \ rm -f $(DEST)/$(LIBNAME) $(DEST)/debug/$(LIBNAME) ; \ else \ ! echo rm -f $(LIBNAME) $(SHLIBNAME) $(SHLIBVERSNAME) ; \ ! rm -f $(LIBNAME) $(SHLIBNAME) $(SHLIBVERSNAME) ; \ fi -rm -f install *************** *** 87,94 **** clean: -rm -f *.o -@if test x$(DEST) != x ; then \ ! echo rm -f $(LIBNAME) ; \ ! rm -f $(LIBNAME) ; \ else \ true ; \ fi --- 115,122 ---- clean: -rm -f *.o -@if test x$(DEST) != x ; then \ ! echo rm -f $(LIBNAME) $(SHLIBNAME) $(SHLIBVERSNAME) ; \ ! rm -f $(LIBNAME) $(SHLIBNAME) $(SHLIBVERSNAME) ; \ else \ true ; \ fi *** ./tools/rlesetbg.c Thu Jan 23 15:44:33 1992 --- ../urt-3.1b/./tools/rlesetbg.c Thu Aug 27 15:23:36 1998 *************** *** 74,80 **** if ( backcolor_flag && nback < in_hdr.ncolors ) { fprintf( stderr, "%s: Need %d colors, only %d supplied.\n", ! in_hdr.ncolors, nback ); exit(-1); } (void)rle_hdr_cp( &in_hdr, &out_hdr ); --- 74,80 ---- if ( backcolor_flag && nback < in_hdr.ncolors ) { fprintf( stderr, "%s: Need %d colors, only %d supplied.\n", ! cmd_name( argv ), in_hdr.ncolors, nback ); exit(-1); } (void)rle_hdr_cp( &in_hdr, &out_hdr ); *** ./tools/mergechan.c Thu Jan 23 11:25:19 1992 --- ../urt-3.1b/./tools/mergechan.c Thu Aug 27 15:21:33 1998 *************** *** 79,85 **** { fprintf( stderr, "%s: Images %d and %d are both from the standard input\n", ! stdin_used, i ); exit( -1 ); } } --- 79,85 ---- { fprintf( stderr, "%s: Images %d and %d are both from the standard input\n", ! cmd_nm, stdin_used, i ); exit( -1 ); } } *** ./tools/makefile.src Tue Jan 28 13:47:42 1992 --- ../urt-3.1b/./tools/makefile.src Wed Aug 19 15:50:01 1998 *************** *** 82,88 **** # rleClock has it's own directory, must be built special rleClock.out: clock/font.c clock/font.h clock/font.src clock/rleClock.c ! (cd clock ; make) # Incremental install, copies everything ("$?") since last install to DEST dir. install: $(PGMS) install-pgm --- 82,88 ---- # rleClock has it's own directory, must be built special rleClock.out: clock/font.c clock/font.h clock/font.src clock/rleClock.c ! (cd clock ; $(MAKE) $(MFLAGS)) # Incremental install, copies everything ("$?") since last install to DEST dir. install: $(PGMS) install-pgm *** ./makefile.src Fri Jun 7 11:58:13 1991 --- ../urt-3.1b/./makefile.src Wed Aug 19 15:48:29 1998 *************** *** 17,23 **** # clean deletes all but source, pristine (below) deletes installed stuff, too default clean: doit @for d in $(DIRS) ; do \ ! ( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \ done # install puts library, binaries and documentation into global location --- 17,23 ---- # clean deletes all but source, pristine (below) deletes installed stuff, too default clean: doit @for d in $(DIRS) ; do \ ! ( cd $$d ; echo make $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \ done # install puts library, binaries and documentation into global location *************** *** 29,35 **** install $(MAKE_TARGET) pristine depend:: doit @for d in $(ALLDIRS) ; do \ ! ( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \ done --- 29,35 ---- install $(MAKE_TARGET) pristine depend:: doit @for d in $(ALLDIRS) ; do \ ! ( cd $$d ; echo make $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \ done *** ./makefile.tlr Tue Aug 4 13:17:57 1992 --- ../urt-3.1b/./makefile.tlr Wed Aug 19 15:47:46 1998 *************** *** 7,13 **** @sh -c "if test 'x$(DIRS)' != x ; then eval \ 'set -e ; for dir in $(DIRS) ; do \ (cd \$$dir ; echo Make ${HERE}\$$dir ; \ ! make $(MFLAGS) $(DIRMFLAGS) ) ; \ done' ; \ else \ true ; \ --- 7,13 ---- @sh -c "if test 'x$(DIRS)' != x ; then eval \ 'set -e ; for dir in $(DIRS) ; do \ (cd \$$dir ; echo Make ${HERE}\$$dir ; \ ! $(MAKE) $(MFLAGS) $(DIRMFLAGS) ) ; \ done' ; \ else \ true ; \ *************** *** 46,52 **** @sh -c "if test 'x$(DIRS)' != x ; then eval \ 'for dir in $(DIRS) ; do \ (cd \$$dir ; echo Install ${HERE}\$$dir ; \ ! make $(MFLAGS) $(DIRMFLAGS) install) ; \ done' ; \ else \ true ; \ --- 46,52 ---- @sh -c "if test 'x$(DIRS)' != x ; then eval \ 'for dir in $(DIRS) ; do \ (cd \$$dir ; echo Install ${HERE}\$$dir ; \ ! $(MAKE) $(MFLAGS) $(DIRMFLAGS) install) ; \ done' ; \ else \ true ; \ *************** *** 105,111 **** 'for dir in $(ALLDIRS); do \ if test -d $$dir ; then \ (cd $$dir; echo Make ${HERE}$$dir pristine ; \ ! make $(MFLAGS) pristine); \ else \ true; \ fi; \ --- 105,111 ---- 'for dir in $(ALLDIRS); do \ if test -d $$dir ; then \ (cd $$dir; echo Make ${HERE}$$dir pristine ; \ ! $(MAKE) $(MFLAGS) pristine); \ else \ true; \ fi; \ *************** *** 124,130 **** 'for dir in $(ALLDIRS); do \ if test -d $$dir ; then \ (cd $$dir; echo Clean ${HERE}$$dir ; \ ! make $(MFLAGS) clean); \ else \ true; \ fi; \ --- 124,130 ---- 'for dir in $(ALLDIRS); do \ if test -d $$dir ; then \ (cd $$dir; echo Clean ${HERE}$$dir ; \ ! $(MAKE) $(MFLAGS) clean); \ else \ true; \ fi; \ *** ./config/urt Wed Jul 15 15:47:15 1992 --- ../urt-3.1b/./config/urt Thu Aug 27 15:52:55 1998 *************** *** 29,35 **** ##define SUNTOOLS For Suns running SunTools. ##define TAAC1 Suns with TAAC-1 board. ##define X10 X10 Window system. ! ##define X11 X11 Window system. # Conversion programs #define ABEKASA60 Abekas A60 conversions. --- 29,35 ---- ##define SUNTOOLS For Suns running SunTools. ##define TAAC1 Suns with TAAC-1 board. ##define X10 X10 Window system. ! #define X11 X11 Window system. # Conversion programs #define ABEKASA60 Abekas A60 conversions. *************** *** 39,51 **** #define CUBICOMP Cubicomp conversions. #define GIF GIF image conversions. #define GRAYFILES Grayscale conversions. ! ##define SGICONV SGI Image conversions. #define MACPAINT Macpaint conversions. ! ##define PBMPLUS PBMPLUS conversions. #define POSTSCRIPT Postscript conversions. ##define SUNRASTER For Sun raster conversions. #define TARGA Targa format conversions. ! ##define TIFF TIFF image conversions. #define TIFF2p4 Define if libtiff is version 2.4 or greater #define VICAR VICAR image conversions. #define WASATCH Wasatch Paintbox conversions. --- 39,51 ---- #define CUBICOMP Cubicomp conversions. #define GIF GIF image conversions. #define GRAYFILES Grayscale conversions. ! #define SGICONV SGI Image conversions. #define MACPAINT Macpaint conversions. ! #define PBMPLUS PBMPLUS conversions. #define POSTSCRIPT Postscript conversions. ##define SUNRASTER For Sun raster conversions. #define TARGA Targa format conversions. ! #define TIFF TIFF image conversions. #define TIFF2p4 Define if libtiff is version 2.4 or greater #define VICAR VICAR image conversions. #define WASATCH Wasatch Paintbox conversions. *************** *** 65,71 **** ##define HPUX800CC HP 9000/800 running HP-UX. ##define IBMR6000CC IBM RS6000. ##define IRIS4DCC Silicon Graphics Iris 4D. ! ##define IRISCC Silicon Graphics Iris 2400/3000. ##define SUNCC Sun 3 computers. ##define 386IXCC SVr3 386/ix 2.2 --- 65,71 ---- ##define HPUX800CC HP 9000/800 running HP-UX. ##define IBMR6000CC IBM RS6000. ##define IRIS4DCC Silicon Graphics Iris 4D. ! #define IRISCC Silicon Graphics Iris 2400/3000. ##define SUNCC Sun 3 computers. ##define 386IXCC SVr3 386/ix 2.2 *************** *** 77,83 **** ##define ABEKAS_PAL Convert to PAL format in Abekas A60 tool. ##define ALL_MAN Print/install all man pages. ! ##define CONST_DECL If your compiler understands 'const' (ANSI) ##define FILE_NAME_14_CHARS If filenames are limited to 14 characters. ##define HAVE_CPROTO If you have the cproto command. Not normally required. ##define NEED_BSTRING Your libc does not have bcopy or bzero (Sys V probably) --- 77,83 ---- ##define ABEKAS_PAL Convert to PAL format in Abekas A60 tool. ##define ALL_MAN Print/install all man pages. ! #define CONST_DECL If your compiler understands 'const' (ANSI) ##define FILE_NAME_14_CHARS If filenames are limited to 14 characters. ##define HAVE_CPROTO If you have the cproto command. Not normally required. ##define NEED_BSTRING Your libc does not have bcopy or bzero (Sys V probably) *************** *** 84,107 **** ##define NEED_GETOPT Your libc does not have the getopt function (BSD) ##define NEED_RENAME Your libc does not have the rename function (Sys V) ##define NEED_SETLINEBUF Your stdio does not have setlinebuf (Sys V) ! ##define NO_MAKE_MAKEFILE If you don't want a "makefile" action. ##define NO_OPEN_PIPES If file "names" "|..." and "*.Z" are not special. ! ##define NO_RANLIB You don't have the ranlib program (Sys V) ##define NO_ITIMER You don't have setitimer (e.g., Cray 2). ##define NO_TOOLS Don't build tool directory. ##define STDIO_NEEDS_BINARY Your fopen() needs "b" specified for binary io ! ##define USE_TIME_H You need to include time.h for time_t (Sys V) ! ##define SYS_V_SETPGRP Your system has the SysV setpgrp() call. ! ##define USE_L_FLAG Use -Llibdir -lrle instead of libdir/liblre.a. ! ##define USE_PROTOTYPES Declare library functions with ANSI-C prototypes. ! ##define USE_RANDOM Your libc has the BSD random() function. ! ##define USE_STDARG Use 'stdarg' instead of 'varargs' (ANSI). ! ##define USE_STDLIB_H You have "stdlib.h". ! ##define USE_UNISTD_H You have "unistd.h". ##define USE_STRING_H You have "string.h", not "strings.h" ! ##define VOID_STAR Your C compiler understands the 'void *' declaration. ! ##define USE_XLIBINT_H You have the include file . ! ##define X_SHARED_MEMORY You have the XShm extension. # DEST is where all programs will be put. Can be overridden for specific # directories below. --- 84,109 ---- ##define NEED_GETOPT Your libc does not have the getopt function (BSD) ##define NEED_RENAME Your libc does not have the rename function (Sys V) ##define NEED_SETLINEBUF Your stdio does not have setlinebuf (Sys V) ! #define NO_MAKE_MAKEFILE If you don't want a "makefile" action. ##define NO_OPEN_PIPES If file "names" "|..." and "*.Z" are not special. ! #define NO_RANLIB You don't have the ranlib program (Sys V) ##define NO_ITIMER You don't have setitimer (e.g., Cray 2). + #define NO_STATIC_LIB You don't want an archived library, librle.a. ##define NO_TOOLS Don't build tool directory. ##define STDIO_NEEDS_BINARY Your fopen() needs "b" specified for binary io ! #define USE_TIME_H You need to include time.h for time_t (Sys V) ! #define SYS_V_SETPGRP Your system has the SysV setpgrp() call. ! #define USE_L_FLAG Use -Llibdir -lrle instead of libdir/liblre.a. ! #define USE_PROTOTYPES Declare library functions with ANSI-C prototypes. ! #define USE_RANDOM Your libc has the BSD random() function. ! #define USE_SHARED_LIB You want to build librle.so ! #define USE_STDARG Use 'stdarg' instead of 'varargs' (ANSI). ! #define USE_STDLIB_H You have "stdlib.h". ! #define USE_UNISTD_H You have "unistd.h". ##define USE_STRING_H You have "string.h", not "strings.h" ! #define VOID_STAR Your C compiler understands the 'void *' declaration. ! #define USE_XLIBINT_H You have the include file . ! #define X_SHARED_MEMORY You have the XShm extension. # DEST is where all programs will be put. Can be overridden for specific # directories below. *************** *** 121,132 **** # library, include files, or manual pages, respectively, to be # installed anywhere. ! ##defpath MAN_DEST /usr/site/man ! ##defpath LIB_DEST ##defpath GET_DEST ##defpath CNV_DEST ##defpath TOOLS_DEST ! ##defpath INC_DEST # Control of formatting. If your "roff" program needs to be piped to # something to print, set ROFFPIPE to (e.g.) "| lpr" --- 123,134 ---- # library, include files, or manual pages, respectively, to be # installed anywhere. ! #defpath MAN_DEST /usr/freeware/man ! #defpath LIB_DEST /usr/freeware/lib ##defpath GET_DEST ##defpath CNV_DEST ##defpath TOOLS_DEST ! #defpath INC_DEST /usr/freeware/include # Control of formatting. If your "roff" program needs to be piped to # something to print, set ROFFPIPE to (e.g.) "| lpr" *************** *** 145,153 **** #ifdef CGM # Path to directory where CGM library and include files may be found # Absolute or relative to URT root ! #defpath CGMDIR ! INCCGM = -I$(CGMDIR) ! LIBCGM = $(CGMDIR)/libcgm.a #endif #ifdef CX3D --- 147,155 ---- #ifdef CGM # Path to directory where CGM library and include files may be found # Absolute or relative to URT root ! #defpath CGMDIR /usr/freeware ! INCCGM = -I$(ROOT)/$(CGMDIR)/include ! LIBCGM = -lralcgm #endif #ifdef CX3D *************** *** 181,187 **** #endif #ifdef IRIS ! LIBIRIS = -Zg #endif #ifdef IRIS4D --- 183,189 ---- #endif #ifdef IRIS ! LIBIRIS = #endif #ifdef IRIS4D *************** *** 191,203 **** #ifdef PBMPLUS # PBMDIR should refer to the root of your PBM source tree. # If relative, it's relative to root of URT source tree. ! #defpath PBMDIR ! INCPBMPLUS = -I$(PBMDIR) -I$(PBMDIR)/ppm -I$(PBMDIR)/pgm -I$(PBMDIR)/pbm ! LIBPBMPLUS = $(PBMDIR)/ppm/libppm.a $(PBMDIR)/pgm/libpgm.a \ ! $(PBMDIR)/pbm/libpbm.a #endif #ifdef SUNRASTER|SUNTOOLS|TAAC1 LIBSUNTOOLS_COM = -lsuntool -lsunwindow -lpixrect #endif --- 193,209 ---- #ifdef PBMPLUS # PBMDIR should refer to the root of your PBM source tree. # If relative, it's relative to root of URT source tree. ! #defpath PBMDIR ! INCPBMPLUS = ! LIBPBMPLUS = -lppm #endif + #ifdef SGICONV + INCGL = -I$(ROOT)/usr/include/gl + LIBGL = -limage + #endif + #ifdef SUNRASTER|SUNTOOLS|TAAC1 LIBSUNTOOLS_COM = -lsuntool -lsunwindow -lpixrect #endif *************** *** 216,224 **** #ifdef TIFF # Location of tiff library and include files. Relative to URT root directory. ! #defpath TIFFDIR ! INCTIFF = -I$(TIFFDIR) ! LIBTIFF = $(TIFFDIR)/libtiff.a #endif #ifdef X10 --- 222,230 ---- #ifdef TIFF # Location of tiff library and include files. Relative to URT root directory. ! #defpath TIFFDIR ! INCTIFF = ! LIBTIFF = -ltiff #endif #ifdef X10 *************** *** 229,232 **** --- 235,244 ---- #ifdef X11 LIBX11 = -lX11 INCX11 = + #endif + + #ifdef USE_SHARED_LIB + SHLIBVERS = 3.1 + SHLIBVERSNAME = $(SHLIBNAME).$(SHLIBVERS) + SHLIB_FLAGS = -shared -Wl,-soname,$(SHLIBNAME) -Wl,-set_version,$(SHLIBVERS) #endif