From: Marek Olšák <maraeo@gmail.com>
Date: Fri, 16 Sep 2011 19:51:58 +0000 (+0200)
Subject: mesa: fix an autoconf build-system bug related to glsl_to_tgsi
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=da90c8fc271d000d6a3415fcc9da066293565b35;p=mesa.git

mesa: fix an autoconf build-system bug related to glsl_to_tgsi

st_glsl_to_tgsi.cpp was completely ignored by makedepend because it was
not included in ALL_SOURCES, which caused that the file was not recompiled
when certain header files were changed (like glsl/ir.h).

The first part of this commit is just a consolidation.
The second part is the fix.
---

diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 19a105f15ae..da5d90ec4db 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -338,14 +338,13 @@ MESA_GALLIUM_SOURCES = \
 	x86/common_x86.c
 
 MESA_GALLIUM_CXX_SOURCES = \
-	$(MAIN_CXX_SOURCES) \
-	$(SHADER_CXX_SOURCES) \
+	$(MESA_CXX_SOURCES) \
 	state_tracker/st_glsl_to_tgsi.cpp
 
 # All the core C sources, for dependency checking
 ALL_SOURCES = \
 	$(MESA_SOURCES)		\
-	$(MESA_CXX_SOURCES)	\
+	$(MESA_GALLIUM_CXX_SOURCES) \
 	$(MESA_ASM_SOURCES)	\
 	$(STATETRACKER_SOURCES)