Use parens instead of braces

This commit is contained in:
HalosGhost 2014-08-21 00:46:46 -05:00
parent 1ebbf06ec4
commit d17e596cd7

View File

@ -11,45 +11,45 @@ PREFIX = /usr/local
EXECUTABLE = ttysolitaire EXECUTABLE = ttysolitaire
SRC_DIR = src SRC_DIR = src
SRC = ${SRC_DIR}/ttysolitaire.c SRC = $(SRC_DIR)/ttysolitaire.c
SRC_OBJECTS = ${SRC_DIR}/common.o \ SRC_OBJECTS = $(SRC_DIR)/common.o \
${SRC_DIR}/frame.o \ $(SRC_DIR)/frame.o \
${SRC_DIR}/card.o \ $(SRC_DIR)/card.o \
${SRC_DIR}/stack.o \ $(SRC_DIR)/stack.o \
${SRC_DIR}/deck.o \ $(SRC_DIR)/deck.o \
${SRC_DIR}/cursor.o \ $(SRC_DIR)/cursor.o \
${SRC_DIR}/keyboard.o \ $(SRC_DIR)/keyboard.o \
${SRC_DIR}/gui.o \ $(SRC_DIR)/gui.o \
${SRC_DIR}/game.o \ $(SRC_DIR)/game.o \
TESTS_EXECUTABLE = ttysolitaire_test TESTS_EXECUTABLE = ttysolitaire_test
TESTS_DIR = tests TESTS_DIR = tests
TESTS_SRC = ${TESTS_DIR}/ttysolitaire_test.c TESTS_SRC = $(TESTS_DIR)/ttysolitaire_test.c
TESTS_OBJECTS = ${TESTS_DIR}/frame_test.o \ TESTS_OBJECTS = $(TESTS_DIR)/frame_test.o \
${TESTS_DIR}/card_test.o \ $(TESTS_DIR)/card_test.o \
${TESTS_DIR}/stack_test.o \ $(TESTS_DIR)/stack_test.o \
${TESTS_DIR}/deck_test.o \ $(TESTS_DIR)/deck_test.o \
${TESTS_DIR}/cursor_test.o \ $(TESTS_DIR)/cursor_test.o \
${TESTS_DIR}/keyboard_test.o \ $(TESTS_DIR)/keyboard_test.o \
${TESTS_DIR}/gui_test.o \ $(TESTS_DIR)/gui_test.o \
${TESTS_DIR}/game_test.o \ $(TESTS_DIR)/game_test.o \
${TESTS_DIR}/test_helper.o \ $(TESTS_DIR)/test_helper.o \
${TESTS_DIR}/test_helper_test.o \ $(TESTS_DIR)/test_helper_test.o \
.PHONY: test clean .PHONY: test clean
ttysolitaire: ${SRC_OBJECTS} ttysolitaire: $(SRC_OBJECTS)
${CC} ${CFLAGS} ${SRC} -o ${EXECUTABLE} ${SRC_OBJECTS} ${LDFLAGS} $(CC) $(CFLAGS) $(SRC) -o $(EXECUTABLE) $(SRC_OBJECTS) $(LDFLAGS)
test: ${SRC_OBJECTS} ${TESTS_OBJECTS} test: $(SRC_OBJECTS) $(TESTS_OBJECTS)
@${CC} ${CFLAGS} ${TESTS_SRC} -o ${TESTS_EXECUTABLE} ${TESTS_OBJECTS} ${SRC_OBJECTS} ${LDFLAGS} @$(CC) $(CFLAGS) $(TESTS_SRC) -o $(TESTS_EXECUTABLE) $(TESTS_OBJECTS) $(SRC_OBJECTS) $(LDFLAGS)
@./${TESTS_EXECUTABLE} @./$(TESTS_EXECUTABLE)
clean: clean:
rm -rf {${SRC_DIR},${TESTS_DIR}}/*.o ${EXECUTABLE} ${TESTS_EXECUTABLE} rm -rf ($(SRC_DIR),$(TESTS_DIR))/*.o $(EXECUTABLE) $(TESTS_EXECUTABLE)
install: install:
cp -pf ${EXECUTABLE} ${PREFIX}/bin cp -pf $(EXECUTABLE) $(PREFIX)/bin
uninstall: uninstall:
rm -f ${PREFIX}/bin/${EXECUTABLE} rm -f $(PREFIX)/bin/$(EXECUTABLE)