fix GL_DOT3_RGBA texture combiner mode in generated fragment programs (bug #11030)

[mesa.git] / src / mesa / Makefile

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 3f65ecf5cc9df3fe0f3ef27069d9e4158b33c37b..6943219036df0e85d8e7be822490ef33b85bd08e 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -33,8 +33,8 @@ default:
                $(MAKE) beos ; \
        elif [ "$(DRIVER_DIRS)" = "directfb" ]; then \
                $(MAKE) directfb ; \
-       elif [ "$(DRIVER_DIRS)" = "fbdev" ]; then \
-               $(MAKE) fbdev ; \
+       elif [ "$(DRIVER_DIRS)" = "fbdev osmesa" ]; then \
+               $(MAKE) fbdev ; $(MAKE) osmesa-only ; \
        else \
                $(MAKE) stand-alone ; \
        fi
@@ -89,9 +89,7 @@ fbdev: $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) $(COMMON_DRIVER_OBJECTS)
 # Stand-alone Mesa libGL and libOSMesa
 STAND_ALONE_DRIVER_SOURCES = \
        $(COMMON_DRIVER_SOURCES) \
-       $(X11_DRIVER_SOURCES) \
-       $(GLIDE_DRIVER_SOURCES) \
-       $(SVGA_DRIVER_SOURCES)
+       $(X11_DRIVER_SOURCES)
 
 STAND_ALONE_DRIVER_OBJECTS = $(STAND_ALONE_DRIVER_SOURCES:.c=.o)
 
@@ -142,7 +140,7 @@ depend: $(ALL_SOURCES)
        @ echo "running $(MKDEP)"
        @ touch depend
        @$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \
-               > /dev/null 
+               > /dev/null 2>/dev/null
 
 
 subdirs:
@@ -178,9 +176,9 @@ clean:
        -rm -f */*/*.o
        -rm -f depend depend.bak libmesa.a
        -rm -f drivers/*/*.o
-       (cd drivers/dri ; $(MAKE) clean)
-       (cd x86 ; $(MAKE) clean)
-       (cd x86-64 ; $(MAKE) clean)
+       (cd drivers/dri && $(MAKE) clean)
+       (cd x86 && $(MAKE) clean)
+       (cd x86-64 && $(MAKE) clean)
 
 
 include depend