Skip to content

Commit

Permalink
Further make -j sequenceing fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Magnus Feuer authored and jack-sanchez committed Aug 14, 2019
1 parent e938324 commit 7b7a820
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions examples/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,20 @@ CFLAGS?= -ggdb -Wall -I../ -I/usr/local

all: ${EXAMPLE_TARGET_SERVER} ${EXAMPLE_TARGET_CLIENT}

nomacro: ${VSS_HDR} ${TARGET_NOMACRO_SERVER} ${TARGET_NOMACRO_CLIENT}
nomacro: ${TARGET_NOMACRO_SERVER} ${TARGET_NOMACRO_CLIENT}

${EXAMPLE_TARGET_SERVER}: ${VSS_HDR} ${SERVER_OBJ} ${SHARED_OBJ}
${EXAMPLE_TARGET_SERVER}: ${SERVER_OBJ} ${SHARED_OBJ}
${CC} ${CFLAGS} $^ ${LFLAGS} -o $@ ${LDFLAGS}


${EXAMPLE_TARGET_CLIENT}: ${VSS_HDR} ${CLIENT_OBJ} ${SHARED_OBJ}
${EXAMPLE_TARGET_CLIENT}: ${CLIENT_OBJ} ${SHARED_OBJ}
${CC} ${CFLAGS} $^ ${LFLAGS} -o $@ ${LDFLAGS}

#
# Recompile server and client if headers change
#
${CLIENT_OBJ} ${SHARED_OBJ}: ${INCLUDE}
${CLIENT_OBJ} ${SERVER_OBJ} ${SHARED_OBJ} \
${CLIENT_NOMACRO_OBJ} ${SERVER_NOMACRO_OBJ}: ${VSS_HDR} ${INCLUDE}

clean:
rm -f ${EXAMPLE_TARGET_CLIENT} ${EXAMPLE_TARGET_SERVER} ${SERVER_OBJ} ${CLIENT_OBJ} \
Expand All @@ -72,7 +73,7 @@ install:
${TARGET_NOMACRO_CLIENT} : ${CLIENT_NOMACRO_OBJ}
${CC} ${CFLAGS} $^ -ldstc -lrmc -lvsd -o $@ ${LDFLAGS}

${TARGET_NOMACRO_SERVER}: ${SERVER_NOMACRO_OBJ}
${TARGET_NOMACRO_SERVER}: ${VSS_HDR} ${SERVER_NOMACRO_OBJ}
${CC} ${CFLAGS} $^ -ldstc -lrmc -lvsd -o $@ ${LDFLAGS}

${CLIENT_NOMACRO_SOURCE}: ${CLIENT_SOURCE} /usr/local/include/dstc.h
Expand Down

0 comments on commit 7b7a820

Please sign in to comment.