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 9077418d9bd06357c43a21a7efeb8a590496de51..460ac2ac76b0341578e56224840f774e5c2cf147 100644 (file)
--- 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