Mesa (master): glsl/Makefile: glcpp doesn't need libglsl.a.

Kenneth Graunke kwg at kemper.freedesktop.org
Fri Feb 11 01:37:38 UTC 2011


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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Thu Feb 10 16:37:56 2011 -0800

glsl/Makefile: glcpp doesn't need libglsl.a.

Also, add a 'glcpp' target so you can type 'make glcpp' instead of
'make glcpp/glcpp'.

---

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

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index ec11c8a..3c00d1f 100644
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -152,7 +152,8 @@ 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_OBJECTS) libglsl.a
+glcpp: glcpp/glcpp
+glcpp/glcpp: $(GLCPP_OBJECTS)
 	$(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLCPP_OBJECTS) $(LIBS) -o $@
 
 .cpp.o:




More information about the mesa-commit mailing list