egl: Improve logging facility.

[android-x86/external-mesa.git] / Makefile

diff --git a/Makefile b/Makefile
index af1c528..201dfc6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,9 @@ realclean: clean
          -name depend -o -name depend.bak ')' -exec rm -f '{}' ';'
 
 
+distclean: realclean
+
+
 install:
        @for dir in $(SUBDIRS) ; do \
                if [ -d $$dir ] ; then \
@@ -45,7 +48,7 @@ install:
        done
 
 
-.PHONY: default doxygen clean realclean install linux-directfb-install
+.PHONY: default doxygen clean realclean distclean install linux-directfb-install
 
 # If there's no current configuration file
 $(TOP)/configs/current:
@@ -102,6 +105,8 @@ irix6-n32-static \
 irix6-o32 \
 irix6-o32-static \
 linux \
+mine \
+mine-dri \
 linux-alpha \
 linux-alpha-static \
 linux-cell \
@@ -124,6 +129,7 @@ linux-icc \
 linux-icc-static \
 linux-llvm \
 linux-osmesa \
+linux-osmesa-static \
 linux-osmesa16 \
 linux-osmesa16-static \
 linux-osmesa32 \
@@ -178,7 +184,7 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-VERSION=7.5-devel
+VERSION=7.7-devel
 DIRECTORY = Mesa-$(VERSION)
 LIB_NAME = MesaLib-$(VERSION)
 DEMO_NAME = MesaDemos-$(VERSION)
@@ -219,6 +225,7 @@ MAIN_FILES = \
        $(DIRECTORY)/include/GL/osmesa.h                                \
        $(DIRECTORY)/include/GL/svgamesa.h                              \
        $(DIRECTORY)/include/GL/vms_x_fix.h                             \
+       $(DIRECTORY)/include/GL/wglext.h                                \
        $(DIRECTORY)/include/GL/wmesa.h                                 \
        $(DIRECTORY)/src/Makefile                                       \
        $(DIRECTORY)/src/mesa/Makefile*                                 \
@@ -232,7 +239,8 @@ MAIN_FILES = \
        $(DIRECTORY)/src/mesa/glapi/*.[chS]                             \
        $(DIRECTORY)/src/mesa/math/*.[ch]                               \
        $(DIRECTORY)/src/mesa/math/descrip.mms                          \
-       $(DIRECTORY)/src/mesa/shader/*.[ch]                             \
+       $(DIRECTORY)/src/mesa/shader/*.[chly]                           \
+       $(DIRECTORY)/src/mesa/shader/Makefile                           \
        $(DIRECTORY)/src/mesa/shader/descrip.mms                        \
        $(DIRECTORY)/src/mesa/shader/grammar/*.[ch]                     \
        $(DIRECTORY)/src/mesa/shader/slang/*.[ch]                       \
@@ -297,7 +305,25 @@ MAIN_FILES = \
        $(DIRECTORY)/progs/util/sampleMakefile                          \
        $(DIRECTORY)/windows/VC8/
 
+ES_FILES = \
+       $(DIRECTORY)/include/GLES/*.h                                   \
+       $(DIRECTORY)/include/GLES2/*.h                                  \
+       $(DIRECTORY)/src/mesa/glapi/*.xml                               \
+       $(DIRECTORY)/src/mesa/glapi/*.py                                \
+       $(DIRECTORY)/src/mesa/glapi/*.dtd                               \
+       $(DIRECTORY)/src/mesa/es/glapi/Makefile                         \
+       $(DIRECTORY)/src/mesa/es/glapi/*.xml                            \
+       $(DIRECTORY)/src/mesa/es/glapi/*.py                             \
+       $(DIRECTORY)/src/mesa/es/state_tracker/*.[ch]                   \
+       $(DIRECTORY)/src/mesa/es/main/*.[ch]                            \
+       $(DIRECTORY)/src/mesa/es/main/*.py                              \
+       $(DIRECTORY)/src/mesa/es/main/*.txt                             \
+       $(DIRECTORY)/src/mesa/es/main/es*_special                       \
+       $(DIRECTORY)/src/mesa/es/Makefile                               \
+       $(DIRECTORY)/src/mesa/es/sources.mak                            \
+
 EGL_FILES = \
+       $(DIRECTORY)/include/EGL/*.h                                    \
        $(DIRECTORY)/src/egl/Makefile                                   \
        $(DIRECTORY)/src/egl/*/Makefile                                 \
        $(DIRECTORY)/src/egl/*/*.[ch]                                   \
@@ -316,10 +342,12 @@ GALLIUM_FILES = \
        $(DIRECTORY)/src/gallium/*/*/SConscript                         \
        $(DIRECTORY)/src/gallium/*/*/*.[ch]                             \
        $(DIRECTORY)/src/gallium/*/*/*.py                               \
