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
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
|
diff -rc ../old/xview3.2p1-X11R6/config/Imakefile Imakefile
*** ../old/xview3.2p1-X11R6/config/Imakefile Tue Jun 29 01:13:19 1993
--- Imakefile Sun Nov 20 13:38:58 1994
***************
*** 8,14 ****
/**/# config directory
/**/# @(#)Imakefile 1.9 28 Jun 1993 SMI
! XVFILES = XView.cf XView.lib XView.obj XView.rules XView.tmpl library.tmpl
CFFILES = $(XVFILES) $(HEADERS)
InstallMultipleDestFlags(install,$(CFFILES),$(CONFIGDIR),$(INSTDATFLAGS))
--- 8,14 ----
/**/# config directory
/**/# @(#)Imakefile 1.9 28 Jun 1993 SMI
! XVFILES = XView.cf XView.lib XView.obj XView.rules XView.tmpl XView.prog
CFFILES = $(XVFILES) $(HEADERS)
InstallMultipleDestFlags(install,$(CFFILES),$(CONFIGDIR),$(INSTDATFLAGS))
diff -rc ../old/xview3.2p1-X11R6/config/XView.cf XView.cf
*** ../old/xview3.2p1-X11R6/config/XView.cf Sun Jun 26 22:09:19 1994
--- XView.cf Sun Nov 20 13:38:58 1994
***************
*** 101,107 ****
* the appropriate value.
*/
#ifndef XVDestDir
! #define XVDestDir /usr/X11/xview
#endif
/*
* Command to add object modules to the library.
--- 101,107 ----
* the appropriate value.
*/
#ifndef XVDestDir
! #define XVDestDir /usr/X11R6
#endif
/*
* Command to add object modules to the library.
***************
*** 139,145 ****
* installed in $(DESTDIR)/lib/X11/config (aka $(CONFIGDIR)).
*/
#ifndef OnlyNeedsNewXViewConfigInstalled
! #define OnlyNeedsNewXViewConfigInstalled NO
#endif
/*
* If you would like the XView man pages to be installed in
--- 139,145 ----
* installed in $(DESTDIR)/lib/X11/config (aka $(CONFIGDIR)).
*/
#ifndef OnlyNeedsNewXViewConfigInstalled
! #define OnlyNeedsNewXViewConfigInstalled YES
#endif
/*
* If you would like the XView man pages to be installed in
***************
*** 305,311 ****
* malloc() and read() will be used instead.
*/
#ifndef OsHasMmap
! #define OsHasMmap YES
#endif
/*
* The implementation of internationalization support in XView depends
--- 305,311 ----
* malloc() and read() will be used instead.
*/
#ifndef OsHasMmap
! #define OsHasMmap NO
#endif
/*
* The implementation of internationalization support in XView depends
***************
*** 315,321 ****
* features disabled.
*/
#ifndef OsHasLocale
! #define OsHasLocale YES
#endif
/*
* There are number of memory allocation macros in lib/libxview/base.h
--- 315,321 ----
* features disabled.
*/
#ifndef OsHasLocale
! #define OsHasLocale NO
#endif
/*
* There are number of memory allocation macros in lib/libxview/base.h
***************
*** 360,366 ****
* be defined as -PIC
*/
#ifndef PositionIndependentCodeFlag
! #define PositionIndependentCodeFlag -PIC
#endif
/*
--- 360,366 ----
* be defined as -PIC
*/
#ifndef PositionIndependentCodeFlag
! #define PositionIndependentCodeFlag -fpic
#endif
/*
diff -rc ../old/xview3.2p1-X11R6/config/XView.obj XView.obj
*** ../old/xview3.2p1-X11R6/config/XView.obj Tue Jun 29 01:13:20 1993
--- XView.obj Sun Nov 20 13:38:59 1994
***************
*** 15,21 ****
STD_DEFINES = StandardDefines LibXViewDefines
#endif
HEADERS= ${HDRSPUBLIC} ${HDRSPRIVATE}
! INCLUDES= -I$(BUILDINCDIR)$(INCDIR)
OBJS = $(TEXT_OBJS) $(DATA_OBJS) $(SPECIAL_OBJS)
#if !NotLibXView
ALLFILES = $(SRCS) $(HEADERS)
--- 15,21 ----
STD_DEFINES = StandardDefines LibXViewDefines
#endif
HEADERS= ${HDRSPUBLIC} ${HDRSPRIVATE}
! INCLUDES= -I$(BUILDINCDIR)/$(INCDIR)
OBJS = $(TEXT_OBJS) $(DATA_OBJS) $(SPECIAL_OBJS)
#if !NotLibXView
ALLFILES = $(SRCS) $(HEADERS)
***************
*** 85,98 ****
#if SubdirHasPublicHeaders
# if NotLibXView
! BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),/**/)
install::
$(MKDIRHIER) $(PUB_HEADER_DEST)
InstallMultiple($(HDRSPUBLIC),$(PUB_HEADER_DEST))
# else
! BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),/**/)
install::
$(MKDIRHIER) $(XVPUB_HEADER_DEST)
--- 85,98 ----
#if SubdirHasPublicHeaders
# if NotLibXView
! BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),.)
install::
$(MKDIRHIER) $(PUB_HEADER_DEST)
InstallMultiple($(HDRSPUBLIC),$(PUB_HEADER_DEST))
# else
! BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),.)
install::
$(MKDIRHIER) $(XVPUB_HEADER_DEST)
***************
*** 103,111 ****
#if SubdirHasPrivateHeaders
# if NotLibXView
! BuildIncludes($(HDRSPRIVATE),$(PRI_INCDIR),/**/)
# else
! BuildIncludes($(HDRSPRIVATE),$(XVPRI_INCDIR),/**/)
# endif
# if InstallPrivateHeaders
# if NotLibXView
--- 103,111 ----
#if SubdirHasPrivateHeaders
# if NotLibXView
! BuildIncludes($(HDRSPRIVATE),$(PRI_INCDIR),.)
# else
! BuildIncludes($(HDRSPRIVATE),$(XVPRI_INCDIR),.)
# endif
# if InstallPrivateHeaders
# if NotLibXView
diff -rc ../old/xview3.2p1-X11R6/config/XView.rules XView.rules
*** ../old/xview3.2p1-X11R6/config/XView.rules Tue Jun 29 01:13:20 1993
--- XView.rules Sun Nov 20 13:38:59 1994
***************
*** 366,374 ****
#ifndef InstallSharedLibraryNoBuild
#define InstallSharedLibraryNoBuild(libname,rev,dest) @@\
install:: @@\
! $(RM) /dest/lib/**/libname.so @@\
$(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.so.rev dest @@\
! (cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so)
#endif /* InstallSharedLibraryNoBuild */
--- 366,374 ----
#ifndef InstallSharedLibraryNoBuild
#define InstallSharedLibraryNoBuild(libname,rev,dest) @@\
install:: @@\
! $(RM) /dest/lib/**/libname.so @@\
$(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.so.rev dest @@\
! (cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so)
#endif /* InstallSharedLibraryNoBuild */
diff -rc ../old/xview3.2p1-X11R6/config/XView.tmpl XView.tmpl
*** ../old/xview3.2p1-X11R6/config/XView.tmpl Sun Jun 26 22:10:00 1994
--- XView.tmpl Sun Nov 20 13:38:59 1994
***************
*** 96,102 ****
* Work around small conflict with Project.tmpl file
*/
#if UseInstalled
! MKDIRHIER = BourneShell BinDir/mkdirhier
#endif
#if OsHasLocale
--- 96,102 ----
* Work around small conflict with Project.tmpl file
*/
#if UseInstalled
! MKDIRHIER = mkdirhier
#endif
#if OsHasLocale
***************
*** 224,230 ****
* afterwards.
*/
#ifndef XVIncludeDirName
! #define XVIncludeDirName /include
#endif
INCDIR = XVIncludeDirName
/*
--- 224,230 ----
* afterwards.
*/
#ifndef XVIncludeDirName
! #define XVIncludeDirName include
#endif
INCDIR = XVIncludeDirName
/*
***************
*** 356,365 ****
#if SystemV4
SYSV_CLIENT_LIB = -lintl -ldl
! XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
#else
SYSV_CLIENT_LIB =
! XVCLIENTSYSDEFINES = -DSUNOS41
#endif
/*
--- 356,365 ----
#if SystemV4
SYSV_CLIENT_LIB = -lintl -ldl
! XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
#else
SYSV_CLIENT_LIB =
! XVCLIENTSYSDEFINES = -DSUNOS41
#endif
/*
***************
*** 371,386 ****
*/
#if XvI18nLevel == 4
! XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
! XVCLIENTMISCLIB = -lw
! XVCLIENTINCLUDES = -I$(OPENWINHOME)/include
#else
! XVCLIENTI18NDEFINES = -DOW_I18N_L3
! XVCLIENTMISCLIB =
! XVCLIENTINCLUDES =
#endif
! XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
/*
* Define libraries for XView clients
--- 371,386 ----
*/
#if XvI18nLevel == 4
! XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
! XVCLIENTMISCLIB = -lw
! XVCLIENTINCLUDES = -I$(OPENWINHOME)/include
#else
! XVCLIENTI18NDEFINES = -DOW_I18N_L3
! XVCLIENTMISCLIB =
! XVCLIENTINCLUDES =
#endif
! XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
/*
* Define libraries for XView clients
|
