Skip to content

Commit

Permalink
Use $(MAKE) instead of make in Makefiles and fragments
Browse files Browse the repository at this point in the history
  • Loading branch information
attipaci committed Dec 28, 2024
1 parent ab153db commit c583695
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions build.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -22,7 +22,7 @@ $(LIB)/lib%.so:

# Static library recipe
$(LIB)/%.a:
@make $(LIB)
@$(MAKE) $(LIB)
ar -rc $@ $^
ranlib $@

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit c583695

Please sign in to comment.