Remove empty r128_vb.h.

[mesa.git] / src / mesa / Makefile

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index e61499609edeb135ac7fed9c1edd51249add2660..b4819090d574364974032d0a9878c306b254b27e 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -21,40 +21,52 @@ GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 # Figure out what to make here
 default:
        @if [ "${DRIVER_DIRS}" = "dri" ] ; then \
-               make linux-solo ; \
+               $(MAKE) linux-solo ; \
        elif [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
-               make osmesa-only ; \
+               $(MAKE) osmesa-only ; \
+       elif [ "$(DRIVER_DIRS)" = "beos" ]; then \
+               $(MAKE) beos ; \
        else \
-               make stand-alone ; \
+               $(MAKE) stand-alone ; \
        fi
 
+# BeOS driver target
+beos: depend subdirs mesa.a
+       cd drivers/beos; $(MAKE)
+
 
 ######################################################################
 # 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)
-
-SOLO_OBJECTS = $(SOLO_SOURCES:.c=.o)
+       $(SHADER_SOURCES)       \
+       $(ASM_C_SOURCES)        
 
+SOLO_OBJECTS = $(SOLO_C_SOURCES:.c=.o) \
+               $(ASM_SOURCES:.S=.o)
 
-linux-solo: depend mesa.a drivers
+linux-solo: depend subdirs mesa.a drivers-dri
 
 # Make archive of core object files
 mesa.a:        $(SOLO_OBJECTS)
        rm -f $@
        ar rcv $@ $(SOLO_OBJECTS)
        ranlib $@
+       @if [ "${CONFIG_NAME}" = "beos" ] ; then \
+               mimeset -f "$@" ; \
+       fi
 
-drivers:
-       cd drivers/dri ; make
+# 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...
+drivers-dri:
+       cd drivers/dri ; $(MAKE)
 
 
 ######################################################################
@@ -91,31 +103,28 @@ OSMESA16_OBJECTS = \
        $(OSMESA_DRIVER_OBJECTS)
 
 
-
 stand-alone: depend subdirs $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(OSMESA_LIB_NAME)
 
 osmesa-only: depend subdirs $(LIB_DIR)/$(OSMESA_LIB_NAME)
 
 subdirs:
-       @pushd x86 ; \
-       make ; \
-       popd
+       @ (cd x86 ; $(MAKE))
 
 # Make the GL library
 $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
-       $(TOP)/bin/mklib -o $(GL_LIB) -major $(GL_MAJOR) \
+       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 \
-               $(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 $(MESA_TINY) \
                        -install $(LIB_DIR) $(MKLIB_OPTIONS) \
                        $(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \
        else \
-               $(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) ; \
@@ -142,6 +151,7 @@ ALL_SOURCES = \
        $(MATH_SOURCES)         \
        $(ARRAY_CACHE_SOURCES)  \
        $(TNL_SOURCES)          \
+       $(SHADER_SOURCES)       \
        $(SWRAST_SOURCES)       \
        $(SWRAST_SETUP_SOURCES) \
        $(ASM_C_SOURCES)        \
@@ -156,7 +166,8 @@ SUBDIRS = array_cache drivers/dri glapi main math sparc swrast swrast_setup \
 # Update dependencies
 depend: $(ALL_SOURCES)
        touch depend
-       makedepend -fdepend -Y $(INCLUDE_DIRS) $(ALL_SOURCES) >& /dev/null
+       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(ALL_SOURCES) \
+               > /dev/null 2>&1
 
 
 # Emacs tags
@@ -165,10 +176,8 @@ tags:
 
 clean:
        -rm -f */*.o
-       for dir in $(SUBDIRS) ; do \
-               pushd $$dir ; \
-               make clean ; \
-               popd ; \
-       done
+       -rm -f depend mesa.a
+       -rm -f drivers/*/*.o
+       (cd drivers/dri ; $(MAKE) clean)
 
 include depend