3e4ed01146
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG - Remove X11BASE support in favor of LOCALBASE or PREFIX - Use USE_LDCONFIG instead of INSTALLS_SHLIB - Remove unneeded USE_GCC 3.4+ Thanks to all Helpers: Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr, ehaupt, nox, itetcu, flz, pav PR: 116263 Tested on: pointyhat Approved by: portmgr (pav)
76 lines
2.5 KiB
Text
76 lines
2.5 KiB
Text
--- h5/glide3/src/makefile.autoconf.am.orig Sun Nov 19 00:00:26 2000
|
|
+++ h5/glide3/src/makefile.autoconf.am Tue Dec 5 05:44:58 2006
|
|
@@ -152,46 +152,40 @@
|
|
#
|
|
# Special rules for assembly files.
|
|
#
|
|
-PREPROCESSOR=/lib/cpp -$$ -I.
|
|
+PREPROCESSOR=$(CPP) -$$ -I.
|
|
xdraw2_def.o xdraw2_def.lo: xdraw2.s xdraw2.inc.s fxgasm.h
|
|
$(PREPROCESSOR) $< > $*.tmp.s
|
|
- $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
|
|
- $(CP) $*.o $*.lo
|
|
+ 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
|
|
- $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
|
|
- $(CP) $*.o $*.lo
|
|
+ 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
|
|
- $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
|
|
- $(CP) $*.o $*.lo
|
|
+ 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
|
|
- $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
|
|
- $(CP) $*.o $*.lo
|
|
+ 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
|
|
- $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
|
|
- $(CP) $*.o $*.lo
|
|
+ libtool --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
|
|
$(RM) -f $*.tmp.s
|
|
|
|
if FX_GLIDE_C_CPU_DETECT
|
|
CPUSOURCES = cpudtect.c
|
|
else
|
|
-CPUSOURCES = cpudtect.s
|
|
+CPUSOURCES = cpudtect_asm.s
|
|
|
|
-cpudtect.o cpudtect.lo: cpudtect.s
|
|
+cpudtect_asm.o cpudtect_asm.lo: cpudtect.s
|
|
$(PREPROCESSOR) -DUSE_PACKET_FIFO=1 $< > $*.tmp.s
|
|
- $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
|
|
- $(CP) $*.o $*.lo
|
|
+ libtool --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
|
|
$(RM) -f $*.tmp.s
|
|
endif
|
|
|
|
@@ -202,7 +196,7 @@
|
|
FX_GLIDE_CTRISETUP_SRC = gxdraw.c
|
|
else
|
|
if GL_AMD3D
|
|
-FX_GLIDE_CTRISETUP_SRC = xdraw2_3dnow.s xdraw3_3dnow.s
|
|
+FX_GLIDE_CTRISETUP_SRC = xdraw2_3dnow.s xdraw3_3dnow.s xtexdl_3dnow.s xdraw2_def.s xdraw3_def.s
|
|
else
|
|
FX_GLIDE_CTRISETUP_SRC = xdraw2_def.s xdraw3_def.s
|
|
endif
|
|
@@ -214,7 +208,7 @@
|
|
$(top_builddir)/swlibs/newpci/pcilib/libfxpci.la \
|
|
$(top_builddir)/swlibs/$(TEXTURE_UTILITIES_DIR)/lib/libtexus.la \
|
|
$(top_builddir)/@FX_GLIDE_HW@/minihwc/libminihwc.la
|
|
-LINK_LIBS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lm
|
|
+LINK_LIBS = -L$(LOCALBASE)/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lm
|
|
|
|
CLEANFILES = fxinline.h fxgasm.h
|
|
|