diff options
| author | Kenneth Graunke <[email protected]> | 2011-01-16 16:01:54 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2011-01-31 10:17:09 -0800 |
| commit | d1d8120545b0bd2f7ec48c5f03c77b967b082e04 (patch) | |
| tree | f26fd61d842bb696e78161377f1e8e3b10c333ca /src/glsl/Makefile | |
| parent | 42fd9c2ebb8a9eecf69d6a7a2bc0d778f49285de (diff) | |
Remove talloc from the make and automake build systems.
Diffstat (limited to 'src/glsl/Makefile')
| -rw-r--r-- | src/glsl/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/glsl/Makefile b/src/glsl/Makefile index b8e11e6251f..8316dfbe7c9 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... |