i915g: Remove unused cbuf_dirty.

[mesa.git] / Makefile

diff --git a/Makefile b/Makefile
index a1ab65ef0c4c59b2affc3a0f7dcfe92c6a827bc5..131e5787260d2c681a0bd47001aa8973ed6bfb1c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,10 @@ TOP = .
 SUBDIRS = src
 
 
+# The git command below generates an empty string when we're not
+# building in a GIT tree (i.e., building from a release tarball).
 default: $(TOP)/configs/current
+       @$(TOP)/bin/extract_git_sha1
        @for dir in $(SUBDIRS) ; do \
                if [ -d $$dir ] ; then \
                        (cd $$dir && $(MAKE)) || exit 1 ; \
@@ -197,8 +200,12 @@ MAIN_FILES = \
        $(DIRECTORY)/configure.ac                                       \
        $(DIRECTORY)/acinclude.m4                                       \
        $(DIRECTORY)/aclocal.m4                                         \
+       $(DIRECTORY)/SConstruct                                         \
+       $(DIRECTORY)/common.py                                          \
+       $(DIRECTORY)/scons/*py                                          \
        $(DIRECTORY)/bin/config.guess                                   \
        $(DIRECTORY)/bin/config.sub                                     \
+       $(DIRECTORY)/bin/extract_git_sha1                               \
        $(DIRECTORY)/bin/install-sh                                     \
        $(DIRECTORY)/bin/mklib                                          \
        $(DIRECTORY)/bin/minstall                                       \
@@ -223,17 +230,25 @@ MAIN_FILES = \
        $(DIRECTORY)/include/GL/vms_x_fix.h                             \
        $(DIRECTORY)/include/GL/wglext.h                                \
        $(DIRECTORY)/include/GL/wmesa.h                                 \
+       $(DIRECTORY)/include/pci_ids/*.h                                \
+       $(DIRECTORY)/include/c99/*.h                                    \
+       $(DIRECTORY)/src/getopt/SConscript                              \
+       $(DIRECTORY)/src/getopt/getopt*.[ch]                            \
        $(DIRECTORY)/src/glsl/Makefile                                  \
        $(DIRECTORY)/src/glsl/Makefile.template                         \
        $(DIRECTORY)/src/glsl/SConscript                                \
        $(DIRECTORY)/src/glsl/*.[ch]                                    \
+       $(DIRECTORY)/src/glsl/*.ll                                      \
+       $(DIRECTORY)/src/glsl/*.yy                                      \
        $(DIRECTORY)/src/glsl/*.[cly]pp                                 \
        $(DIRECTORY)/src/glsl/README                                    \
        $(DIRECTORY)/src/glsl/glcpp/*.[chly]                            \
        $(DIRECTORY)/src/glsl/glcpp/README                              \
        $(DIRECTORY)/src/glsl/builtins                                  \
        $(DIRECTORY)/src/Makefile                                       \
+       $(DIRECTORY)/src/SConscript                                     \
        $(DIRECTORY)/src/mesa/Makefile*                                 \
+       $(DIRECTORY)/src/mesa/SConscript                                \
        $(DIRECTORY)/src/mesa/sources.mak                               \
        $(DIRECTORY)/src/mesa/descrip.mms                               \
        $(DIRECTORY)/src/mesa/gl.pc.in                                  \
@@ -241,12 +256,12 @@ MAIN_FILES = \
        $(DIRECTORY)/src/mesa/depend                                    \
        $(MAIN_ES_FILES)                                                \
        $(DIRECTORY)/src/mesa/main/*.[chS]                              \
+       $(DIRECTORY)/src/mesa/main/*.cpp                                \
        $(DIRECTORY)/src/mesa/main/descrip.mms                          \
        $(DIRECTORY)/src/mesa/math/*.[ch]                               \
        $(DIRECTORY)/src/mesa/math/descrip.mms                          \
        $(DIRECTORY)/src/mesa/program/*.[chly]                          \
        $(DIRECTORY)/src/mesa/program/*.cpp                             \
-       $(DIRECTORY)/src/mesa/program/Makefile                          \
        $(DIRECTORY)/src/mesa/program/descrip.mms                       \
        $(DIRECTORY)/src/mesa/swrast/*.[ch]                             \
        $(DIRECTORY)/src/mesa/swrast/descrip.mms                        \
@@ -271,6 +286,9 @@ MAIN_FILES = \
        $(DIRECTORY)/src/mesa/drivers/osmesa/descrip.mms                \
        $(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def                 \
        $(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch]                     \
+       $(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/*.[ch]          \
+       $(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/Makefile        \
+       $(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/SConscript      \
        $(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch]                  \
        $(DIRECTORY)/src/mesa/drivers/windows/*/*.def                   \
        $(DIRECTORY)/src/mesa/drivers/x11/Makefile                      \
