1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
|
Common subdirectories: xv-3.10a.clean/.xvpics and xv-3.10a/.xvpics
diff -Nu xv-3.10a.clean/Makefile xv-3.10a/Makefile
--- xv-3.10a.clean/Makefile Sat Jul 21 12:03:42 2001
+++ xv-3.10a/Makefile Sat Jul 21 12:10:48 2001
@@ -1,8 +1,8 @@
# Makefile for xv
# your C compiler (and options) of choice
-CC = cc
-# CC = gcc -ansi
+#CC = cc
+CC = gcc -ansi
# use this if you're using 'cc' on a DEC Alpha (OSF/1) or MIPS (Ultrix) system:
# CC = cc -std1 -Olimit 750
@@ -14,7 +14,7 @@
# -Wuninitialized -Wparentheses
-CCOPTS = -O
+CCOPTS = -O3 -march=i686 -mcpu=i686
### NOTE: Sun running OpenWindows:
@@ -28,10 +28,10 @@
### Installation locations
-BINDIR = /usr/local/bin
-MANDIR = /usr/local/man/man1
+BINDIR = /usr/bin
+MANDIR = /usr/share/man/man1
MANSUF = 1
-LIBDIR = /usr/local/lib
+LIBDIR = /usr/lib
buildit: all
@@ -45,26 +45,26 @@
### if, for whatever reason, you're unable to get the JPEG library to compile
### on your machine, *COMMENT OUT* the following lines
###
-JPEG = -DDOJPEG
-JPEGDIR = jpeg
-JPEGINC = -I$(JPEGDIR)
-JPEGLIB = $(JPEGDIR)/libjpeg.a
-$(JPEGDIR)/jconfig.h:
- cd $(JPEGDIR) ; ./configure CC='$(CC)'
-$(JPEGLIB): $(JPEGDIR)/jconfig.h
- cd $(JPEGDIR) ; make
+#JPEG = -DDOJPEG
+#JPEGDIR = jpeg
+#JPEGINC = -I$(JPEGDIR)
+#JPEGLIB = $(JPEGDIR)/libjpeg.a
+#$(JPEGDIR)/jconfig.h:
+# cd $(JPEGDIR) ; ./configure CC='$(CC)'
+#$(JPEGLIB): $(JPEGDIR)/jconfig.h
+# cd $(JPEGDIR) ; make
###
### if, for whatever reason, you're unable to get the TIFF library to compile
### on your machine, *COMMENT OUT* the following lines
###
-TIFF = -DDOTIFF
-TIFFDIR = tiff
-TIFFINC = -I$(TIFFDIR)
-TIFFLIB = $(TIFFDIR)/libtiff.a
-$(TIFFLIB):
- ( cd $(TIFFDIR) ; make CC='$(CC)' )
+#TIFF = -DDOTIFF
+#TIFFDIR = tiff
+#TIFFINC = -I$(TIFFDIR)
+#TIFFLIB = $(TIFFDIR)/libtiff.a
+#$(TIFFLIB):
+# ( cd $(TIFFDIR) ; make CC='$(CC)' )
###
@@ -102,7 +102,7 @@
### for LINUX, uncomment the following line
-#MCHN = -DLINUX
+MCHN = -DLINUX
# For SCO 1.1 (UNIX 3.2v2) machines, uncomment the following:
@@ -144,7 +144,7 @@
# if your machine has the usleep() function, uncomment the following line:
# if it doesn't, or you're not sure, leave this line alone.
-#TIMERS = -DUSLEEP
+TIMERS = -DUSLEEP
# if XV locks up whenever you click on *any* of the buttons, the Timer()
@@ -163,7 +163,7 @@
# if, during compilation, your system complains about the types
# 'u_long', 'u_short', 'u_int', etc. as being undefined, uncomment the
# following line:
-#BSDTYPES = -DBSDTYPES
+BSDTYPES = -DBSDTYPES
# if your machine doesn't have 'vprintf()' or 'vsprintf()'
@@ -188,7 +188,7 @@
$(NODIRENT) $(VPRINTF) $(TIMERS) $(UNIX) $(BSDTYPES) $(RAND) \
$(DXWM) $(MCHN)
-LIBS = -lX11 $(JPEGLIB) $(TIFFLIB) -lm
+LIBS = -L/usr/X11R6/lib -lX11 $(JPEGLIB) $(TIFFLIB) -lm -ltiff
OBJS = xv.o xvevent.o xvroot.o xvmisc.o xvimage.o xvcolor.o xvsmooth.o \
xv24to8.o xvgif.o xvpm.o xvinfo.o xvctrl.o xvscrl.o xvalg.o \
@@ -237,13 +237,14 @@
install: all
- cp xv bggen vdcomp xcmap xvpictoppm $(BINDIR)
- cp docs/xv.man $(MANDIR)/xv.$(MANSUF)
- cp docs/bggen.man $(MANDIR)/bggen.$(MANSUF)
- cp docs/xcmap.man $(MANDIR)/xcmap.$(MANSUF)
- cp docs/xvp2p.man $(MANDIR)/xvpictoppm.$(MANSUF)
- cp docs/vdcomp.man $(MANDIR)/vdcomp.$(MANSUF)
- cp docs/xvdocs.ps* $(LIBDIR)
+ mkdir -p ${DESTDIR}/{${BINDIR},$(MANDIR),$(LIBDIR)}
+ cp xv bggen vdcomp xcmap xvpictoppm ${DESTDIR}/$(BINDIR)
+ cp docs/xv.man ${DESTDIR}/$(MANDIR)/xv.$(MANSUF)
+ cp docs/bggen.man ${DESTDIR}/$(MANDIR)/bggen.$(MANSUF)
+ cp docs/xcmap.man ${DESTDIR}/$(MANDIR)/xcmap.$(MANSUF)
+ cp docs/xvp2p.man ${DESTDIR}/$(MANDIR)/xvpictoppm.$(MANSUF)
+ cp docs/vdcomp.man ${DESTDIR}/$(MANDIR)/vdcomp.$(MANSUF)
+ cp docs/xvdocs.ps* ${DESTDIR}/$(LIBDIR)
tar:
tar cvf xv.tar Makefile* Imakefile *.c *.h bits \
Common subdirectories: xv-3.10a.clean/bits and xv-3.10a/bits
diff -Nu xv-3.10a.clean/config.h xv-3.10a/config.h
--- xv-3.10a.clean/config.h Sat Jul 21 12:03:42 2001
+++ xv-3.10a/config.h Sat Jul 21 12:11:00 2001
@@ -19,7 +19,7 @@
# ifdef VMS
# define GUNZIP "UNCOMPRESS"
# else
-# define GUNZIP "/usr/local/bin/gunzip -q"
+# define GUNZIP "/bin/gunzip -q"
# endif
#endif
Common subdirectories: xv-3.10a.clean/docs and xv-3.10a/docs
Common subdirectories: xv-3.10a.clean/jpeg and xv-3.10a/jpeg
Common subdirectories: xv-3.10a.clean/tiff and xv-3.10a/tiff
Common subdirectories: xv-3.10a.clean/unsupt and xv-3.10a/unsupt
Common subdirectories: xv-3.10a.clean/vms and xv-3.10a/vms
|
GitWeb