mesa: Add scons files to distribution.

diff --git a/Makefile.am b/Makefile.am
index add10891918db376850450abcd0d150fb0ac4d3f..6f222b2774850187003ed2d93a5085a6071bca8b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,8 +29,11 @@ PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
 PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
 
 EXTRA_DIST = \
+       common.py \
        docs \
-       doxygen
+       doxygen \
+       scons \
+       SConstruct
 
 EXTRA_FILES = \
        aclocal.m4                                      \

diff --git a/src/Makefile.am b/src/Makefile.am
index 649dead349b076f0ffcb296d7fea0c9d8549d872..85b75a93b5eedc26cb012945b45ae97a0735061a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,4 +51,4 @@ if HAVE_GALLIUM
 SUBDIRS += gallium
 endif
 
-EXTRA_DIST = egl/docs getopt hgl
+EXTRA_DIST = egl/docs getopt hgl SConscript

diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index 818545dedf2b554e6937109b8e192c6eae118f78..6107ffe16eccee6d96386b6c364a9b40b29db4fa 100644 (file)
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -113,6 +113,7 @@ SUBDIRS += winsys/sw/wrapper
 
 EXTRA_DIST = \
        docs \
+       SConscript \
        winsys/sw/android \
        winsys/sw/gdi \
        winsys/sw/hgl

diff --git a/src/gallium/tests/unit/Makefile.am b/src/gallium/tests/unit/Makefile.am
index 9823a258787b99e901e98a91d17a44aca2bdad89..c9bede75bed8d01f7d68e857725488f438d108bb 100644 (file)
--- a/src/gallium/tests/unit/Makefile.am
+++ b/src/gallium/tests/unit/Makefile.am
@@ -2,6 +2,8 @@
 
 include $(top_srcdir)/src/gallium/Automake.inc
 
+EXTRA_DIST = SConscript
+
 AM_CFLAGS = \
        $(GALLIUM_CFLAGS)
 

diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index c3fe5f6b6a2bd272d0def40dc728f8e820f62562..7522f9f251a7f33df6cb059c2c07ee394b341200 100644 (file)
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -34,7 +34,8 @@ EXTRA_DIST = tests glcpp/tests README TODO            \
        glsl_lexer.ll                                   \
        glsl_parser.yy                                  \
        glcpp/glcpp-lex.l                               \
-       glcpp/glcpp-parse.y
+       glcpp/glcpp-parse.y                             \
+       SConscript
 
 include Makefile.sources
 

diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index b0b309e733ee5b2210ac2103a5426bd2c5fd3ca4..3ea1b30d7cfbde33ad70672ee229c44b46262cde 100644 (file)
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -26,6 +26,8 @@ endif
 
 SUBDIRS =
 
+EXTRA_DIST = SConscript
+
 if HAVE_XF86VIDMODE
 EXTRA_DEFINES_XF86VIDMODE = -DXF86VIDMODE
 endif

diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
index 6c5bd627d6f290720d6d8211c5a2c9cfb4d95795..c59663681bee6336211ca9f951fa89a402424a2f 100644 (file)
--- a/src/loader/Makefile.am
+++ b/src/loader/Makefile.am
@@ -21,6 +21,8 @@
 
 include Makefile.sources
 
+EXTRA_DIST = SConscript
+
 noinst_LTLIBRARIES = libloader.la
 
 libloader_la_CPPFLAGS = \

diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index 0f6ceb04628a9c1f9c436b90fa46a2b998a8fecb..77da6e7ebec1f7dce881048ec946e3f33703ee0d 100644 (file)
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -32,7 +32,10 @@ check_PROGRAMS =
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA =
 
-EXTRA_DIST = mapi_abi.py
+EXTRA_DIST = \
+       mapi_abi.py \
+       glapi/SConscript \
+       shared-glapi/SConscript
 
 AM_CFLAGS = $(PTHREAD_CFLAGS)
 AM_CPPFLAGS =                                                  \

diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
index 9d1b803ba73ac716d5b4994933799e4bc8d7bec1..e56b46e3dcaf2cacacf7ea13e72d096884780891 100644 (file)
--- a/src/mapi/glapi/gen/Makefile.am
+++ b/src/mapi/glapi/gen/Makefile.am
@@ -75,6 +75,7 @@ EXTRA_DIST= \
        glX_proto_size.py \
        glX_server_table.py \
        remap_helper.py \
+       SConscript \
        gl_API.dtd
 
 ######################################################################

