summaryrefslogtreecommitdiffstats
path: root/src/mesa/sources.mak
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2012-11-07 16:33:39 -0800
committerChad Versace <chad.versace@linux.intel.com>2012-11-12 15:52:42 -0800
commit907844107252260c646aca361191ef7f121f3d23 (patch)
treecf9a5a54b804e852344541a096992943687e2a6a /src/mesa/sources.mak
parent0ef85357479a47c2bdd05df3b2183bc7bfa0ac6e (diff)
downloadexternal_mesa3d-907844107252260c646aca361191ef7f121f3d23.zip
external_mesa3d-907844107252260c646aca361191ef7f121f3d23.tar.gz
external_mesa3d-907844107252260c646aca361191ef7f121f3d23.tar.bz2
automake,android: Build program/ into a helper lib (v2)
While simplifying mesa/Makefile.am, the more important feature of this commit is allowing a file with the same name to appear in both main/ and program/. v2: [chadv] Add changes to Android makefiles. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (v1) Signed-off-by: Chad Versace <chad.versace@linux.intel.com> (v2)
Diffstat (limited to 'src/mesa/sources.mak')
-rw-r--r--src/mesa/sources.mak2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 07076c6..93d466b 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -316,7 +316,6 @@ MESA_FILES = \
$(MATH_XFORM_FILES) \
$(VBO_FILES) \
$(TNL_FILES) \
- $(PROGRAM_FILES) \
$(SWRAST_FILES) \
$(SWRAST_SETUP_FILES) \
$(COMMON_DRIVER_FILES)\
@@ -328,7 +327,6 @@ MESA_GALLIUM_FILES = \
$(MATH_FILES) \
$(VBO_FILES) \
$(STATETRACKER_FILES) \
- $(PROGRAM_FILES) \
$(SRCDIR)x86/common_x86.c
# All the core C sources, for dependency checking