Makefile: remove more deferred variables

diff --git a/Makefile b/Makefile
index acd281b3b9c2162e974c6843ba37fa455eeeb59a..0ad9fa66274e16cb68c5d495e8fd034bd54db04a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,22 @@
 include common.mk
 
 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.
 
 CPPFLAGS += -Iinclude -I.

-LDFLAGS = -ldl -lrt -rdynamic
-SHARED = -shared
+LDFLAGS := -ldl -lrt -rdynamic
+SHARED := -shared

 
 # Mac OSX options
 ifeq ($(UNAME), Darwin)
 
 # Mac OSX options
 ifeq ($(UNAME), Darwin)

-LDFLAGS = -ldl
-SHARED = -Wl,-undefined,dynamic_lookup -dynamiclib
+LDFLAGS := -ldl
+SHARED := -Wl,-undefined,dynamic_lookup -dynamiclib

 endif
 
 endif
 

-TESTS_DIR = test
+TESTS_DIR := test

 
 all: $(LIB_SO) tests
 
 
 all: $(LIB_SO) tests
 

diff --git a/common.mk b/common.mk
index 9fe9f09745c73ef0f75e3776c9d09c4a6b58c3d0..bc068dff1fb1e559b4aafb9b01881028c28b615a 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -1,12 +1,12 @@
 # A few common Makefile items
 
 # 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
 
 
 CPPFLAGS += -Wall -g -O3