--- h3/glide3/src/makefile.autoconf.am.orig	2000-10-27 06:20:00.000000000 -0500
+++ h3/glide3/src/makefile.autoconf.am	2011-03-06 14:46:41.000000000 -0600
@@ -103,3 +103,3 @@
 if GL_AMD3D
-GL_AMD3D_SRC = xtexdl_3dnow.S xdraw2_3dnow.S xdraw3_3dnow.S
+GL_AMD3D_SRC = xtexdl_3dnow.S xdraw2_3dnow.S xdraw3_3dnow.S xdraw2_def.S xdraw3_def.S
 endif
@@ -140,8 +140,8 @@
 #
-PREPROCESSOR=/lib/cpp -$$ -I.
-xdraw2.o : xdraw2.S xdraw2.inc.S fxgasm.h
-	$(CC) $(AFLAGS) -c -o $@ xdraw2.S
+PREPROCESSOR=$(CPP) -$$ -I.
+xdraw2.lo : xdraw2.S xdraw2.inc.S fxgasm.h
+	libtool --mode=compile $(CC) $(AFLAGS) -c -o $@ xdraw2.S
 
-xdraw3.o : xdraw3.S fxgasm.h
-	$(CC) $(AFLAGS) -c -o $@ xdraw3.S
+xdraw3.lo : xdraw3.S fxgasm.h
+	libtool --mode=compile $(CC) $(AFLAGS) -c -o $@ xdraw3.S
 
@@ -151,17 +151,16 @@
 if GL_AMD3D
-else
-xdraw2_def.o: xdraw2.S xdraw2.inc.S fxgasm.h
-	$(CC) $(AFLAGS) -c -o $@ xdraw2.S
+xdraw2_def.lo: xdraw2.S xdraw2.inc.S fxgasm.h
+	libtool --mode=compile $(CC) $(AFLAGS) -c -o $@ xdraw2.S
 
-xdraw2_3dnow.o: xdraw2.S xdraw2.inc.S fxgasm.h
-	$(CC) $(AFLAGS) -DGL_AMD3D -DUSE_PACKET_FIFO=1 -c -o $@ xdraw2.S
+xdraw2_3dnow.lo: xdraw2.S xdraw2.inc.S fxgasm.h
+	libtool --mode=compile $(CC) $(AFLAGS) -DGL_AMD3D -DUSE_PACKET_FIFO=1 -c -o $@ xdraw2.S
 
-xdraw3_def.o: xdraw3.S fxgasm.h
-	$(CC) $(AFLAGS) -c -o $@ xdraw3.S
+xdraw3_def.lo: xdraw3.S fxgasm.h
+	libtool --mode=compile $(CC) $(AFLAGS) -c -o $@ xdraw3.S
 
-xdraw3_3dnow.o: xdraw3.S fxgasm.h
-	$(CC) $(AFLAGS) -DGL_AMD3D -DUSE_PACKET_FIFO=1 -c -o $@ xdraw3.S
+xdraw3_3dnow.lo: xdraw3.S fxgasm.h
+	libtool --mode=compile $(CC) $(AFLAGS) -DGL_AMD3D -DUSE_PACKET_FIFO=1 -c -o $@ xdraw3.S
 
-xtexdl_3dnow.o: xtexdl.S fxgasm.h 
-	$(CC) $(AFLAGS) -DGL_AMD3D -DUSE_PACKET_FIFO=1 -c -o $@ xtexdl.S
+xtexdl_3dnow.lo: xtexdl.S fxgasm.h 
+	libtool --mode=compile $(CC) $(AFLAGS) -DGL_AMD3D -DUSE_PACKET_FIFO=1 -c -o $@ xtexdl.S
 
@@ -172,5 +171,5 @@
 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
@@ -214,3 +213,3 @@
              $(top_builddir)/@FX_GLIDE_HW@/minihwc/libminihwc.la
-LINK_LIBS  = -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm
+LINK_LIBS  = -L$(LOCALBASE)/lib -lX11 -lXext -lXxf86dga -lXxf86vm
 
@@ -224,2 +223,3 @@
 fxgasm_SOURCES         = fxgasm.c gthread.c
+fxgasm_CFLAGS          = $(AM_CFLAGS)