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
|
Author: Guillem Jover <guillem@hadrons.org>
Description: Use the build tree libtool instead of the system one
The libtool binary was moved from the libtool package to libtool-bin.
Bug-Debian: #769263
Origin: vendor
Forwarded: not-needed
---
glide3x/h3/glide3/src/makefile.autoconf.am | 18 ++++++++++--------
glide3x/h5/glide3/src/makefile.autoconf.am | 13 +++++++------
2 files changed, 17 insertions(+), 14 deletions(-)
--- a/glide3x/h3/glide3/src/makefile.autoconf.am
+++ b/glide3x/h3/glide3/src/makefile.autoconf.am
@@ -130,32 +130,34 @@ LDEFS = -DGLIDE_INIT_HWC \
# Special rules for assembly files.
#
+LIBTOOL = @LIBTOOL@
+
CPPASFLAGS = -x assembler-with-cpp -I.
xdraw2.lo : xdraw2.S xdraw2.inc.S fxgasm.h
- libtool --mode=compile $(CCAS) $(CCASFLAGS) $(CPPASFLAGS) -c -o $@ $<
+ $(LIBTOOL) --mode=compile $(CCAS) $(CCASFLAGS) $(CPPASFLAGS) -c -o $@ $<
xdraw3.lo : xdraw3.S fxgasm.h
- libtool --mode=compile $(CCAS) $(CCASFLAGS) $(CPPASFLAGS) -c -o $@ $<
+ $(LIBTOOL) --mode=compile $(CCAS) $(CCASFLAGS) $(CPPASFLAGS) -c -o $@ $<
# 3DNow!(tm) dependencies
# XXX_def.obj targets are the default targets
if GL_AMD3D
xdraw2_def.lo: xdraw2.S xdraw2.inc.S fxgasm.h
- libtool --mode=compile $(CCAS) $(CCASFLAGS) $(CPPASFLAGS) -c -o $@ $<
+ $(LIBTOOL) --mode=compile $(CCAS) $(CCASFLAGS) $(CPPASFLAGS) -c -o $@ $<
xdraw2_3dnow.lo: xdraw2.S xdraw2.inc.S fxgasm.h
- libtool --mode=compile $(CCAS) $(CCASFLAGS) $(CPPASFLAGS) -DGL_AMD3D -DUSE_PACKET_FIFO=1 -c -o $@ $<
+ $(LIBTOOL) --mode=compile $(CCAS) $(CCASFLAGS) $(CPPASFLAGS) -DGL_AMD3D -DUSE_PACKET_FIFO=1 -c -o $@ $<
xdraw3_def.lo: xdraw3.S fxgasm.h
- libtool --mode=compile $(CCAS) $(CCASFLAGS) $(CPPASFLAGS) -c -o $@ $<
+ $(LIBTOOL) --mode=compile $(CCAS) $(CCASFLAGS) $(CPPASFLAGS) -c -o $@ $<
xdraw3_3dnow.lo: xdraw3.S fxgasm.h
- libtool --mode=compile $(CCAS) $(CCASFLAGS) $(CPPASFLAGS) -DGL_AMD3D -DUSE_PACKET_FIFO=1 -c -o $@ $<
+ $(LIBTOOL) --mode=compile $(CCAS) $(CCASFLAGS) $(CPPASFLAGS) -DGL_AMD3D -DUSE_PACKET_FIFO=1 -c -o $@ $<
xtexdl_3dnow.lo: xtexdl.S fxgasm.h
- libtool --mode=compile $(CCAS) $(CCASFLAGS) $(CPPASFLAGS) -DGL_AMD3D -DUSE_PACKET_FIFO=1 -c -o $@ $<
+ $(LIBTOOL) --mode=compile $(CCAS) $(CCASFLAGS) $(CPPASFLAGS) -DGL_AMD3D -DUSE_PACKET_FIFO=1 -c -o $@ $<
endif
@@ -165,7 +167,7 @@ cpudtect.o cpudtect.lo: cpu_alpha.c
else
CPUSOURCES = cpudtect.S
cpudtect.o cpudtect.lo: cpudtect.S
- libtool --mode=compile $(CCAS) $(CCASFLAGS) $(CPPASFLAGS) -DUSE_PACKET_FIFO=1 -c -o $@ $<
+ $(LIBTOOL) --mode=compile $(CCAS) $(CCASFLAGS) $(CPPASFLAGS) -DUSE_PACKET_FIFO=1 -c -o $@ $<
endif
if DRI_BUILD
--- a/glide3x/h5/glide3/src/makefile.autoconf.am
+++ b/glide3x/h5/glide3/src/makefile.autoconf.am
@@ -152,30 +152,31 @@ LDEFS = -DGLIDE_LIB -DGLIDE3 -DGLIDE3_AL
#
# Special rules for assembly files.
#
+LIBTOOL = @LIBTOOL@
PREPROCESSOR=$(CPP) -x assembler-with-cpp -I.
xdraw2_def.o xdraw2_def.lo: xdraw2.s xdraw2.inc.s fxgasm.h
$(PREPROCESSOR) $< > $*.tmp.s
- libtool --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
+ $(LIBTOOL) --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
$(RM) -f $*.tmp.s
xdraw2_3dnow.o xdraw2_3dnow.lo: xdraw2.s xdraw2.inc.s fxgasm.h
$(PREPROCESSOR) -DGL_AMD3D -DUSE_PACKET_FIFO=1 $< > $*.tmp.s
- libtool --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
+ $(LIBTOOL) --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
$(RM) -f $*.tmp.s
xdraw3_def.o xdraw3_def.lo: xdraw3.s fxgasm.h
$(PREPROCESSOR) $< > $*.tmp.s
- libtool --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
+ $(LIBTOOL) --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
$(RM) -f $*.tmp.s
xdraw3_3dnow.o xdraw3_3dnow.lo: xdraw3.s fxgasm.h
$(PREPROCESSOR) -DGL_AMD3D -DUSE_PACKET_FIFO=1 $< > $*.tmp.s
- libtool --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
+ $(LIBTOOL) --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
$(RM) -f $*.tmp.s
xtexdl_3dnow.o xtexdl_3dnow.lo: xtexdl.s fxgasm.h
$(PREPROCESSOR) -DGL_AMD3D -DUSE_PACKET_FIFO=1 $< > $*.tmp.s
- libtool --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
+ $(LIBTOOL) --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
$(RM) -f $*.tmp.s
if FX_GLIDE_C_CPU_DETECT
@@ -185,7 +186,7 @@ else
CPUSOURCES = cpudtect.s
cpudtect.o cpudtect.lo: cpudtect.s
$(PREPROCESSOR) -DUSE_PACKET_FIFO=1 $< > $*.tmp.s
- libtool --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
+ $(LIBTOOL) --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
$(RM) -f $*.tmp.s
endif
|
