1 diff -urN xv-3.10a.orig/Makefile xv-3.10a/Makefile
2 --- xv-3.10a.orig/Makefile Fri Oct 15 17:27:01 1999
3 +++ xv-3.10a/Makefile Fri Oct 15 17:36:01 1999
7 # your C compiler (and options) of choice
12 # use this if you're using 'cc' on a DEC Alpha (OSF/1) or MIPS (Ultrix) system:
14 # -Wuninitialized -Wparentheses
18 +CCOPTS = $(RPM_OPT_FLAGS)
21 ### NOTE: Sun running OpenWindows:
23 ### if, for whatever reason, you're unable to get the JPEG library to compile
24 ### on your machine, *COMMENT OUT* the following lines
28 -JPEGINC = -I$(JPEGDIR)
29 -JPEGLIB = $(JPEGDIR)/libjpeg.a
30 -$(JPEGDIR)/jconfig.h:
31 - cd $(JPEGDIR) ; ./configure CC='$(CC)'
32 -$(JPEGLIB): $(JPEGDIR)/jconfig.h
33 - cd $(JPEGDIR) ; make
36 +#JPEGINC = -I$(JPEGDIR)
37 +#JPEGLIB = $(JPEGDIR)/libjpeg.a
38 +#$(JPEGDIR)/jconfig.h:
39 +# cd $(JPEGDIR) ; ./configure CC='$(CC)'
40 +#$(JPEGLIB): $(JPEGDIR)/jconfig.h
41 +# cd $(JPEGDIR) ; make
46 ### if, for whatever reason, you're unable to get the PNG library to compile
47 ### on your machine, *COMMENT OUT* the following lines
50 -PNGDIR = /usr/local/src/libpng
52 -PNGLIB = -L$(PNGDIR) -lpng
54 +#PNGDIR = /usr/local/src/libpng
55 +#PNGINC = -I$(PNGDIR)
56 +#PNGLIB = -L$(PNGDIR) -lpng
61 ### if, for whatever reason, you're unable to get the PNG library to compile
62 ### on your machine, *COMMENT OUT* the following lines
64 -ZLIBDIR = /usr/local/src/zlib
65 -ZLIBINC = -I$(ZLIBDIR)
66 -ZLIBLIB = -L$(ZLIBDIR) -lz
67 +#ZLIBDIR = /usr/local/src/zlib
68 +#ZLIBINC = -I$(ZLIBDIR)
69 +#ZLIBLIB = -L$(ZLIBDIR) -lz
74 ### if, for whatever reason, you're unable to get the TIFF library to compile
75 ### on your machine, *COMMENT OUT* the following lines
79 -TIFFINC = -I$(TIFFDIR)
80 -TIFFLIB = $(TIFFDIR)/libtiff.a
82 - ( cd $(TIFFDIR) ; make CC='$(CC)' )
85 +#TIFFINC = -I$(TIFFDIR)
86 +#TIFFLIB = $(TIFFDIR)/libtiff.a
88 +# ( cd $(TIFFDIR) ; make CC='$(CC)' )
96 ### for LINUX, uncomment the following line
101 # For SCO 1.1 (UNIX 3.2v2) machines, uncomment the following:
103 $(NODIRENT) $(VPRINTF) $(TIMERS) $(UNIX) $(BSDTYPES) $(RAND) \
104 $(DXWM) $(MCHN) $(PNG) $(PNGINC) $(ZLIBINC)
106 -LIBS = -lX11 $(JPEGLIB) $(TIFFLIB) $(PNGLIB) $(ZLIBLIB) -lm
107 +LIBS = -lX11 $(JPEGLIB) $(TIFFLIB) $(PNGLIB) $(ZLIBLIB) -lm -L/usr/X11R6/lib
109 OBJS = xv.o xvevent.o xvroot.o xvmisc.o xvimage.o xvcolor.o xvsmooth.o \
110 xv24to8.o xvgif.o xvpm.o xvinfo.o xvctrl.o xvscrl.o xvalg.o \
111 @@ -226,10 +230,10 @@
115 -all: $(JPEGLIB) $(TIFFLIB) xv bggen vdcomp xcmap xvpictoppm
116 +all: xv bggen vdcomp xcmap xvpictoppm
119 -xv: $(OBJS) $(JPEGLIB) $(TIFFLIB)
121 $(CC) -o xv $(CFLAGS) $(OBJS) $(LIBS)
124 diff -urN xv-3.10a.orig/xv.h xv-3.10a/xv.h
125 --- xv-3.10a.orig/xv.h Fri Oct 15 17:27:01 1999
126 +++ xv-3.10a/xv.h Fri Oct 15 17:33:35 1999
131 - extern int errno; /* SHOULD be in errno.h, but often isn't */
133 - extern char *sys_errlist[]; /* this too... */