mesa: use EXTRA_MODULES and SUBDIRS to build r300 compiler

This is a bit cleaner and avoids rebuilding the r300_dri.so library all
the time.

diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index defead6c6b1bb2848f2f77c67d3ee66b64d6c3fc..d2731aebae18603f9b8e9c5adc74072f60f501bd 100644 (file)
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -63,9 +63,11 @@ SHARED_INCLUDES = \
 default: symlinks subdirs depend $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
 
 
-$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
+$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) Makefile \
+               $(TOP)/src/mesa/drivers/dri/Makefile.template
        $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-               $(OBJECTS) $(PIPE_DRIVERS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
+               $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) \
+               $(DRI_LIB_DEPS)
 
 
 $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)

diff --git a/src/mesa/drivers/dri/r300/Makefile b/src/mesa/drivers/dri/r300/Makefile
index c64f940623f9539b2b787a394affd0b1e01f1d22..0e5b29b6850a86ee02df1dd649e142cb8a364146 100644 (file)
--- a/src/mesa/drivers/dri/r300/Makefile
+++ b/src/mesa/drivers/dri/r300/Makefile
@@ -69,7 +69,10 @@ DRIVER_DEFINES = -DRADEON_R300
 
 DRI_LIB_DEPS += $(RADEON_LDFLAGS)
 
-PIPE_DRIVERS =  compiler/libr300compiler.a
+SUBDIRS = compiler
+
+EXTRA_MODULES = compiler/libr300compiler.a
+
 
 ##### TARGETS #####
 
@@ -77,8 +80,3 @@ include ../Makefile.template
 
 symlinks:
 
-# Mark the archive phony so that we always check for recompilation
-.PHONY : compiler/libr300compiler.a
-
-compiler/libr300compiler.a:
-       cd compiler && $(MAKE)