summaryrefslogtreecommitdiffstats
path: root/src/glsl
diff options
context:
space:
mode:
authorTobias Jakobi <[email protected]>2011-02-11 10:36:14 -0800
committerKenneth Graunke <[email protected]>2011-02-11 10:36:14 -0800
commit11f35aa418b15da61147dc8bffe65745d3017f82 (patch)
tree59a183522de9791ecc0e29b528528fbcb1fdf973 /src/glsl
parent6ed0f2ac112d22278cf051c2cee9c2199a9025ea (diff)
glsl: Fix parallel build.
Broken since e0c1fc32832b66b52e6352ba563288ee48a1face. Signed-off-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index 3c00d1fd1fb..5567555a90f 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 $@