projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
gallium: Use struct pipe_atomic for pipe refcounts.
[mesa.git] / Makefile
diff --git a/Makefile b/Makefile
index c92b4867f7eb88b6258b44dc4032f319490cb0b9..59f0a07a4802e52c50983339cfd97b1ea0a8d4e2 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 \
@@ -44,10 +45,6 @@ install:
        done
 
 
-# DirectFBGL module installation
-linux-directfb-install:
-       cd src/mesa/drivers/directfb && $(MAKE) install
-
 .PHONY: default doxygen clean realclean install linux-directfb-install
 
 # If there's no current configuration file
@@ -107,6 +104,8 @@ irix6-o32-static \
 linux \
 linux-alpha \
 linux-alpha-static \
+linux-cell \
+linux-cell-debug \
 linux-debug \
 linux-directfb \
 linux-dri \
@@ -115,6 +114,7 @@ linux-dri-x86 \
 linux-dri-x86-64 \
 linux-dri-ppc \
 linux-dri-xcb \
+linux-egl \
 linux-indirect \
 linux-fbdev \
 linux-glide \
@@ -122,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 \
@@ -141,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 \
@@ -174,10 +178,11 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-DIRECTORY = Mesa-7.1-rc4
-LIB_NAME = MesaLib-7.1-rc4
-DEMO_NAME = MesaDemos-7.1-rc4
-GLUT_NAME = MesaGLUT-7.1-rc4
+VERSION=7.5-devel
+DIRECTORY = Mesa-$(VERSION)
+LIB_NAME = MesaLib-$(VERSION)
+DEMO_NAME = MesaDemos-$(VERSION)
+GLUT_NAME = MesaGLUT-$(VERSION)
 
 MAIN_FILES = \
        $(DIRECTORY)/Makefile*                                          \
@@ -185,8 +190,6 @@ MAIN_FILES = \
        $(DIRECTORY)/configure.ac                                       \
        $(DIRECTORY)/acinclude.m4                                       \
        $(DIRECTORY)/aclocal.m4                                         \
-       $(DIRECTORY)/descrip.mms                                        \
-       $(DIRECTORY)/mms-config.                                        \
        $(DIRECTORY)/bin/config.guess                                   \
        $(DIRECTORY)/bin/config.sub                                     \
        $(DIRECTORY)/bin/install-sh                                     \
