b5cdf931f2305dbddc4008879f81e1a3cb4c74ed

Simavr used to build pretty quick, and it's been crawling for a while
now, turns out some of the enhancements we added to the SIMAVR path
detection were being evaluated a LOT.
So went to the makefile and made sure most of the static variables are
evaluated once only.

Signed-off-by: Michel Pollet <buserror@gmail.com>

diff --git a/Makefile.common b/Makefile.common
index dbafa0bf3f7b359d44b256f573ee9c0090ad1269..42c700486cebb7af92719d3564a1d028b2efa6e9 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -27,7 +27,7 @@
 #      along with simavr.  If not, see <http://www.gnu.org/licenses/>.
 
 # simavr directory
-SIMAVR         ?= ${shell for p in . .. ../.. ../../..;do test -d $$p/simavr/sim && echo $$p/simavr; done}
+SIMAVR         := ${shell for p in . .. ../.. ../../..;do test -d $$p/simavr/sim && echo $$p/simavr; done}
 
 # You can override the build settings with local changes in this file
 # for example:
@@ -37,7 +37,7 @@ SIMAVR                ?= ${shell for p in . .. ../.. ../../..;do test -d $$p/simavr/sim && ech
 -include ${wildcard ${SIMAVR}/../.make.options*}
 
 # get the first character of what the compiler says it is, unless it's 'x86_64' doh
-ARCH           = ${shell $(CC) -dumpmachine | sed -e 's/^x/i/' -e 's/\(.\).*/\1/'}
+ARCH           := ${shell $(CC) -dumpmachine | sed -e 's/^x/i/' -e 's/\(.\).*/\1/'}
 
 CFLAGS         += -O2 -Wall
 CFLAGS         += -g
@@ -91,8 +91,8 @@ MKDIR         ?= mkdir -p
 INSTALL                ?= install
 SHELL          := ${shell which bash}
        
-OBJ            = obj-${shell $(CC) -dumpmachine}
-LIBDIR         = ${shell pwd}/${SIMAVR}/${OBJ}
+OBJ            := obj-${shell $(CC) -dumpmachine}
+LIBDIR         := ${shell pwd}/${SIMAVR}/${OBJ}
 LDFLAGS        += -L${LIBDIR} -lsimavr 
 
 LDFLAGS        += -lelf 

diff --git a/examples/Makefile.opengl b/examples/Makefile.opengl
index 158be54126a1712eefa0cf83667a32ae81130919..acd89f9c78dd2eef77ca489c545fd1c9f1253b7c 100644 (file)
--- a/examples/Makefile.opengl
+++ b/examples/Makefile.opengl
@@ -1,5 +1,5 @@
 
-UNAME = ${shell uname}
+UNAME := ${shell uname}
 
 ifeq (${UNAME}, Darwin)
 LDFLAGS        += -framework GLUT -framework OpenGL

diff --git a/tests/Makefile b/tests/Makefile
index cff14f301479e234d613f4d56a8a3c84cd95ef37..3232c8bd34e0228d9d93898c812d9ea7d77f2c11 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -26,8 +26,8 @@ simavr                = ..
 IPATH          += ${simavr}/include
 IPATH          += ${simavr}/simavr/sim
 
-tests_src      = ${wildcard test_*.c}
-tests          = ${patsubst %.c, ${OBJ}/%.tst, ${tests_src}}
+tests_src      := ${wildcard test_*.c}
+tests          := ${patsubst %.c, ${OBJ}/%.tst, ${tests_src}}
 
 all: obj axf tests