From: Keith Whitwell <keith@tungstengraphics.com>
Date: Wed, 14 Apr 2004 10:26:47 +0000 (+0000)
Subject: Don't try to use .c=.o rule on .S files when building mesa.a
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=00e01091ceeb7f2d9e81962a7e0e57077e4d37f7;p=mesa.git

Don't try to use .c=.o rule on .S files when building mesa.a
---

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 9077418d9bd..460ac2ac76b 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -32,7 +32,7 @@ default:
 ######################################################################
 # Linux solo DRI drivers
 
-SOLO_SOURCES = \
+SOLO_C_SOURCES = \
 	$(MAIN_SOURCES)		\
 	$(MATH_SOURCES)		\
 	$(ARRAY_CACHE_SOURCES)	\
@@ -40,10 +40,10 @@ SOLO_SOURCES = \
 	$(SWRAST_SOURCES)	\
 	$(SWRAST_SETUP_SOURCES)	\
 	$(SHADER_SOURCES)       \
-	$(ASM_C_SOURCES)	\
-	$(X86_SOURCES)
+	$(ASM_C_SOURCES)	
 
-SOLO_OBJECTS = $(SOLO_SOURCES:.c=.o)
+SOLO_OBJECTS = $(SOLO_C_SOURCES:.c=.o) \
+		$(ASM_SOURCES:.S=.o)
 
 
 linux-solo: depend mesa.a driver-dirs
@@ -54,6 +54,9 @@ mesa.a:	$(SOLO_OBJECTS)
 	ar rcv $@ $(SOLO_OBJECTS)
 	ranlib $@
 
+# note: cannot use the name of the directory ("drivers") as the
+# target, otherwise make will look & see that the "drivers" directory
+# already exists, so not try to rebuild it...
 driver-dirs:
 	cd drivers/dri ; make