@@ -200,9 +203,7 @@ MAIN_FILES = \
        $(DIRECTORY)/docs/RELNOTES*                                     \
        $(DIRECTORY)/docs/*.spec                                        \
        $(DIRECTORY)/include/GL/internal/glcore.h                       \
-       $(DIRECTORY)/include/GL/amesa.h                                 \
        $(DIRECTORY)/include/GL/dmesa.h                                 \
-       $(DIRECTORY)/include/GL/fxmesa.h                                \
        $(DIRECTORY)/include/GL/ggimesa.h                               \
        $(DIRECTORY)/include/GL/gl.h                                    \
        $(DIRECTORY)/include/GL/glext.h                                 \
@@ -217,30 +218,24 @@ MAIN_FILES = \
        $(DIRECTORY)/include/GL/mglmesa.h                               \
        $(DIRECTORY)/include/GL/osmesa.h                                \
        $(DIRECTORY)/include/GL/svgamesa.h                              \
-       $(DIRECTORY)/include/GL/ugl*.h                                  \
        $(DIRECTORY)/include/GL/vms_x_fix.h                             \
+       $(DIRECTORY)/include/GL/wglext.h                                \
        $(DIRECTORY)/include/GL/wmesa.h                                 \
-       $(DIRECTORY)/include/GL/xmesa.h                                 \
-       $(DIRECTORY)/include/GL/xmesa_x.h                               \
-       $(DIRECTORY)/include/GL/xmesa_xf86.h                            \
-       $(DIRECTORY)/include/GLView.h                                   \
        $(DIRECTORY)/src/Makefile                                       \
-       $(DIRECTORY)/src/descrip.mms                                    \
        $(DIRECTORY)/src/mesa/Makefile*                                 \
-       $(DIRECTORY)/src/mesa/sources                                   \
+       $(DIRECTORY)/src/mesa/sources.mak                               \
        $(DIRECTORY)/src/mesa/descrip.mms                               \
        $(DIRECTORY)/src/mesa/gl.pc.in                                  \
+       $(DIRECTORY)/src/mesa/osmesa.pc.in                              \
        $(DIRECTORY)/src/mesa/depend                                    \
        $(DIRECTORY)/src/mesa/main/*.[chS]                              \
        $(DIRECTORY)/src/mesa/main/descrip.mms                          \
        $(DIRECTORY)/src/mesa/glapi/*.[chS]                             \
-       $(DIRECTORY)/src/mesa/glapi/descrip.mms                         \
        $(DIRECTORY)/src/mesa/math/*.[ch]                               \
        $(DIRECTORY)/src/mesa/math/descrip.mms                          \
        $(DIRECTORY)/src/mesa/shader/*.[ch]                             \
        $(DIRECTORY)/src/mesa/shader/descrip.mms                        \
        $(DIRECTORY)/src/mesa/shader/grammar/*.[ch]                     \
-       $(DIRECTORY)/src/mesa/shader/grammar/descrip.mms                \
        $(DIRECTORY)/src/mesa/shader/slang/*.[ch]                       \
        $(DIRECTORY)/src/mesa/shader/slang/descrip.mms                  \
        $(DIRECTORY)/src/mesa/shader/slang/library/*.[ch]               \
@@ -301,17 +296,35 @@ MAIN_FILES = \
        $(DIRECTORY)/progs/util/README                                  \
        $(DIRECTORY)/progs/util/*.[ch]                                  \
        $(DIRECTORY)/progs/util/sampleMakefile                          \
-       $(DIRECTORY)/vms/analyze_map.com                                \
-       $(DIRECTORY)/vms/xlib.opt                                       \
-       $(DIRECTORY)/vms/xlib_share.opt                                 \
-       $(DIRECTORY)/windows/VC8/mesa/mesa.sln                          \
-       $(DIRECTORY)/windows/VC8/mesa/gdi/gdi.vcproj                    \
-       $(DIRECTORY)/windows/VC8/mesa/glu/glu.vcproj                    \
-       $(DIRECTORY)/windows/VC8/mesa/mesa/mesa.vcproj                  \
-       $(DIRECTORY)/windows/VC8/mesa/osmesa/osmesa.vcproj              \
-       $(DIRECTORY)/windows/VC8/progs/progs.sln                        \
-       $(DIRECTORY)/windows/VC8/progs/demos/gears.vcproj               \
-       $(DIRECTORY)/windows/VC8/progs/glut/glut.vcproj
+       $(DIRECTORY)/windows/VC8/
+
+EGL_FILES = \
+       $(DIRECTORY)/include/EGL/*.h                                    \
+       $(DIRECTORY)/include/GLES/*.h                                   \
+       $(DIRECTORY)/include/GLES2/*.h                                  \
+       $(DIRECTORY)/src/egl/Makefile                                   \
+       $(DIRECTORY)/src/egl/*/Makefile                                 \
+       $(DIRECTORY)/src/egl/*/*.[ch]                                   \
+       $(DIRECTORY)/src/egl/*/*/Makefile                               \
+       $(DIRECTORY)/src/egl/*/*/*.[ch]                                 \
+
+GALLIUM_FILES = \
+       $(DIRECTORY)/src/mesa/state_tracker/*[ch]                       \
+       $(DIRECTORY)/src/gallium/Makefile                               \
+       $(DIRECTORY)/src/gallium/Makefile.template                      \
+       $(DIRECTORY)/src/gallium/SConscript                             \
+       $(DIRECTORY)/src/gallium/*/Makefile                             \
+       $(DIRECTORY)/src/gallium/*/SConscript                           \
+       $(DIRECTORY)/src/gallium/*/*/Makefile                           \
+       $(DIRECTORY)/src/gallium/*/*/Makefile.template                  \
+       $(DIRECTORY)/src/gallium/*/*/SConscript                         \
+       $(DIRECTORY)/src/gallium/*/*/*.[ch]                             \
+       $(DIRECTORY)/src/gallium/*/*/*.py                               \
+       $(DIRECTORY)/src/gallium/*/*/*/Makefile                         \
+       $(DIRECTORY)/src/gallium/*/*/*/SConscript                       \
+       $(DIRECTORY)/src/gallium/*/*/*/*.[ch]                           \
+       $(DIRECTORY)/src/gallium/*/*/*/*.py                             \
+       $(DIRECTORY)/src/gallium/*/*/*/*/*.[ch]                         \
 
 
 DRI_FILES = \
@@ -333,15 +346,12 @@ DRI_FILES = \
 
 SGI_GLU_FILES = \
        $(DIRECTORY)/src/glu/Makefile                                   \
-       $(DIRECTORY)/src/glu/descrip.mms                                \
        $(DIRECTORY)/src/glu/glu.pc.in                                  \
        $(DIRECTORY)/src/glu/sgi/Makefile                               \
        $(DIRECTORY)/src/glu/sgi/Makefile.mgw                           \
        $(DIRECTORY)/src/glu/sgi/Makefile.win                           \
-       $(DIRECTORY)/src/glu/sgi/Makefile.DJ                            \
        $(DIRECTORY)/src/glu/sgi/glu.def                                \
        $(DIRECTORY)/src/glu/sgi/dummy.cc                               \
-       $(DIRECTORY)/src/glu/sgi/descrip.mms                            \
        $(DIRECTORY)/src/glu/sgi/glu.exports                            \
        $(DIRECTORY)/src/glu/sgi/glu.exports.darwin                     \
        $(DIRECTORY)/src/glu/sgi/mesaglu.opt                            \
@@ -446,7 +456,13 @@ DEPEND_FILES = \
        $(TOP)/src/glu/sgi/depend
 
 
-LIB_FILES = $(MAIN_FILES) $(DRI_FILES) $(SGI_GLU_FILES) $(GLW_FILES)
+LIB_FILES = \
+       $(MAIN_FILES)           \
+       $(EGL_FILES)            \
+       $(GALLIUM_FILES)        \
+       $(DRI_FILES)            \
+       $(SGI_GLU_FILES)        \
+       $(GLW_FILES)
 
 
 # Everything for new a Mesa release: