From d1d8120545b0bd2f7ec48c5f03c77b967b082e04 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sun, 16 Jan 2011 16:01:54 -0800 Subject: Remove talloc from the make and automake build systems. --- src/glsl/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/glsl/Makefile') diff --git a/src/glsl/Makefile b/src/glsl/Makefile index b8e11e6251..8316dfbe7c 100644 --- a/src/glsl/Makefile +++ b/src/glsl/Makefile @@ -83,8 +83,7 @@ CXX_SOURCES = \ s_expression.cpp LIBS = \ - $(TOP)/src/glsl/libglsl.a \ - $(TALLOC_LIBS) + $(TOP)/src/glsl/libglsl.a APPS = glsl_compiler glcpp/glcpp @@ -113,7 +112,6 @@ OBJECTS = \ $(CXX_SOURCES:.cpp=.o) INCLUDES = \ - $(TALLOC_CFLAGS) \ -I. \ -I../mesa \ -I../mapi \ @@ -175,7 +173,7 @@ glcpp/glcpp-parse.c: glcpp/glcpp-parse.y bison -v -o "$@" --defines=glcpp/glcpp-parse.h $< builtin_compiler: $(GLSL2_OBJECTS) $(OBJECTS) builtin_stubs.o - $(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o $(TALLOC_LIBS) -o $@ + $(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o $@ builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py builtin_compiler @echo Regenerating builtin_function.cpp... -- cgit v1.2.3