From a0aabd321ed9a43bd0ff4be0d9a7751138c01004 Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Tue, 28 May 2013 17:31:44 -0700
Subject: [PATCH] Makefile: remove more deferred variables

---
 Makefile  | 20 ++++++++++----------
 common.mk | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index acd281b3..0ad9fa66 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,22 @@
 include common.mk
 
-OBJECTS = libthreads.o schedule.o model.o threads.o librace.o action.o \
-	  nodestack.o clockvector.o main.o snapshot-interface.o cyclegraph.o \
-	  datarace.o impatomic.o cmodelint.o \
-	  snapshot.o malloc.o mymemory.o common.o mutex.o promise.o conditionvariable.o \
-	  context.o scanalysis.o execution.o plugins.o
+OBJECTS := libthreads.o schedule.o model.o threads.o librace.o action.o \
+	   nodestack.o clockvector.o main.o snapshot-interface.o cyclegraph.o \
+	   datarace.o impatomic.o cmodelint.o \
+	   snapshot.o malloc.o mymemory.o common.o mutex.o promise.o conditionvariable.o \
+	   context.o scanalysis.o execution.o plugins.o
 
 CPPFLAGS += -Iinclude -I.
-LDFLAGS = -ldl -lrt -rdynamic
-SHARED = -shared
+LDFLAGS := -ldl -lrt -rdynamic
+SHARED := -shared
 
 # Mac OSX options
 ifeq ($(UNAME), Darwin)
-LDFLAGS = -ldl
-SHARED = -Wl,-undefined,dynamic_lookup -dynamiclib
+LDFLAGS := -ldl
+SHARED := -Wl,-undefined,dynamic_lookup -dynamiclib
 endif
 
-TESTS_DIR = test
+TESTS_DIR := test
 
 all: $(LIB_SO) tests
 
diff --git a/common.mk b/common.mk
index 9fe9f097..bc068dff 100644
--- a/common.mk
+++ b/common.mk
@@ -1,12 +1,12 @@
 # A few common Makefile items
 
-CC = gcc
-CXX = g++
+CC := gcc
+CXX := g++
 
-UNAME = $(shell uname)
+UNAME := $(shell uname)
 
-LIB_NAME = model
-LIB_SO = lib$(LIB_NAME).so
+LIB_NAME := model
+LIB_SO := lib$(LIB_NAME).so
 
 CPPFLAGS += -Wall -g -O3
 
-- 
2.34.1