init mgaScreen->irq (Tilman Sauerbeck)

[mesa.git] / src / mesa / Makefile

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index d22701b122fa8fb955c0b30f384b8f86e60c6645..31f64c5f272c6812f125f06e3f17341662ba9c28 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -32,20 +32,21 @@ default:
 ######################################################################
 # Linux solo DRI drivers
 
-SOLO_SOURCES = \
+SOLO_C_SOURCES = \
        $(MAIN_SOURCES)         \
        $(MATH_SOURCES)         \
        $(ARRAY_CACHE_SOURCES)  \
        $(TNL_SOURCES)          \
        $(SWRAST_SOURCES)       \
        $(SWRAST_SETUP_SOURCES) \
-       $(ASM_C_SOURCES)        \
-       $(X86_SOURCES)
+       $(SHADER_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 drivers
+linux-solo: depend subdirs mesa.a driver-dirs
 
 # Make archive of core object files
 mesa.a:        $(SOLO_OBJECTS)
@@ -53,7 +54,10 @@ mesa.a:      $(SOLO_OBJECTS)
        ar rcv $@ $(SOLO_OBJECTS)
        ranlib $@
 
-drivers:
+# 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
 
 
@@ -140,6 +144,7 @@ ALL_SOURCES = \
        $(MATH_SOURCES)         \
        $(ARRAY_CACHE_SOURCES)  \
        $(TNL_SOURCES)          \
+       $(SHADER_SOURCES)       \
        $(SWRAST_SOURCES)       \
        $(SWRAST_SETUP_SOURCES) \
        $(ASM_C_SOURCES)        \
@@ -163,7 +168,7 @@ tags:
 
 clean:
        -rm -f */*.o
-       rm -f depend
+       rm -f depend mesa.a
        for dir in $(SUBDIRS) ; do \
                (cd $$dir ; make clean) ; \
        done