Enable code to compute other constants that were used by R200 code.

[mesa.git] / src / mesa / Makefile

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 42e05ada269c70bec1bc9e906324ca73b1847446..4672ace65e54cba36854c2ff283d9f2fd19794bd 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -33,7 +33,8 @@ default:
 # BeOS driver target
 beos: depend subdirs mesa.a
        cd drivers/beos; $(MAKE)
-       
+
+
 ######################################################################
 # Linux solo DRI drivers
 
@@ -111,19 +112,22 @@ subdirs:
 
 # Make the GL library
 $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
-       CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GL_LIB) -major $(GL_MAJOR) \
-               -minor $(GL_MINOR) -patch $(GL_TINY) -install $(LIB_DIR) \
+       @ CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GL_LIB) \
+               -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
+               -install $(LIB_DIR) \
                $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS)
 
 # Make the OSMesa library
 $(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)
-       if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
-               CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(OSMESA_LIB) -major $(MESA_MAJOR) \
+       @ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
+               CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(OSMESA_LIB) \
+                       -major $(MESA_MAJOR) \
                        -minor $(MESA_MINOR) -patch $(MESA_TINY) \
                        -install $(LIB_DIR) $(MKLIB_OPTIONS) \
                        $(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \
        else \
-               CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(OSMESA_LIB) -major $(MESA_MAJOR) \
+               CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(OSMESA_LIB) \
+                       -major $(MESA_MAJOR) \
                        -minor $(MESA_MINOR) -patch $(GL_TINY) \
                        -install $(LIB_DIR) $(MKLIB_OPTIONS) \
                        $(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \
@@ -155,7 +159,9 @@ ALL_SOURCES = \
        $(SWRAST_SETUP_SOURCES) \
        $(ASM_C_SOURCES)        \
        $(X86_SOURCES)          \
-       $(COMMON_DRIVER_SOURCES)
+       $(COMMON_DRIVER_SOURCES)\
+       $(X11_DRIVER_SOURCES)   \
+       $(OSMESA_DRIVER_SOURCES)
 
 
 SUBDIRS = array_cache drivers/dri glapi main math sparc swrast swrast_setup \
@@ -164,20 +170,20 @@ SUBDIRS = array_cache drivers/dri glapi main math sparc swrast swrast_setup \
 
 # Update dependencies
 depend: $(ALL_SOURCES)
-       touch depend
-       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(ALL_SOURCES) \
-               > /dev/null 2>&1
+       @ echo "running $(MKDEP)"
+       @ touch depend
+       $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \
+               > /dev/null 
 
 
 # Emacs tags
 tags:
-       etags `find . -name \*.[ch]` `find ../include`
+       etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h
 
 clean:
        -rm -f */*.o
-       rm -f depend mesa.a
-       for dir in $(SUBDIRS) ; do \
-               (cd $$dir ; $(MAKE) clean) ; \
-       done
+       -rm -f depend depend.bak mesa.a
+       -rm -f drivers/*/*.o
+       (cd drivers/dri ; $(MAKE) clean)
 
 include depend