diff --git a/src/mapi/vgapi/Makefile.am b/src/mapi/vgapi/Makefile.am
index c7e30acec2ae575ac58201e220677bb5cfa62bbb..45ef4b2d01a03b64401d99dc03a7066d58f46c30 100644 (file)
--- a/src/mapi/vgapi/Makefile.am
+++ b/src/mapi/vgapi/Makefile.am
@@ -54,7 +54,7 @@ vgapi_tmp.h: $(srcdir)/vgapi.csv $(top_srcdir)/src/mapi/mapi_abi.py
        $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(top_srcdir)/src/mapi/mapi_abi.py \
                --printer vgapi --mode lib $< > $@
 
-EXTRA_DIST = vgapi.csv
+EXTRA_DIST = SConscript vgapi.csv
 BUILT_SOURCES = vgapi_tmp.h
 CLEANFILES = $(BUILT_SOURCES)
 

diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 4345f22c7b27ab024d9d18895c85c79530df2083..4ee88365c8cbac040bfa07519662d8a913502b3b 100644 (file)
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -64,6 +64,7 @@ include Makefile.sources
 
 EXTRA_DIST = \
        drivers/haiku \
+       drivers/SConscript \
        main/format_info.py \
        main/format_parser.py \
        main/formats.csv \
@@ -71,6 +72,7 @@ EXTRA_DIST = \
        main/get_hash_params.py \
        program/program_lexer.l \
        program/program_parse.y \
+       SConscript \
        tnl_dd
 
 BUILT_SOURCES = \

diff --git a/src/mesa/drivers/dri/common/Makefile.am b/src/mesa/drivers/dri/common/Makefile.am
index a9d2744b78c4afeb2e36b1a12cffbf630ba684d1..af6f742a001d32d4036d6c2aecaf2a480ab11c17 100644 (file)
--- a/src/mesa/drivers/dri/common/Makefile.am
+++ b/src/mesa/drivers/dri/common/Makefile.am
@@ -23,7 +23,7 @@ SUBDIRS = xmlpool
 
 include Makefile.sources
 
-EXTRA_DIST = drirc xmlpool.h
+EXTRA_DIST = drirc xmlpool.h SConscript
 
 AM_CFLAGS = \
        -I$(top_srcdir)/include \

diff --git a/src/mesa/drivers/dri/common/xmlpool/Makefile.am b/src/mesa/drivers/dri/common/xmlpool/Makefile.am
index 926ec97cc1b4bbde45450aa3ea16e958d2d7c7c9..da7d03480fa9b8f736ad50ed839b493919135f24 100644 (file)
--- a/src/mesa/drivers/dri/common/xmlpool/Makefile.am
+++ b/src/mesa/drivers/dri/common/xmlpool/Makefile.am
@@ -52,7 +52,7 @@ POT=xmlpool.pot
 
 .PHONY: all clean pot po mo
 
-EXTRA_DIST = gen_xmlpool.py t_options.h $(POS)
+EXTRA_DIST = gen_xmlpool.py t_options.h $(POS) SConscript
 BUILT_SOURCES = options.h
 CLEANFILES = $(MOS) options.h
 

diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am
index ff9afb21312564a62681fc22096c6be30ce690bd..545290425c3bd905eb68c8142d7b65d7aa04ff5d 100644 (file)
--- a/src/mesa/drivers/osmesa/Makefile.am
+++ b/src/mesa/drivers/osmesa/Makefile.am
@@ -21,6 +21,8 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
+EXTRA_DIST = SConscript
+
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src \

diff --git a/src/mesa/drivers/x11/Makefile.am b/src/mesa/drivers/x11/Makefile.am
index 40b01dd1ef471bb9378d34fce3b11e124db59847..c91d8de4ac771a9700fbfa8acb5b1625716e770f 100644 (file)
--- a/src/mesa/drivers/x11/Makefile.am
+++ b/src/mesa/drivers/x11/Makefile.am
@@ -23,6 +23,8 @@
 # GLX extension.  All rendering is converted to Xlib calls.  No hardware
 # acceleration.
 
+EXTRA_DIST = SConscript
+
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/mapi \

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 53a273e4cd4310950dddcca7a71cdd782b1a1f86..0387f210c97eb5401c630878bdbef89f4bfa5e45 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -39,7 +39,7 @@ libmesautil_la_SOURCES = \
 
 BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES)
 CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = format_srgb.py
+EXTRA_DIST = format_srgb.py SConscript
 
 format_srgb.c: $(srcdir)/format_srgb.py
        $(AM_V_GEN) $(PYTHON2) $< > $@