Mesa (master): glsl: Fix parallel build.

Kenneth Graunke kwg at kemper.freedesktop.org
Fri Feb 11 18:38:45 UTC 2011


Module: Mesa
Branch: master
Commit: 11f35aa418b15da61147dc8bffe65745d3017f82
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=11f35aa418b15da61147dc8bffe65745d3017f82

Author: Tobias Jakobi <liquid.acid at gmx.net>
Date:   Fri Feb 11 10:36:14 2011 -0800

glsl: Fix parallel build.

Broken since e0c1fc32832b66b52e6352ba563288ee48a1face.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/glsl/Makefile |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index 3c00d1f..5567555 100644
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -13,6 +13,7 @@ LIBGLCPP_SOURCES = \
 
 GLCPP_SOURCES = \
 	$(LIBGLCPP_SOURCES) \
+	ralloc.c \
 	glcpp/glcpp.c
 
 C_SOURCES = \
@@ -154,7 +155,7 @@ glsl_compiler: $(GLSL2_OBJECTS) libglsl.a builtin_stubs.o
 
 glcpp: glcpp/glcpp
 glcpp/glcpp: $(GLCPP_OBJECTS)
-	$(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLCPP_OBJECTS) $(LIBS) -o $@
+	$(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLCPP_OBJECTS) -o $@
 
 .cpp.o:
 	$(CXX) -c $(INCLUDES) $(CXXFLAGS) $(DEFINES) $< -o $@




More information about the mesa-commit mailing list