Merge remote-tracking branch 'origin/master' into pipe-video

[mesa.git] / Makefile

diff --git a/Makefile b/Makefile
index a1ab65ef0c4c59b2affc3a0f7dcfe92c6a827bc5..fd23b300818dce3cc62e0cdac7d51aa85a67781f 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,23 @@ MAIN_FILES = \
        $(DIRECTORY)/include/GL/vms_x_fix.h                             \
        $(DIRECTORY)/include/GL/wglext.h                                \
        $(DIRECTORY)/include/GL/wmesa.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 +254,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 +284,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 +321,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,6 +337,7 @@ EGL_FILES = \
        $(DIRECTORY)/src/egl/*/*.[ch]                                   \
        $(DIRECTORY)/src/egl/*/*/Makefile                               \
        $(DIRECTORY)/src/egl/*/*/*.[ch]                                 \
+       $(DIRECTORY)/src/egl/main/SConscript                            \
        $(DIRECTORY)/src/egl/main/*.pc.in                               \
        $(DIRECTORY)/src/egl/main/*.def
 
@@ -393,6 +413,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                  \