projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
r300g: do not abort if a constant buffer is too large
[mesa.git] / Makefile
diff --git a/Makefile b/Makefile
index 4a81312046830ed00bc884de52bb37d52c1591c4..503f17ef9fac75e76ae18b1496dd2a63b394bf62 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -186,6 +186,14 @@ LIB_NAME = MesaLib-$(VERSION)
 DEMO_NAME = MesaDemos-$(VERSION)
 GLUT_NAME = MesaGLUT-$(VERSION)
 
+# This is part of MAIN_FILES
+MAIN_ES_FILES = \
+       $(DIRECTORY)/src/mesa/es/Makefile                               \
+       $(DIRECTORY)/src/mesa/es/sources.mak                            \
+       $(DIRECTORY)/src/mesa/main/*.xml                                \
+       $(DIRECTORY)/src/mesa/main/*.py                                 \
+       $(DIRECTORY)/src/mesa/main/*.dtd
+
 MAIN_FILES = \
        $(DIRECTORY)/Makefile*                                          \
        $(DIRECTORY)/configure                                          \
@@ -219,8 +227,6 @@ MAIN_FILES = \
        $(DIRECTORY)/include/GL/vms_x_fix.h                             \
        $(DIRECTORY)/include/GL/wglext.h                                \
        $(DIRECTORY)/include/GL/wmesa.h                                 \
-       $(DIRECTORY)/include/VG/*.h                                     \
-       $(DIRECTORY)/include/KHR/*.h                                    \
        $(DIRECTORY)/src/glsl/Makefile                                  \
        $(DIRECTORY)/src/glsl/Makefile.template                         \
        $(DIRECTORY)/src/glsl/SConscript                                \
@@ -233,9 +239,9 @@ MAIN_FILES = \
        $(DIRECTORY)/src/mesa/gl.pc.in                                  \
        $(DIRECTORY)/src/mesa/osmesa.pc.in                              \
        $(DIRECTORY)/src/mesa/depend                                    \
+       $(MAIN_ES_FILES)                                                \
        $(DIRECTORY)/src/mesa/main/*.[chS]                              \
        $(DIRECTORY)/src/mesa/main/descrip.mms                          \
-       $(DIRECTORY)/src/mesa/glapi/*.[chS]                             \
        $(DIRECTORY)/src/mesa/math/*.[ch]                               \
        $(DIRECTORY)/src/mesa/math/descrip.mms                          \
        $(DIRECTORY)/src/mesa/shader/*.[chly]                           \
@@ -243,7 +249,6 @@ MAIN_FILES = \
        $(DIRECTORY)/src/mesa/shader/descrip.mms                        \
        $(DIRECTORY)/src/mesa/shader/slang/*.[ch]                       \
        $(DIRECTORY)/src/mesa/shader/slang/descrip.mms                  \
-       $(DIRECTORY)/src/mesa/shader/slang/library/*.[ch]               \
        $(DIRECTORY)/src/mesa/shader/slang/library/*.gc                 \
        $(DIRECTORY)/src/mesa/shader/slang/library/Makefile             \
        $(DIRECTORY)/src/mesa/swrast/*.[ch]                             \
@@ -290,41 +295,51 @@ MAIN_FILES = \
        $(DIRECTORY)/progs/util/sampleMakefile                          \
        $(DIRECTORY)/windows/VC8/
 
-ES_FILES = \
+MAPI_FILES = \
        $(DIRECTORY)/include/GLES/*.h                                   \
        $(DIRECTORY)/include/GLES2/*.h                                  \
-       $(DIRECTORY)/src/mesa/glapi/gen/*.xml                           \
-       $(DIRECTORY)/src/mesa/glapi/gen/*.py                            \
-       $(DIRECTORY)/src/mesa/glapi/gen/*.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/*.xml                             \
-       $(DIRECTORY)/src/mesa/es/main/*.py                              \
-       $(DIRECTORY)/src/mesa/es/main/*.dtd                             \
-       $(DIRECTORY)/src/mesa/es/Makefile                               \
-       $(DIRECTORY)/src/mesa/es/sources.mak                            \
+       $(DIRECTORY)/include/VG/*.h                                     \
+       $(DIRECTORY)/src/mapi/es?api/Makefile                           \
+       $(DIRECTORY)/src/mapi/es?api/*.pc.in                            \
+       $(DIRECTORY)/src/mapi/glapi/gen/Makefile                        \
+       $(DIRECTORY)/src/mapi/glapi/gen/*.xml                           \
+       $(DIRECTORY)/src/mapi/glapi/gen/*.py                            \
+       $(DIRECTORY)/src/mapi/glapi/gen/*.dtd                           \
+       $(DIRECTORY)/src/mapi/glapi/gen-es/Makefile                     \
+       $(DIRECTORY)/src/mapi/glapi/gen-es/*.xml                        \
+       $(DIRECTORY)/src/mapi/glapi/gen-es/*.py                         \
+       $(DIRECTORY)/src/mapi/glapi/Makefile                            \
+       $(DIRECTORY)/src/mapi/glapi/SConscript                          \
+       $(DIRECTORY)/src/mapi/glapi/sources.mak                         \
+       $(DIRECTORY)/src/mapi/glapi/*.[chS]                             \
+       $(DIRECTORY)/src/mapi/mapi/mapi_abi.py                          \
+       $(DIRECTORY)/src/mapi/mapi/sources.mak                          \
+       $(DIRECTORY)/src/mapi/mapi/*.[ch]                               \
+       $(DIRECTORY)/src/mapi/vgapi/Makefile                            \
+       $(DIRECTORY)/src/mapi/vgapi/vgapi.csv                           \
+       $(DIRECTORY)/src/mapi/vgapi/vg.pc.in                            \
+       $(DIRECTORY)/src/mapi/vgapi/*.h
 
 EGL_FILES = \
+       $(DIRECTORY)/include/KHR/*.h                                    \
        $(DIRECTORY)/include/EGL/*.h                                    \
        $(DIRECTORY)/src/egl/Makefile                                   \
        $(DIRECTORY)/src/egl/*/Makefile                                 \
        $(DIRECTORY)/src/egl/*/Makefile.template                        \
        $(DIRECTORY)/src/egl/*/*.[ch]                                   \
        $(DIRECTORY)/src/egl/*/*/Makefile                               \
