From 6a15790632ed65fcaa79e0d03555983330197692 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Thu, 24 May 2012 15:53:09 -0700
Subject: [PATCH] mesa: Clean up some dricore-related detritus in the old
 Makefile.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---
 src/mesa/Makefile | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index dab1c376820..069527e3a66 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -6,15 +6,9 @@ include $(TOP)/configs/current
 MESA_LIBS := libmesa.a libmesagallium.a
 DEPENDS := depend
 
-MESA_OBJ_DIR := .
-
 SRCDIR = .
 include sources.mak
 
-# adjust object dirs
-MESA_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_OBJECTS))
-MESA_GALLIUM_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))
-
 # define preprocessor flags
 MESA_CPPFLAGS := $(API_DEFINES) $(DEFINES)
 
@@ -29,24 +23,14 @@ CXXFLAGS := $(filter-out $(DEFINES), $(CXXFLAGS))
 MESA_CFLAGS := $(LLVM_CFLAGS) $(CFLAGS)
 MESA_CXXFLAGS := $(LLVM_CFLAGS) $(CXXFLAGS)
 
-define mesa-cc-c
-	@mkdir -p $(dir $@)
-	$(CC) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS)
-endef
-
-define mesa-cxx-c
-	@mkdir -p $(dir $@)
-	$(CXX) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CXXFLAGS)
-endef
-
-$(MESA_OBJ_DIR)/%.o: %.c
-	$(call mesa-cc-c,MESA)
+%.o: %.c
+	$(CC) -c -o $@ $< $(MESA_CPPFLAGS) $(MESA_CFLAGS)
 
-$(MESA_OBJ_DIR)/%.o: %.cpp
-	$(call mesa-cxx-c,MESA)
+%.o: %.cpp
+	$(CXX) -c -o $@ $< $(MESA_CPPFLAGS) $(MESA_CXXFLAGS)
 
-$(MESA_OBJ_DIR)/%.o: %.S
-	$(call mesa-cc-c,MESA)
+%.o: %.S
+	$(CC) -c -o $@ $< $(MESA_CPPFLAGS) $(MESA_CFLAGS)
 
 # Default: build dependencies, then asm_subdirs, GLSL built-in lib,
 # then convenience libs (.a) and finally the device drivers:
@@ -137,7 +121,7 @@ asm_subdirs:
 depend: $(ALL_FILES)
 	@ echo "running $(MKDEP)"
 	@ touch depend
-	@$(MKDEP) $(MKDEP_OPTIONS) -p$(MESA_OBJ_DIR)/ $(MESA_CPPFLAGS) \
+	@$(MKDEP) $(MKDEP_OPTIONS) $(MESA_CPPFLAGS) \
 		$(ALL_FILES) > /dev/null 2>/dev/null
 
 ######################################################################
-- 
2.30.2