|
Lines 1-6
Link Here
|
| 1 |
--- unix-gcc.mak.orig Thu Sep 17 08:06:06 1998 |
1 |
--- unix-gcc.mak.orig Mon Feb 14 11:28:41 2000 |
| 2 |
+++ unix-gcc.mak Mon Nov 30 13:11:05 1998 |
2 |
+++ unix-gcc.mak Sat Jul 29 00:40:45 2000 |
| 3 |
@@ -48,12 +48,10 @@ |
3 |
@@ -54,12 +54,10 @@ |
| 4 |
# the directories also define the default search path for the |
4 |
# the directories also define the default search path for the |
| 5 |
# initialization files (gs_*.ps) and the fonts. |
5 |
# initialization files (gs_*.ps) and the fonts. |
| 6 |
|
6 |
|
|
Lines 16-22
Link Here
|
| 16 |
exec_prefix = $(prefix) |
16 |
exec_prefix = $(prefix) |
| 17 |
bindir = $(exec_prefix)/bin |
17 |
bindir = $(exec_prefix)/bin |
| 18 |
scriptdir = $(bindir) |
18 |
scriptdir = $(bindir) |
| 19 |
@@ -141,7 +139,7 @@ |
19 |
@@ -140,14 +138,14 @@ |
|
|
20 |
# You may need to change this if the libpng version changes. |
| 21 |
# See libpng.mak for more information. |
| 22 |
|
| 23 |
-PSRCDIR=libpng |
| 24 |
+PSRCDIR=${LOCALBASE}/include |
| 25 |
PVERSION=96 |
| 26 |
|
| 27 |
# Choose whether to use a shared version of the PNG library, and if so, |
| 20 |
# what its name is. |
28 |
# what its name is. |
| 21 |
# See gs.mak and Make.htm for more information. |
29 |
# See gs.mak and Make.htm for more information. |
| 22 |
|
30 |
|
|
Lines 25-31
Link Here
|
| 25 |
LIBPNG_NAME=png |
33 |
LIBPNG_NAME=png |
| 26 |
|
34 |
|
| 27 |
# Define the directory where the zlib sources are stored. |
35 |
# Define the directory where the zlib sources are stored. |
| 28 |
@@ -153,7 +151,7 @@ |
36 |
@@ -159,7 +157,7 @@ |
| 29 |
# what its name is (usually libz, but sometimes libgz). |
37 |
# what its name is (usually libz, but sometimes libgz). |
| 30 |
# See gs.mak and Make.htm for more information. |
38 |
# See gs.mak and Make.htm for more information. |
| 31 |
|
39 |
|
|
Lines 34-49
Link Here
|
| 34 |
#ZLIB_NAME=gz |
42 |
#ZLIB_NAME=gz |
| 35 |
ZLIB_NAME=z |
43 |
ZLIB_NAME=z |
| 36 |
|
44 |
|
| 37 |
@@ -172,7 +170,7 @@ |
45 |
@@ -178,7 +176,7 @@ |
| 38 |
|
46 |
|
| 39 |
# Define the name of the C compiler. |
47 |
# Define the name of the C compiler. |
| 40 |
|
48 |
|
| 41 |
-CC=gcc |
49 |
-CC=gcc |
| 42 |
+CC=cc |
50 |
+#CC=cc |
| 43 |
|
51 |
|
| 44 |
# Define the name of the linker for the final link step. |
52 |
# Define the name of the linker for the final link step. |
| 45 |
# Normally this is the same as the C compiler. |
53 |
# Normally this is the same as the C compiler. |
| 46 |
@@ -205,7 +203,7 @@ |
54 |
@@ -211,7 +209,7 @@ |
| 47 |
# gcc to accept ANSI-style function prototypes and function definitions. |
55 |
# gcc to accept ANSI-style function prototypes and function definitions. |
| 48 |
XCFLAGS= |
56 |
XCFLAGS= |
| 49 |
|
57 |
|
|
Lines 52-67
Link Here
|
| 52 |
|
60 |
|
| 53 |
# Define platform flags for ld. |
61 |
# Define platform flags for ld. |
| 54 |
# SunOS 4.n may need -Bstatic. |
62 |
# SunOS 4.n may need -Bstatic. |
| 55 |
@@ -214,7 +212,7 @@ |
63 |
@@ -220,7 +218,7 @@ |
| 56 |
# -R /usr/local/xxx/lib:/usr/local/lib |
64 |
# -R /usr/local/xxx/lib:/usr/local/lib |
| 57 |
# giving the full path names of the shared library directories. |
65 |
# giving the full path names of the shared library directories. |
| 58 |
# XLDFLAGS can be set from the command line. |
66 |
# XLDFLAGS can be set from the command line. |
| 59 |
-XLDFLAGS= |
67 |
-XLDFLAGS= |
| 60 |
+XLDFLAGS=-L$(prefix)/lib |
68 |
+XLDFLAGS=-L${LOCALBASE}/lib |
| 61 |
|
69 |
|
| 62 |
LDFLAGS=$(XLDFLAGS) -fno-common |
70 |
LDFLAGS=$(XLDFLAGS) -fno-common |
| 63 |
|
71 |
|
| 64 |
@@ -234,7 +232,7 @@ |
72 |
@@ -240,7 +238,7 @@ |
| 65 |
# Note that x_.h expects to find the header files in $(XINCLUDE)/X11, |
73 |
# Note that x_.h expects to find the header files in $(XINCLUDE)/X11, |
| 66 |
# not in $(XINCLUDE). |
74 |
# not in $(XINCLUDE). |
| 67 |
|
75 |
|
|
Lines 70-76
Link Here
|
| 70 |
|
78 |
|
| 71 |
# Define the directory/ies and library names for the X11 library files. |
79 |
# Define the directory/ies and library names for the X11 library files. |
| 72 |
# XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH |
80 |
# XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH |
| 73 |
@@ -246,12 +244,12 @@ |
81 |
@@ -252,12 +250,12 @@ |
| 74 |
# Solaris and other SVR4 systems with dynamic linking probably want |
82 |
# Solaris and other SVR4 systems with dynamic linking probably want |
| 75 |
#XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib |
83 |
#XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib |
| 76 |
# X11R6 (on any platform) may need |
84 |
# X11R6 (on any platform) may need |
|
Lines 86-92
Link Here
|
| 86 |
|
94 |
|
| 87 |
# Define whether this platform has floating point hardware: |
95 |
# Define whether this platform has floating point hardware: |
| 88 |
# FPU_TYPE=2 means floating point is faster than fixed point. |
96 |
# FPU_TYPE=2 means floating point is faster than fixed point. |
| 89 |
@@ -292,27 +290,6 @@ |
97 |
@@ -298,27 +296,6 @@ |
| 90 |
|
98 |
|
| 91 |
FILE_IMPLEMENTATION=stdio |
99 |
FILE_IMPLEMENTATION=stdio |
| 92 |
|
100 |
|
|
Lines 114-120
Link Here
|
| 114 |
# ---------------------------- End of options --------------------------- # |
122 |
# ---------------------------- End of options --------------------------- # |
| 115 |
|
123 |
|
| 116 |
# Define the name of the partial makefile that specifies options -- |
124 |
# Define the name of the partial makefile that specifies options -- |
| 117 |
@@ -320,16 +297,10 @@ |
125 |
@@ -326,16 +303,10 @@ |
| 118 |
|
126 |
|
| 119 |
MAKEFILE=$(GLSRC)unix-gcc.mak |
127 |
MAKEFILE=$(GLSRC)unix-gcc.mak |
| 120 |
|
128 |
|
|
Lines 132-138
Link Here
|
| 132 |
CCAUX=$(CC) |
140 |
CCAUX=$(CC) |
| 133 |
#We can't use -fomit-frame-pointer with -pg.... |
141 |
#We can't use -fomit-frame-pointer with -pg.... |
| 134 |
#CC_LEAF=$(CC_) |
142 |
#CC_LEAF=$(CC_) |
| 135 |
@@ -350,7 +321,3 @@ |
143 |
@@ -356,7 +327,3 @@ |
| 136 |
include $(GLSRC)unixtail.mak |
144 |
include $(GLSRC)unixtail.mak |
| 137 |
include $(GLSRC)unix-end.mak |
145 |
include $(GLSRC)unix-end.mak |
| 138 |
include $(GLSRC)unixinst.mak |
146 |
include $(GLSRC)unixinst.mak |