-       $(DIRECTORY)/src/egl/*/*/*.[ch]                                 \
+       $(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/targets/Makefile.dri                   \
+       $(DIRECTORY)/src/gallium/targets/Makefile.egl                   \
        $(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                               \
@@ -332,9 +347,7 @@ GALLIUM_FILES = \
        $(DIRECTORY)/src/gallium/*/*/*/Makefile                         \
        $(DIRECTORY)/src/gallium/*/*/*/SConscript                       \
        $(DIRECTORY)/src/gallium/*/*/*/*.[ch]                           \
-       $(DIRECTORY)/src/gallium/*/*/*/*.py                             \
-       $(DIRECTORY)/src/gallium/*/*/*/*/Makefile                       \
-       $(DIRECTORY)/src/gallium/*/*/*/*/*.[ch]                         \
+       $(DIRECTORY)/src/gallium/*/*/*/*.py
 
 
 DRI_FILES = \
@@ -379,15 +392,6 @@ SGI_GLU_FILES = \
        $(DIRECTORY)/src/glu/sgi/libtess/*.[ch]                         \
        $(DIRECTORY)/src/glu/sgi/libutil/*.[ch]
 
-MESA_GLU_FILES = \
-       $(DIRECTORY)/src/glu/mesa/README[12]            \
-       $(DIRECTORY)/src/glu/mesa/Makefile*             \
-       $(DIRECTORY)/src/glu/mesa/descrip.mms           \
-       $(DIRECTORY)/src/glu/mesa/mms_depend            \
-       $(DIRECTORY)/src/glu/mesa/*.def                 \
-       $(DIRECTORY)/src/glu/mesa/depend                \
-       $(DIRECTORY)/src/glu/mesa/*.[ch]
-
 GLW_FILES = \
        $(DIRECTORY)/src/glw/*.[ch]                     \
        $(DIRECTORY)/src/glw/Makefile*                  \
@@ -416,6 +420,18 @@ DEMO_FILES = \
        $(DIRECTORY)/progs/demos/*.cxx                  \
        $(DIRECTORY)/progs/demos/*.dat                  \
        $(DIRECTORY)/progs/demos/README                 \
+       $(DIRECTORY)/progs/egl/eglut/Makefile           \
+       $(DIRECTORY)/progs/egl/eglut/*.[ch]             \
+       $(DIRECTORY)/progs/egl/opengl/Makefile          \
+       $(DIRECTORY)/progs/egl/opengl/*.[ch]            \
+       $(DIRECTORY)/progs/egl/opengles1/Makefile       \
+       $(DIRECTORY)/progs/egl/opengles1/*.[ch]         \
+       $(DIRECTORY)/progs/egl/opengles2/Makefile       \
+       $(DIRECTORY)/progs/egl/opengles2/*.[ch]         \
+       $(DIRECTORY)/progs/egl/openvg/Makefile          \
+       $(DIRECTORY)/progs/egl/openvg/*.[ch]            \
+       $(DIRECTORY)/progs/egl/openvg/*/Makefile        \
+       $(DIRECTORY)/progs/egl/openvg/*/*.[ch]          \
        $(DIRECTORY)/progs/fbdev/Makefile               \
        $(DIRECTORY)/progs/fbdev/glfbdevtest.c          \
        $(DIRECTORY)/progs/objviewer/*.[ch]             \
@@ -450,11 +466,7 @@ GLUT_FILES = \
        $(DIRECTORY)/src/glut/glx/*.[ch]                \
        $(DIRECTORY)/src/glut/beos/*.[ch]               \
        $(DIRECTORY)/src/glut/beos/*.cpp                \
-       $(DIRECTORY)/src/glut/beos/Makefile             \
-       $(DIRECTORY)/src/glut/fbdev/Makefile            \
-       $(DIRECTORY)/src/glut/fbdev/*[ch]               \
-       $(DIRECTORY)/src/glut/mini/*[ch]                \
-       $(DIRECTORY)/src/glut/mini/glut.pc.in           \
+       $(DIRECTORY)/src/glut/beos/Makefile
 
 DEPEND_FILES = \
        $(TOP)/src/mesa/depend          \
@@ -466,6 +478,7 @@ DEPEND_FILES = \
 
 LIB_FILES = \
        $(MAIN_FILES)           \
+       $(MAPI_FILES)           \
        $(ES_FILES)             \
        $(EGL_FILES)            \
        $(GALLIUM_FILES)        \