[mesa] master broken with "make -j3"

Commit Message

Sedat Dilek Feb. 11, 2011, 1:56 p.m. UTC

None

Patch

From a523ef0edbeac865368d945b142b2ba0ccb737e7 Mon Sep 17 00:00:00 2001
From: Sedat Dilek <[e-mail]>
Date: Fri, 11 Feb 2011 14:47:04 +0100
Subject: [PATCH] Revert "glsl/Makefile: glcpp doesn't need libglsl.a."

This reverts commit e0c1fc32832b66b52e6352ba563288ee48a1face.
---
 src/glsl/Makefile |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index 3c00d1f..ec11c8a 100644
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -152,8 +152,7 @@  install:
 glsl_compiler: $(GLSL2_OBJECTS) libglsl.a builtin_stubs.o
 	$(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLSL2_OBJECTS) builtin_stubs.o $(LIBS) -o $@
 
-glcpp: glcpp/glcpp
-glcpp/glcpp: $(GLCPP_OBJECTS)
+glcpp/glcpp: $(GLCPP_OBJECTS) libglsl.a
 	$(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLCPP_OBJECTS) $(LIBS) -o $@
 
 .cpp.o:
-- 
1.7.4