Skip to content

Commit 10c72f4

Browse files
authored
Merge pull request #348 from LeaYeh/build-makefile-readability
[BUILD] Use shell script syntax to improve readability of msg printing
2 parents 33ea15d + 9d8fd0c commit 10c72f4

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

Makefile

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,19 @@ DEP_SUBDIRS := $(sort $(dir $(DEP)))
126126
# Compilation
127127

128128
all :
129-
($(MAKE) --question build && echo $(MSG_NO_CHNG)) \
130-
|| (echo -n $(MSG_INFO)$(MSG_START) \
131-
&& ($(MAKE) build && echo $(MSG_SUCCESS)) \
132-
|| (echo $(MSG_FAILURE) && exit 42))
129+
if $(MAKE) --question build; then \
130+
echo $(MSG_NO_CHNG); \
131+
else \
132+
echo -n $(MSG_INFO)$(MSG_START); \
133+
if $(MAKE) build; then \
134+
echo; \
135+
echo $(MSG_SUCCESS); \
136+
else \
137+
echo; \
138+
echo $(MSG_FAILURE); \
139+
exit 42; \
140+
fi; \
141+
fi
133142

134143
run : all
135144
"./$(NAME)"
@@ -268,7 +277,7 @@ MSG_START := $(STY_ITA)"Building Crash ... "$(STY_RES)
268277
################################################################################
269278
MSG_PROGRESS := $(STY_ITA)"🌊"$(STY_RES)
270279
################################################################################
271-
MSG_SUCCESS := $(STY_BOL)$(STY_ITA)$(STY_CYA)"\nDONE!"$(STY_RES)
280+
MSG_SUCCESS := $(STY_BOL)$(STY_ITA)$(STY_CYA)"DONE!"$(STY_RES)
272281
################################################################################
273282
MSG_NO_CHNG := $(STY_ITA)$(STY_WHI)"Everything up-to-date!"$(STY_RES)
274283
################################################################################

0 commit comments

Comments
 (0)