remove more old stuff, insert new driver_subdir build rules (but not enabled yet)

1 files changed, 32 insertions, 18 deletions

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index d5866bb9f0b..726bb4b9d0a 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -6,11 +6,6 @@ include $(TOP)/configs/current
 include sources
 
 
-GL_MAJOR = 1
-GL_MINOR = 5
-GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
-
-
 .SUFFIXES : .cpp
 
 .c.o:
@@ -37,6 +32,7 @@ default: depend
 	  esac ; \
 	done
 
+# XXX replace this with new_install above someday
 install: default
 	@for driver in $(DRIVER_DIRS) ; do \
 	  case "$$driver" in \
@@ -51,6 +47,21 @@ install: default
 	done
 
 
+
+# default: build dependencies, then mesa subdirs, then convenience
+# libs (.a) and finally the device drivers:
+new_default: depend subdirs libmesa.a libglapi.a driver_subdirs
+
+
+driver_subdirs:
+	(cd drivers && $(MAKE))
+
+
+# this doesn't work yet but is probably the way to go in the future
+new_install:
+	(cd drivers && $(MAKE) install)
+
+
 ######################################################################
 # Helper libraries used by many drivers:
 
@@ -66,7 +77,6 @@ libglapi.a: $(GLAPI_OBJECTS)
 	@ $(TOP)/bin/mklib -o glapi -static $(GLAPI_OBJECTS)
 
 
-
 ######################################################################
 # BeOS driver target
 
@@ -110,15 +120,7 @@ directfb-driver: depend subdirs directfb-libgl
 
 
 ######################################################################
-# Generic stuff
-
-depend: $(ALL_SOURCES)
-	@ echo "running $(MKDEP)"
-	@ touch depend
-	@$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \
-		> /dev/null 2>/dev/null
-
-
+# Assembly subdirs
 subdirs:
 	@ if echo "$(ASM_FLAGS)" | grep -q USE_X86_ASM ; then \
 		(cd x86 && $(MAKE)) || exit 1 ; \
@@ -128,6 +130,20 @@ subdirs:
 		(cd x86-64 && $(MAKE)) || exit 1 ; \
 	fi
 
+
+######################################################################
+# Dependency generation
+
+depend: $(ALL_SOURCES)
+	@ echo "running $(MKDEP)"
+	@ touch depend
+	@$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \
+		> /dev/null 2>/dev/null
+
+
+######################################################################
+# Installation rules
+
 pcedit = sed \
 	-e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
 	-e 's,@LIB_DIR@,$(LIB_DIR),' \
@@ -156,15 +172,13 @@ install-osmesa: default
 install-dri:
 	cd drivers/dri && $(MAKE) install
 
-## NOT INSTALLED YET:
-## $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GLES
-## $(INSTALL) -m 644 include/GLES/*.h $(DESTDIR)$(INSTALL_DIR)/include/GLES
 
 
 # Emacs tags
 tags:
 	etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h
 
+
 clean:
 	-rm -f */*.o
 	-rm -f */*/*.o