Merge commit 'origin/master' into gallium-0.2

[mesa.git] / Makefile

diff --git a/Makefile b/Makefile
index 2e86d11738f6d8aaf51ea9b02ae2757062991667..52772381713f075d8ba0f061bb6c6443c6198464 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,8 @@ default: $(TOP)/configs/current
                fi \
        done
 
+all: default
+
 
 doxygen:
        cd doxygen && $(MAKE)
@@ -35,7 +37,6 @@ realclean: clean
          -name depend -o -name depend.bak ')' -exec rm -f '{}' ';'
 
 
-
 install:
        @for dir in $(SUBDIRS) ; do \
                if [ -d $$dir ] ; then \
@@ -107,6 +108,8 @@ irix6-o32-static \
 linux \
 linux-alpha \
 linux-alpha-static \
+linux-cell \
+linux-cell-debug \
 linux-debug \
 linux-directfb \
 linux-dri \
@@ -115,6 +118,7 @@ linux-dri-x86 \
 linux-dri-x86-64 \
 linux-dri-ppc \
 linux-dri-xcb \
+linux-egl \
 linux-indirect \
 linux-fbdev \
 linux-glide \
@@ -122,12 +126,14 @@ linux-ia64-icc \
 linux-ia64-icc-static \
 linux-icc \
 linux-icc-static \
+linux-llvm \
 linux-osmesa \
 linux-osmesa16 \
 linux-osmesa16-static \
 linux-osmesa32 \
 linux-ppc \
 linux-ppc-static \
+linux-profile \
 linux-solo \
 linux-solo-x86 \
 linux-solo-ia64 \
@@ -141,8 +147,10 @@ linux-x86-debug \
 linux-x86-32 \
 linux-x86-64 \
 linux-x86-64-debug \
+linux-x86-64-profile \
 linux-x86-64-static \
 linux-x86-glide \
+linux-x86-profile \
 linux-x86-static \
 netbsd \
 openbsd \
@@ -287,6 +295,8 @@ MAIN_FILES = \
        $(DIRECTORY)/src/mesa/drivers/x11/Makefile                      \
        $(DIRECTORY)/src/mesa/drivers/x11/descrip.mms                   \
        $(DIRECTORY)/src/mesa/drivers/x11/*.[ch]                        \
+       $(DIRECTORY)/src/mesa/drivers/glslcompiler/Makefile             \
+       $(DIRECTORY)/src/mesa/drivers/glslcompiler/glslcompiler.c       \
        $(DIRECTORY)/src/mesa/ppc/*.[ch]                                \
        $(DIRECTORY)/src/mesa/sparc/*.[chS]                             \
        $(DIRECTORY)/src/mesa/x86/Makefile                              \