File: swlibs-002-automake

package info (click to toggle)
glide 2002.04.10ds1-15
  • links: PTS, VCS
  • area: main
  • in suites: buster
  • size: 59,556 kB
  • sloc: ansic: 290,125; asm: 23,305; sh: 8,089; pascal: 3,854; makefile: 1,276; perl: 73
file content (126 lines) | stat: -rw-r--r-- 4,120 bytes parent folder | download | duplicates (6)
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
Status: applied

Index: b/swlibs/include/make/makefile.autoconf.bottom
===================================================================
--- a/swlibs/include/make/makefile.autoconf.bottom
+++ b/swlibs/include/make/makefile.autoconf.bottom
@@ -20,54 +20,25 @@
 ## $Revision: 1.2 $
 ## $Date: 2000/08/07 15:24:44 $
 ##
-#
+
 # Always set make, so that we get the right makefile.
 MAKE=@MAKE@
-#
-# Here we have global definitions.
-#
-#
-# Then we have compiler flag definitions.
-#
-CPPFLAGS  = $(GCPPFLAGS)  $(LCPPFLAGS)  $(VCPPFLAGS)
-DEFS      = $(GDEFS)      $(LDEFS)      $(VDEFS)
-INCLUDES  = $(GINCLUDES)  $(LINCLUDES)  $(VINCLUDES)
-CFLAGS    = $(GCFLAGS)    $(LCFLAGS)    $(VCFLAGS)
-
-AFLAGS    = $(GAFLAGS)    $(LAFLAGS)    $(VAFLAGS)
-ADEFS     = $(GADEFS)     $(LADEFS)     $(VADEFS)
-AINCLUDES = $(GAINCLUDES) $(LAINCLUDES) $(VAINCLUDES)
-AOPTS     = $(GAOPTS)     $(LAOPTS)     $(VAOPTS)
 
-########################################################################
-#
-# Compilation flags, options and includes
 #
-########################################################################
-#
-# Global CFLAGS
+# User Overrideable FLAGS
 #
+
 ifeq ("@GLIDE_DEBUG@","true")
-GLIDE_DEBUG_GCFLAGS = -g -O
-GLIDE_DEBUG_GDEFS = -DGDBG_INFO_ON -DGLIDE_DEBUG
+GLIDE_DEBUG_CFLAGS = -O
+GLIDE_DEBUG_CPPFLAGS = -DGDBG_INFO_ON -DGLIDE_DEBUG
 else
-GLIDE_DEBUG_GCFLAGS = -O6 -mcpu=i486
-GLIDE_DEBUG_GDEFS = -fomit-frame-pointer -funroll-loops \
-	                -fexpensive-optimizations -ffast-math -DBIG_OPT
+GLIDE_DEBUG_CFLAGS = -O6 -mcpu=i486 -fomit-frame-pointer -funroll-loops \
+                     -fexpensive-optimizations -ffast-math -DBIG_OPT
 endif
-GCFLAGS = $(GLIDE_DEBUG_GCFLAGS)
-#
-# Global DEFS
-#
-# This variable may require -DENDB.  The original Linux build
-# used it, but the Windows build didn't.  It seems to mean
-# Big Endian, which is not the case for the x86.  It is only
-# used in texus2 as far as I can see.
-#
-GDEFS=-DX11 $(GLIDE_DEBUG_GDEFS) -Wall
-#
-# Global INCLUDES
-#
+
+CFLAGS = -Wall -g $(GLIDE_DEBUG_CFLAGS)
+CPPFLAGS = @CPPFLAGS@ $(GLIDE_DEBUG_CPPFLAGS)
+
 ifeq ("@FX_GLIDE_HW@","cvg")
 CVG_VINCLUDES= -I$(top_srcdir)/init \
                -I$(top_srcdir)/cvg/glide3/src \
@@ -88,15 +59,16 @@ H5_VINCLUDES = -I$(top_srcdir)/h5/glide3
                -I$(top_srcdir)/h5/minihwc
 endif
 
-GINCLUDES = $(CVG_VINCLUDES) $(H3_VINCLUDES) $(H5_VINCLUDES) \
-			-I. \
+# This variable may require -DENDB.  The original Linux build
+# used it, but the Windows build didn't.  It seems to mean
+# Big Endian, which is not the case for the x86.  It is only
+# used in texus2 as far as I can see.
+
+AM_CPPFLAGS = -DX11 $(LDEFS) $(VDEFS) \
+            $(CVG_VINCLUDES) $(H3_VINCLUDES) $(H5_VINCLUDES) \
+            -I. \
             -I$(top_srcdir)/swlibs/fxmemmap \
             -I$(top_srcdir)/swlibs/fxmisc \
             -I$(top_srcdir)/swlibs/newpci/pcilib \
             -I$(top_srcdir)/swlibs/@TEXTURE_UTILITIES_DIR@/lib
 
-########################################################################
-#
-# Linker definitions
-#
-########################################################################
Index: b/swlibs/newpci/pcilib/makefile.autoconf.am
===================================================================
--- a/swlibs/newpci/pcilib/makefile.autoconf.am
+++ b/swlibs/newpci/pcilib/makefile.autoconf.am
@@ -20,12 +20,6 @@
 ## $Revision: 1.1 $
 ## $Date: 2000/07/27 02:39:18 $
 ##
-if GLIDE_DEBUG
-GLIDE_DEBUG_DEFS = -DGDBG_INFO_ON
-endif
-
-LDEFS            = $(GLIDE_DEBUG_DEFS)
-
 noinst_HEADERS         = fxpci.h sst1_pci.h pcilib.h
 noinst_LTLIBRARIES     = libfxpci.la
 libfxpci_la_SOURCES    = fxpci.c fxinfo.c fxmsr.c sst1_pci.c fxlinux.c
Index: b/swlibs/texus2/lib/makefile.autoconf.am
===================================================================
--- a/swlibs/texus2/lib/makefile.autoconf.am
+++ b/swlibs/texus2/lib/makefile.autoconf.am
@@ -25,7 +25,7 @@
 #
 
 if GLIDE_DEBUG
-DBGOPTS = -DHWC_DEBUG -g
+DBGOPTS = -DHWC_DEBUG
 endif
 LDEFS   = -DGLIDE_DIAGS -DHWC_CSIM -DGLIDE3 -DGLIDE3_ALPHA \
           -DGD_DEBUGGING -DGLIDE_SIMULATOR $(DBGOPTS)