From e93832440855134b2eb476d34672ca3331334fdd Mon Sep 17 00:00:00 2001
From: Magnus Feuer <mfeuer1@jaguarlandrover.com>
Date: Wed, 14 Aug 2019 12:57:33 -0700
Subject: [PATCH] Homolized variable refs. Cleaned up target deps graph to
 ensure sequntial build with -j4

---
 examples/Makefile | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/examples/Makefile b/examples/Makefile
index 8163154..c3f1725 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -17,10 +17,10 @@ EXAMPLE_TARGET_CLIENT=${NAME}_pub_example
 TARGET_NOMACRO_CLIENT=${EXAMPLE_TARGET_CLIENT}_nomacro
 
 CLIENT_OBJ=vsd_pub_example.o
-CLIENT_SOURCE=$(CLIENT_OBJ:%.o=%.c)
+CLIENT_SOURCE=${CLIENT_OBJ:%.o=%.c}
 
-CLIENT_NOMACRO_OBJ=$(CLIENT_OBJ:%.o=%_nomacro.o)
-CLIENT_NOMACRO_SOURCE=$(CLIENT_NOMACRO_OBJ:%.o=%.c)
+CLIENT_NOMACRO_OBJ=${CLIENT_OBJ:%.o=%_nomacro.o}
+CLIENT_NOMACRO_SOURCE=${CLIENT_NOMACRO_OBJ:%.o=%.c}
 
 #
 # Server
@@ -29,37 +29,37 @@ EXAMPLE_TARGET_SERVER=${NAME}_sub_example
 TARGET_NOMACRO_SERVER=${EXAMPLE_TARGET_SERVER}_nomacro
 
 SERVER_OBJ=vsd_sub_example.o
-SERVER_SOURCE=$(SERVER_OBJ:%.o=%.c)
+SERVER_SOURCE=${SERVER_OBJ:%.o=%.c}
 
-SERVER_NOMACRO_OBJ=$(SERVER_OBJ:%.o=%_nomacro.o)
-SERVER_NOMACRO_SOURCE=$(SERVER_NOMACRO_OBJ:%.o=%.c)
+SERVER_NOMACRO_OBJ=${SERVER_OBJ:%.o=%_nomacro.o}
+SERVER_NOMACRO_SOURCE=${SERVER_NOMACRO_OBJ:%.o=%.c}
 
 LFLAGS= -L/usr/local/lib -lvss -ldstc -lrmc
 CFLAGS?= -ggdb -Wall -I../ -I/usr/local
 
 .PHONY: all clean install
 
-all: ${VSS_HDR} $(EXAMPLE_TARGET_SERVER) $(EXAMPLE_TARGET_CLIENT)
+all: ${EXAMPLE_TARGET_SERVER} ${EXAMPLE_TARGET_CLIENT}
 
-nomacro: ${VSS_HDR} $(TARGET_NOMACRO_SERVER) $(TARGET_NOMACRO_CLIENT)
+nomacro: ${VSS_HDR} ${TARGET_NOMACRO_SERVER} ${TARGET_NOMACRO_CLIENT}
 
-$(EXAMPLE_TARGET_SERVER): $(SERVER_OBJ) $(SHARED_OBJ)
-	$(CC) $(CFLAGS) $^ $(LFLAGS) -o $@ $(LDFLAGS)
+${EXAMPLE_TARGET_SERVER}: ${VSS_HDR} ${SERVER_OBJ} ${SHARED_OBJ}
+	${CC} ${CFLAGS} $^ ${LFLAGS} -o $@ ${LDFLAGS}
 
 
-$(EXAMPLE_TARGET_CLIENT): $(CLIENT_OBJ) $(SHARED_OBJ)
-	$(CC) $(CFLAGS) $^ $(LFLAGS) -o $@ $(LDFLAGS)
+${EXAMPLE_TARGET_CLIENT}: ${VSS_HDR} ${CLIENT_OBJ} ${SHARED_OBJ}
+	${CC} ${CFLAGS} $^ ${LFLAGS} -o $@ ${LDFLAGS}
 
 #
 # Recompile server and client if headers change
 #
-$(CLIENT_OBJ) $(SHARED_OBJ): $(INCLUDE)
+${CLIENT_OBJ} ${SHARED_OBJ}: ${INCLUDE}
 
 clean:
-	rm -f $(EXAMPLE_TARGET_CLIENT) $(EXAMPLE_TARGET_SERVER) $(SERVER_OBJ) $(CLIENT_OBJ) \
-	$(CLIENT_NOMACRO_OBJ) $(SERVER_NOMACRO_OBJ) $(TARGET_NOMACRO_CLIENT) \
-	$(TARGET_NOMACRO_SERVER) $(CLIENT_NOMACRO_SOURCE) \
-	$(SERVER_NOMACRO_SOURCE) ${VSS_HDR}
+	rm -f ${EXAMPLE_TARGET_CLIENT} ${EXAMPLE_TARGET_SERVER} ${SERVER_OBJ} ${CLIENT_OBJ} \
+	${CLIENT_NOMACRO_OBJ} ${SERVER_NOMACRO_OBJ} ${TARGET_NOMACRO_CLIENT} \
+	${TARGET_NOMACRO_SERVER} ${CLIENT_NOMACRO_SOURCE} \
+	${SERVER_NOMACRO_SOURCE} ${VSS_HDR}
 
 install:
 	install -d ${DESTDIR}/bin
@@ -69,16 +69,16 @@ install:
 #
 # The client is built as a regular binary
 #
-$(TARGET_NOMACRO_CLIENT) : $(CLIENT_NOMACRO_OBJ)
-	$(CC) $(CFLAGS) $^ -ldstc -lrmc -lvsd -o $@ $(LDFLAGS)
+${TARGET_NOMACRO_CLIENT} : ${CLIENT_NOMACRO_OBJ}
+	${CC} ${CFLAGS} $^ -ldstc -lrmc -lvsd -o $@ ${LDFLAGS}
 
-$(TARGET_NOMACRO_SERVER): $(SERVER_NOMACRO_OBJ)
-	$(CC) $(CFLAGS) $^ -ldstc -lrmc -lvsd -o $@ $(LDFLAGS)
+${TARGET_NOMACRO_SERVER}: ${SERVER_NOMACRO_OBJ}
+	${CC} ${CFLAGS} $^ -ldstc -lrmc -lvsd -o $@ ${LDFLAGS}
 
-$(CLIENT_NOMACRO_SOURCE): ${CLIENT_SOURCE} /usr/local/include/dstc.h
+${CLIENT_NOMACRO_SOURCE}: ${CLIENT_SOURCE} /usr/local/include/dstc.h
 	cpp -E ${CLIENT_SOURCE} | clang-format | grep -v '^# [0-9]' > ${CLIENT_NOMACRO_SOURCE}
 
-$(SERVER_NOMACRO_SOURCE): ${SERVER_SOURCE} /usr/local/include/dstc.h
+${SERVER_NOMACRO_SOURCE}: ${SERVER_SOURCE} /usr/local/include/dstc.h
 	cpp -E ${SERVER_SOURCE} | clang-format | grep -v '^# [0-9]' > ${SERVER_NOMACRO_SOURCE}
 
 ${VSS_HDR}: