From 690abd713c7c66f7e8c517ad4d25c5e0f2b6bace Mon Sep 17 00:00:00 2001 From: Davin McCall Date: Sat, 13 Jan 2018 13:18:44 +0000 Subject: [PATCH] Makefile: build dependency lists (*.d) during regular build. No need to build the dependency files as a separate step. Also, make "make check" no longer build main objects. --- src/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Makefile b/src/Makefile index 7ce4d55..578873d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -20,9 +20,9 @@ shutdown: shutdown.o $(CXX) -o shutdown shutdown.o $(EXTRA_LIBS) $(objects): %.o: %.cc - $(CXX) $(CXXOPTS) -Iincludes -Idasynq -c $< -o $@ + $(CXX) $(CXXOPTS) -MMD -MP -Iincludes -Idasynq -c $< -o $@ -check: $(dinit_objects) +check: $(MAKE) -C tests check install: all @@ -37,7 +37,4 @@ clean: rm -f dinit dinitctl shutdown $(MAKE) -C tests clean -$(objects:.o=.d): %.d: %.cc - $(CXX) $(CXXOPTS) -Iincludes -Idasynq -MM -MG -MF $@ $< - -include $(objects:.o=.d) -- 2.25.1