diff options
| author | Brian Paul <[email protected]> | 2009-02-09 09:22:22 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-02-09 09:22:22 -0700 |
| commit | e97681c7f551a2a2a6bd5eff0f4192a870c816c0 (patch) | |
| tree | dff2bf0e6d22efb92af131f64be0621ed316977c /Makefile | |
| parent | 1a46c8a062aea59de5cf55881104489db5d609e5 (diff) | |
| parent | b907d4cd8fafe719b4f87d877562829548937485 (diff) | |
mesa: merge gallium-0.2 into gallium-master-merge
Merge commit 'origin/gallium-0.2' into gallium-master-merge
Conflicts:
Makefile
docs/relnotes-7.4.html
docs/relnotes.html
src/mesa/drivers/dri/i965/brw_wm.h
src/mesa/main/imports.c
src/mesa/main/mtypes.h
src/mesa/main/texcompress.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_save_draw.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -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 \ @@ -103,6 +104,8 @@ irix6-o32-static \ linux \ linux-alpha \ linux-alpha-static \ +linux-cell \ +linux-cell-debug \ linux-debug \ linux-directfb \ linux-dri \ @@ -111,6 +114,7 @@ linux-dri-x86 \ linux-dri-x86-64 \ linux-dri-ppc \ linux-dri-xcb \ +linux-egl \ linux-indirect \ linux-fbdev \ linux-glide \ @@ -118,12 +122,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 \ @@ -137,8 +143,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 \ |