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
|
*** config/XView.tmpl.orig Sun Jun 26 21:10:00 1994
--- config/XView.tmpl Thu Jan 21 23:18:27 1999
***************
*** 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
***************
*** 192,205 ****
AS = as
*/
/*
- * use the same trick X11R5 does for defining rules for installed libs
- */
- #ifdef UseInstalled
- #define _Use(a,b) a
- #else
- #define _Use(a,b) b
- #endif
- /*
* Temporary directory used during build process before the include
* files are installed. This is just a place where symbolic links are
* placed to point back to the actual files in the build hierarchy to
--- 192,197 ----
***************
*** 224,230 ****
* afterwards.
*/
#ifndef XVIncludeDirName
! #define XVIncludeDirName /include
#endif
INCDIR = XVIncludeDirName
/*
--- 216,222 ----
* 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
/*
--- 348,357 ----
#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
--- 363,378 ----
*/
#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
***************
*** 410,416 ****
*/
#if SharedLibXView
# ifndef SharedXViewRev
! #if SystemV4
# define SharedXViewRev 3
#else
# define SharedXViewRev 3.2
--- 402,408 ----
*/
#if SharedLibXView
# ifndef SharedXViewRev
! #if SystemV4 || UseElfFormat
# define SharedXViewRev 3
#else
# define SharedXViewRev 3.2
***************
*** 449,460 ****
* Include the XView specific makefile macros.
*/
- /* This is just needed here because X11 is installed with gcc as
- a default compiler.
- lumpi@dobag.in-berlin.de
-
#undef CcCmd
#define CcCmd cc
! #define LibraryCcCmd cc */
#include <XView.rules>
#endif /* XViewTmpl */
--- 441,448 ----
* Include the XView specific makefile macros.
*/
#undef CcCmd
#define CcCmd cc
! #define LibraryCcCmd cc
#include <XView.rules>
#endif /* XViewTmpl */
|
