diff --git a/Makefile b/Makefile index 613d0bdb..bef70699 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ all: distro static test coverage analyze # Run regression tests .PHONY: test test: - make -C test run + $(MAKE) -C test run # Perform checks (test + analyze) .PHONY: check @@ -99,13 +99,13 @@ check: test analyze # Measure test coverage (on test set of files only) .PHONY: coverage coverage: - make -C test coverage + $(MAKE) -C test coverage # Remove intermediates .PHONY: clean clean: rm -f $(OBJECTS) README-orig.md $(BIN)/cio_file gmon.out - make -C test clean + $(MAKE) -C test clean # Remove all generated files .PHONY: distclean diff --git a/build.mk b/build.mk index 5b311009..fcb9c0b1 100644 --- a/build.mk +++ b/build.mk @@ -12,7 +12,7 @@ $(OBJ)/%.o: $(SRC)/%.c $(OBJ) Makefile # Share library recipe $(LIB)/%.so.$(SO_VERSION): - @make $(LIB) + @$(MAKE) $(LIB) $(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $^ -shared -fPIC -Wl,-soname,$(subst $(LIB)/,,$@) $(LDFLAGS) # Unversioned shared libs (for linking against) @@ -22,7 +22,7 @@ $(LIB)/lib%.so: # Static library recipe $(LIB)/%.a: - @make $(LIB) + @$(MAKE) $(LIB) ar -rc $@ $^ ranlib $@ @@ -58,7 +58,7 @@ analyze: # Static code analysis viacat Facebook's infer .PHONY: infer infer: clean - infer run -- make shared + infer run -- $(MAKE) shared # Doxygen documentation (HTML and man pages) under apidocs/ .PHONY: dox