gallium: Remove Android files from distribution.

Android builds Mesa from git, so there don't need to be in the tarball.

diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index d9462cb116ee6a766d817aa4b109c5737c4c23e9..07d26684e7e2acaabdae2a1f3392ed9be67a575d 100644 (file)
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -115,7 +115,6 @@ EXTRA_DIST = \
        docs \
        README.portability \
        SConscript \
-       winsys/sw/android \
        winsys/sw/gdi \
        winsys/sw/hgl
 

diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index dda51004e2fb8687df21d923c3fec5635899d0ea..1053ce4ee1a538004e61d6fac4f9264e6cf34006 100644 (file)
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -74,7 +74,7 @@ libgalliumvl_la_SOURCES = \
 endif
 
 EXTRA_DIST = \
-       Android.mk SConscript \
+       SConscript \
        indices/u_indices.c \
        indices/u_unfilled_indices.c \
        indices/u_indices_gen.py \

diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am
index df00add1cb05a251da4e82664cfa094852e8c6f0..aae2a2458edf73d0aa519f1c1057e82aeafed8bc 100644 (file)
--- a/src/gallium/drivers/freedreno/Makefile.am
+++ b/src/gallium/drivers/freedreno/Makefile.am
@@ -29,5 +29,3 @@ ir3_compiler_LDADD = \
        $(top_builddir)/src/util/libmesautil.la \
        $(GALLIUM_COMMON_LIB_DEPS) \
        $(FREEDRENO_LIBS)
-
-EXTRA_DIST = Android.mk

diff --git a/src/gallium/drivers/i915/Makefile.am b/src/gallium/drivers/i915/Makefile.am
index 7480df6ee51cf295d4fbdab18f1830af34d0293e..eb3c964a37bf008208166b51bfdb394ab42ff9de 100644 (file)
--- a/src/gallium/drivers/i915/Makefile.am
+++ b/src/gallium/drivers/i915/Makefile.am
@@ -30,4 +30,4 @@ noinst_LTLIBRARIES = libi915.la
 
 libi915_la_SOURCES = $(C_SOURCES)
 
-EXTRA_DIST = Android.mk TODO
+EXTRA_DIST = TODO

diff --git a/src/gallium/drivers/ilo/Makefile.am b/src/gallium/drivers/ilo/Makefile.am
index 8a29ce4bb831e5b41d49449e8cc985da48ff7963..a8785a5e8c48ca3e39ddd92ad91eb94baf4a7965 100644 (file)
--- a/src/gallium/drivers/ilo/Makefile.am
+++ b/src/gallium/drivers/ilo/Makefile.am
@@ -33,5 +33,3 @@ noinst_HEADERS = $(GENHW_FILES)
 noinst_LTLIBRARIES = libilo.la
 
 libilo_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = Android.mk

diff --git a/src/gallium/drivers/nouveau/Makefile.am b/src/gallium/drivers/nouveau/Makefile.am
index 898606b97caab00eef8166ad509621a8e7074e62..0aefc031210d8f33b15d05336fd2ca312ec36062 100644 (file)
--- a/src/gallium/drivers/nouveau/Makefile.am
+++ b/src/gallium/drivers/nouveau/Makefile.am
@@ -52,4 +52,4 @@ nouveau_compiler_LDADD = \
        $(top_builddir)/src/util/libmesautil.la \
        $(GALLIUM_COMMON_LIB_DEPS)
 
-EXTRA_DIST = Android.mk codegen/lib nvc0/mme
+EXTRA_DIST = codegen/lib nvc0/mme

diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am
index ead7a871977b036eac286983955b81900e62a35d..dd1a5ede19b30a19743b887ecbbbde671ebaeb7f 100644 (file)
--- a/src/gallium/drivers/r300/Makefile.am
+++ b/src/gallium/drivers/r300/Makefile.am
@@ -28,6 +28,6 @@ r300_compiler_tests_SOURCES = $(COMPILER_TESTS_SOURCES)
 
 libr300_la_SOURCES = $(C_SOURCES)
 
-EXTRA_DIST = Android.mk \
+EXTRA_DIST = \
        compiler/tests/omod_two_writers.test \
        compiler/tests/regalloc_tex_1d_swizzle.test

diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
index f776410765c7ac5be930e8ad0b49fee8e3aa59d9..dc0d90d759be6f16804a6140e70d64351a1c3f7f 100644 (file)
--- a/src/gallium/drivers/r600/Makefile.am
+++ b/src/gallium/drivers/r600/Makefile.am
@@ -38,6 +38,6 @@ AM_CFLAGS += \
        -DHAVE_OPENCL
 endif
 
-EXTRA_DIST = Android.mk \
+EXTRA_DIST = \
        sb/notes.markdown \
        sb/sb_bc_fmt_def.inc

diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am
index 3855eb06d9e539741d8040bf967f465b11d7875e..ef6b999dd437347d5f47fffa9d46371e4cbd66e4 100644 (file)
--- a/src/gallium/drivers/radeon/Makefile.am
+++ b/src/gallium/drivers/radeon/Makefile.am
@@ -29,5 +29,5 @@ libradeon_la_LDFLAGS = \
 
 endif
 
-EXTRA_DIST = Android.mk \
+EXTRA_DIST = \
        LLVM_REVISION.txt

diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am
index dd543baedf48d25ea9dfdc085f4eb58c22d68781..aa79c5e01efc6e09c514ea71812186faf0a06d10 100644 (file)
--- a/src/gallium/drivers/radeonsi/Makefile.am
+++ b/src/gallium/drivers/radeonsi/Makefile.am
@@ -31,5 +31,3 @@ AM_CFLAGS = \
 noinst_LTLIBRARIES = libradeonsi.la
 
 libradeonsi_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = Android.mk

diff --git a/src/gallium/drivers/softpipe/Makefile.am b/src/gallium/drivers/softpipe/Makefile.am
index aadd21f3aea4de8710d882ba35e70fa9fb16ad6c..20f11f8dd2d4bcc803e0b65a36df2e697538fefa 100644 (file)
--- a/src/gallium/drivers/softpipe/Makefile.am
+++ b/src/gallium/drivers/softpipe/Makefile.am
@@ -30,4 +30,4 @@ noinst_LTLIBRARIES = libsoftpipe.la
 
 libsoftpipe_la_SOURCES = $(C_SOURCES)
 
-EXTRA_DIST = Android.mk SConscript
+EXTRA_DIST = SConscript

diff --git a/src/gallium/drivers/svga/Makefile.am b/src/gallium/drivers/svga/Makefile.am
index 138a84f3c3b4a1cc0fb19137d596b894cefbc0a2..50d44cff84a4d0908c1cd69a33502b6eae8f4e94 100644 (file)
--- a/src/gallium/drivers/svga/Makefile.am
+++ b/src/gallium/drivers/svga/Makefile.am
@@ -36,6 +36,6 @@ noinst_LTLIBRARIES = libsvga.la
 
 libsvga_la_SOURCES = $(C_SOURCES)
 
-EXTRA_DIST = Android.mk SConscript \
+EXTRA_DIST = SConscript \
        include/README \
        svgadump/svga_dump.py

diff --git a/src/gallium/state_trackers/egl/Makefile.am b/src/gallium/state_trackers/egl/Makefile.am
index 216bcdbaeadc7d77fe9ebac96fff5c6ffd30f5ce..31546a778cff4bbca930ccce227f7fc15bd91025 100644 (file)
--- a/src/gallium/state_trackers/egl/Makefile.am
+++ b/src/gallium/state_trackers/egl/Makefile.am
@@ -106,5 +106,5 @@ AM_CPPFLAGS += \
 endif
 
 EXTRA_DIST = \
-       Android.mk SConscript \
+       SConscript \
        $(android_FILES) $(gdi_FILES)

diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
index fb2e570f272411689ad8eae6cc1620c79f0ed4f0..85f2ac1b785498fc4623809193c010e6b701a6d1 100644 (file)
--- a/src/gallium/targets/egl-static/Makefile.am
+++ b/src/gallium/targets/egl-static/Makefile.am
@@ -155,7 +155,7 @@ egl_gallium_la_LIBADD += \
 endif
 
 EXTRA_egl_gallium_la_DEPENDENCIES = egl.sym