@@ -305,7 +323,10 @@ MAPI_FILES = \
        $(DIRECTORY)/src/mapi/mapi/mapi_abi.py                          \
        $(DIRECTORY)/src/mapi/mapi/sources.mak                          \
        $(DIRECTORY)/src/mapi/mapi/*.[ch]                               \
+       $(DIRECTORY)/src/mapi/shared-glapi/SConscript                   \
+       $(DIRECTORY)/src/mapi/shared-glapi/Makefile                     \
        $(DIRECTORY)/src/mapi/vgapi/Makefile                            \
+       $(DIRECTORY)/src/mapi/vgapi/SConscript                          \
        $(DIRECTORY)/src/mapi/vgapi/vgapi.csv                           \
        $(DIRECTORY)/src/mapi/vgapi/vg.pc.in
 
@@ -318,9 +339,22 @@ EGL_FILES = \
        $(DIRECTORY)/src/egl/*/*.[ch]                                   \
        $(DIRECTORY)/src/egl/*/*/Makefile                               \
        $(DIRECTORY)/src/egl/*/*/*.[ch]                                 \
+       $(DIRECTORY)/src/egl/wayland/wayland-drm/protocol/*.xml         \
+       $(DIRECTORY)/src/egl/wayland/wayland-egl/*.pc.in                \
+       $(DIRECTORY)/src/egl/main/SConscript                            \
        $(DIRECTORY)/src/egl/main/*.pc.in                               \
        $(DIRECTORY)/src/egl/main/*.def
 
+GBM_FILES = \
+       $(DIRECTORY)/src/gbm/Makefile                                   \
+       $(DIRECTORY)/src/gbm/main/*.pc.in                               \
+       $(DIRECTORY)/src/gbm/main/*.[ch]                                \
+       $(DIRECTORY)/src/gbm/main/Makefile                              \
+       $(DIRECTORY)/src/gbm/backends/Makefile                          \
+       $(DIRECTORY)/src/gbm/backends/Makefile.template                 \
+       $(DIRECTORY)/src/gbm/backends/*/*.[ch]                          \
+       $(DIRECTORY)/src/gbm/backends/*/Makefile                        \
+
 GALLIUM_FILES = \
        $(DIRECTORY)/src/mesa/state_tracker/*[ch]                       \
        $(DIRECTORY)/src/gallium/Makefile                               \
@@ -342,14 +376,17 @@ GALLIUM_FILES = \
        $(DIRECTORY)/src/gallium/*/*/*/*.[ch]                           \
        $(DIRECTORY)/src/gallium/*/*/*/*.py
 
+APPLE_DRI_FILES = \
+       $(DIRECTORY)/src/glx/apple/Makefile                             \
+       $(DIRECTORY)/src/glx/apple/*.[ch]
 
 DRI_FILES = \
        $(DIRECTORY)/include/GL/internal/dri_interface.h                \
        $(DIRECTORY)/include/GL/internal/sarea.h                        \
        $(DIRECTORY)/src/glx/Makefile                                   \
        $(DIRECTORY)/src/glx/*.[ch]                                     \
-       $(DIRECTORY)/src/mesa/drivers/dri/Makefile                      \
-       $(DIRECTORY)/src/mesa/drivers/dri/Makefile.template             \
+       $(APPLE_DRI_FILES)                                              \
+       $(DIRECTORY)/src/mesa/drivers/dri/Makefile*                     \
        $(DIRECTORY)/src/mesa/drivers/dri/dri.pc.in                     \
        $(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.po           \
        $(DIRECTORY)/src/mesa/drivers/dri/*/*.[chS]                     \
@@ -393,6 +430,7 @@ GLUT_FILES = \
        $(DIRECTORY)/include/GL/glut.h                  \
        $(DIRECTORY)/include/GL/glutf90.h               \
        $(DIRECTORY)/src/glut/glx/Makefile*             \
+       $(DIRECTORY)/src/glut/glx/SConscript            \
        $(DIRECTORY)/src/glut/glx/depend                \
        $(DIRECTORY)/src/glut/glx/glut.pc.in            \
        $(DIRECTORY)/src/glut/glx/*def                  \
@@ -414,6 +452,7 @@ LIB_FILES = \
        $(MAPI_FILES)           \
        $(ES_FILES)             \
        $(EGL_FILES)            \
+       $(GBM_FILES)            \
        $(GALLIUM_FILES)        \
        $(DRI_FILES)            \
        $(SGI_GLU_FILES)        \