summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am5
-rw-r--r--src/Makefile.am2
-rw-r--r--src/gallium/Makefile.am1
-rw-r--r--src/gallium/tests/unit/Makefile.am2
-rw-r--r--src/glsl/Makefile.am3
-rw-r--r--src/glx/Makefile.am2
-rw-r--r--src/loader/Makefile.am2
-rw-r--r--src/mapi/Makefile.am5
-rw-r--r--src/mapi/glapi/gen/Makefile.am1
-rw-r--r--src/mapi/vgapi/Makefile.am2
-rw-r--r--src/mesa/Makefile.am2
-rw-r--r--src/mesa/drivers/dri/common/Makefile.am2
-rw-r--r--src/mesa/drivers/dri/common/xmlpool/Makefile.am2
-rw-r--r--src/mesa/drivers/osmesa/Makefile.am2
-rw-r--r--src/mesa/drivers/x11/Makefile.am2
-rw-r--r--src/util/Makefile.am2
16 files changed, 29 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index add10891918..6f222b27748 100644
--- 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 649dead349b..85b75a93b5e 100644
--- 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 818545dedf2..6107ffe16ec 100644
--- 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 9823a258787..c9bede75bed 100644
--- 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 c3fe5f6b6a2..7522f9f251a 100644
--- 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 b0b309e733e..3ea1b30d7cf 100644
--- 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 6c5bd627d6f..c59663681be 100644
--- 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 0f6ceb04628..77da6e7ebec 100644
--- 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 9d1b803ba73..e56b46e3dca 100644
--- 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 c7e30acec2a..45ef4b2d01a 100644
--- 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 4345f22c7b2..4ee88365c8c 100644
--- 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 a9d2744b78c..af6f742a001 100644
--- 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 926ec97cc1b..da7d03480fa 100644
--- 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 ff9afb21312..545290425c3 100644
--- 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 40b01dd1ef4..c91d8de4ac7 100644
--- 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 53a273e4cd4..0387f210c97 100644
--- 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) $< > $@