+       $(DIRECTORY)/src/gallium/*/*/*.csv                              \
        $(DIRECTORY)/src/gallium/*/*/*/Makefile                         \
        $(DIRECTORY)/src/gallium/*/*/*/SConscript                       \
        $(DIRECTORY)/src/gallium/*/*/*/*.[ch]                           \
        $(DIRECTORY)/src/gallium/*/*/*/*.py                             \
+       $(DIRECTORY)/src/gallium/*/*/*/*/Makefile                       \
        $(DIRECTORY)/src/gallium/*/*/*/*/*.[ch]                         \
 
 
@@ -336,7 +364,9 @@ DRI_FILES = \
        $(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.[ch]         \
        $(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.po           \
        $(DIRECTORY)/src/mesa/drivers/dri/*/*.[chS]                     \
+       $(DIRECTORY)/src/mesa/drivers/dri/*/*/*.[chS]                   \
        $(DIRECTORY)/src/mesa/drivers/dri/*/Makefile                    \
+       $(DIRECTORY)/src/mesa/drivers/dri/*/*/Makefile                  \
        $(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile                    \
        $(DIRECTORY)/src/mesa/drivers/dri/*/server/*.[ch]
 
@@ -379,7 +409,17 @@ GLW_FILES = \
        $(DIRECTORY)/src/glw/glw.pc.in                  \
        $(DIRECTORY)/src/glw/depend
 
+GLEW_FILES = \
+       $(DIRECTORY)/include/GL/glew.h                  \
+       $(DIRECTORY)/include/GL/glxew.h                 \
+       $(DIRECTORY)/include/GL/wglew.h                 \
+       $(DIRECTORY)/src/glew/*.c                       \
+       $(DIRECTORY)/src/glew/Makefile                  \
+       $(DIRECTORY)/src/glew/SConscript                \
+       $(DIRECTORY)/src/glew/LICENSE.txt
+
 DEMO_FILES = \
+       $(GLEW_FILES)                                   \
        $(DIRECTORY)/progs/beos/*.cpp                   \
        $(DIRECTORY)/progs/beos/Makefile                \
        $(DIRECTORY)/progs/images/*.rgb                 \
@@ -395,7 +435,6 @@ DEMO_FILES = \
        $(DIRECTORY)/progs/osdemos/Makefile             \
        $(DIRECTORY)/progs/osdemos/*.c                  \
        $(DIRECTORY)/progs/xdemos/Makefile*             \
-       $(DIRECTORY)/progs/xdemos/descrip.mms           \
        $(DIRECTORY)/progs/xdemos/*.[chf]               \
        $(DIRECTORY)/progs/redbook/Makefile*            \
        $(DIRECTORY)/progs/redbook/README               \
@@ -407,13 +446,11 @@ DEMO_FILES = \
        $(DIRECTORY)/progs/glsl/*.c                     \
        $(DIRECTORY)/progs/glsl/*.frag                  \
        $(DIRECTORY)/progs/glsl/*.vert                  \
+       $(DIRECTORY)/progs/glsl/*.shtest                \
        $(DIRECTORY)/progs/windml/Makefile.ugl          \
        $(DIRECTORY)/progs/windml/*.c                   \
        $(DIRECTORY)/progs/windml/*.bmp                 \
        $(DIRECTORY)/progs/ggi/*.c                      \
-       $(DIRECTORY)/windows/VC6/progs/demos/*.dsp      \
-       $(DIRECTORY)/windows/VC6/progs/progs.dsw        \
-       $(DIRECTORY)/windows/VC7/progs/demos/*.vcproj   \
        $(DIRECTORY)/windows/VC7/progs/progs.sln
 
 GLUT_FILES = \
@@ -423,14 +460,11 @@ GLUT_FILES = \
        $(DIRECTORY)/src/glut/glx/depend                \
        $(DIRECTORY)/src/glut/glx/glut.pc.in            \
        $(DIRECTORY)/src/glut/glx/*def                  \
-       $(DIRECTORY)/src/glut/glx/descrip.mms           \
-       $(DIRECTORY)/src/glut/glx/mms_depend            \
        $(DIRECTORY)/src/glut/glx/*.[ch]                \
        $(DIRECTORY)/src/glut/beos/*.[ch]               \
        $(DIRECTORY)/src/glut/beos/*.cpp                \
        $(DIRECTORY)/src/glut/beos/Makefile             \
        $(DIRECTORY)/src/glut/dos/*.[ch]                \
-       $(DIRECTORY)/src/glut/dos/Makefile.DJ           \
        $(DIRECTORY)/src/glut/dos/PC_HW/*.[chS]         \
        $(DIRECTORY)/src/glut/ggi/*.[ch]                \
        $(DIRECTORY)/src/glut/ggi/Makefile              \
@@ -454,6 +488,7 @@ DEPEND_FILES = \
 
 LIB_FILES = \
        $(MAIN_FILES)           \
+       $(ES_FILES)             \
        $(EGL_FILES)            \
        $(GALLIUM_FILES)        \
        $(DRI_FILES)            \