Skip to content

Commit

Permalink
Homolized variable refs.
Browse files Browse the repository at this point in the history
Cleaned up target deps graph to ensure sequntial build with -j4
  • Loading branch information
Magnus Feuer authored and jack-sanchez committed Aug 14, 2019
1 parent c87b55e commit e938324
Showing 1 changed file with 23 additions and 23 deletions.
46 changes: 23 additions & 23 deletions examples/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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}:
Expand Down

0 comments on commit e938324

Please sign in to comment.