summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2011-01-16 16:01:54 -0800
committerKenneth Graunke <kenneth@whitecape.org>2011-01-31 10:17:09 -0800
commitd1d8120545b0bd2f7ec48c5f03c77b967b082e04 (patch)
treef26fd61d842bb696e78161377f1e8e3b10c333ca /src
parent42fd9c2ebb8a9eecf69d6a7a2bc0d778f49285de (diff)
Remove talloc from the make and automake build systems.
Diffstat (limited to 'src')
-rw-r--r--src/glsl/Makefile6
-rw-r--r--src/mesa/Makefile2
-rw-r--r--src/mesa/drivers/osmesa/Makefile2
3 files changed, 4 insertions, 6 deletions
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...
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 25e7cce425..a6025e9903 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -19,7 +19,7 @@ MESA_GALLIUM_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))
MESA_CPPFLAGS := $(API_DEFINES) $(DEFINES)
# append include dirs
-MESA_CPPFLAGS += $(INCLUDE_DIRS) $(TALLOC_CFLAGS)
+MESA_CPPFLAGS += $(INCLUDE_DIRS)
# tidy compiler flags
CFLAGS := $(filter-out $(DEFINES), $(CFLAGS))
diff --git a/src/mesa/drivers/osmesa/Makefile b/src/mesa/drivers/osmesa/Makefile
index d65128c4eb..39ab09af80 100644
--- a/src/mesa/drivers/osmesa/Makefile
+++ b/src/mesa/drivers/osmesa/Makefile
@@ -40,7 +40,7 @@ $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) $(CORE_MESA)
-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-install $(TOP)/$(LIB_DIR) -cplusplus $(MKLIB_OPTIONS) \
-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
- $(OSMESA_LIB_DEPS) $(TALLOC_LIBS) $(OBJECTS) $(CORE_MESA)
+ $(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)