-EXTRA_DIST = Android.mk SConscript
+EXTRA_DIST = SConscript
 
 #if HAVE_GALLIUM_STATIC_TARGETS
 

diff --git a/src/gallium/winsys/freedreno/drm/Makefile.am b/src/gallium/winsys/freedreno/drm/Makefile.am
index d08778f0bea7f556d0db4be3bf62871ba808fccf..cf4c24cb81cf4aef19446aa1eaab6dd99371d424 100644 (file)
--- a/src/gallium/winsys/freedreno/drm/Makefile.am
+++ b/src/gallium/winsys/freedreno/drm/Makefile.am
@@ -31,5 +31,3 @@ AM_CFLAGS = \
 noinst_LTLIBRARIES = libfreedrenodrm.la
 
 libfreedrenodrm_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = Android.mk

diff --git a/src/gallium/winsys/i915/drm/Makefile.am b/src/gallium/winsys/i915/drm/Makefile.am
index 3201d6f93413a748c26e29021b747abe1234bc2b..82c477d68b6109acc4507f8387e3c32327bce3a8 100644 (file)
--- a/src/gallium/winsys/i915/drm/Makefile.am
+++ b/src/gallium/winsys/i915/drm/Makefile.am
@@ -31,5 +31,3 @@ AM_CFLAGS = \
 noinst_LTLIBRARIES = libi915drm.la
 
 libi915drm_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = Android.mk

diff --git a/src/gallium/winsys/intel/drm/Makefile.am b/src/gallium/winsys/intel/drm/Makefile.am
index 088d1a3f41fac27b61494b4598c57b31e2b54b66..fbe1ceaeb1e75589b8c12bc2f22a4d5b069d1842 100644 (file)
--- a/src/gallium/winsys/intel/drm/Makefile.am
+++ b/src/gallium/winsys/intel/drm/Makefile.am
@@ -32,5 +32,3 @@ AM_CFLAGS = \
 noinst_LTLIBRARIES = libintelwinsys.la
 
 libintelwinsys_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = Android.mk

diff --git a/src/gallium/winsys/nouveau/drm/Makefile.am b/src/gallium/winsys/nouveau/drm/Makefile.am
index c8a8ded7fb0e945d05f2418fc2c8044f681b0b36..9c94ea481919d37be3bbcd9f28bcc1a30593fc34 100644 (file)
--- a/src/gallium/winsys/nouveau/drm/Makefile.am
+++ b/src/gallium/winsys/nouveau/drm/Makefile.am
@@ -31,5 +31,3 @@ AM_CFLAGS = \
 noinst_LTLIBRARIES = libnouveaudrm.la
 
 libnouveaudrm_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = Android.mk

diff --git a/src/gallium/winsys/radeon/drm/Makefile.am b/src/gallium/winsys/radeon/drm/Makefile.am
index 0a913194eb8270139e514be36af5a5762a8a2344..0320aca01f9276be214405d8407e1a2bec975a0a 100644 (file)
--- a/src/gallium/winsys/radeon/drm/Makefile.am
+++ b/src/gallium/winsys/radeon/drm/Makefile.am
@@ -9,4 +9,4 @@ noinst_LTLIBRARIES = libradeonwinsys.la
 
 libradeonwinsys_la_SOURCES = $(C_SOURCES)
 
-EXTRA_DIST = $(TOOLS_HDR) Android.mk
+EXTRA_DIST = $(TOOLS_HDR)

diff --git a/src/gallium/winsys/svga/drm/Makefile.am b/src/gallium/winsys/svga/drm/Makefile.am
index 3b95b47efca1a2ae38b474613b963aebf904b6f2..dfa97367650f3bcecb3a83f8583faec689dc6716 100644 (file)
--- a/src/gallium/winsys/svga/drm/Makefile.am
+++ b/src/gallium/winsys/svga/drm/Makefile.am
@@ -36,4 +36,4 @@ noinst_LTLIBRARIES = libsvgadrm.la
 
 libsvgadrm_la_SOURCES = $(C_SOURCES)
 
-EXTRA_DIST = Android.mk SConscript
+EXTRA_DIST = SConscript