Skip to content

Treat recursive make correctly #755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mernst merged 1 commit into from
Jan 12, 2026
Merged

Treat recursive make correctly #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,9 +622,9 @@ daikon.jar: ${DAIKON_JAVA_FILES} $(patsubst %,java/%,${DAIKON_RESOURCE_FILES})
# could make a distribution even if there were diffs in the current
# checkout.
daikon.tar daikon.zip: kvasir ${README_PATHS} ${DAIKON_JAVA_FILES} java/Makefile
make doc-all
${MAKE} doc-all
# `make doc-all` just did the work, but check that the files exist.
make ${DOC_PATHS}
${MAKE} ${DOC_PATHS}
# keep same TMPDIR value
${MAKE} TMPDIR=${TMPDIR} daikon.jar

Expand Down
4 changes: 2 additions & 2 deletions doc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ daikon-fast: daikon.texinfo

## These two rules create the directories if absent but don't update them.
../utils/html-tools:
make -C .. update-html-tools
${MAKE} -C .. update-html-tools

../utils/plume-scripts:
make -C .. update-plume-scripts
${MAKE} -C .. update-plume-scripts

.PHONY: daikon-html
# Does the actual work
Expand Down
4 changes: 2 additions & 2 deletions tests/Makefile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,10 +285,10 @@ goal_name = \


$(PRINT_INVARIANTS_CLASS):
make -C ${DAIKONDIR}/java
${MAKE} -C ${DAIKONDIR}/java

$(CHICORY_EXEC):
make -C ${DAIKONDIR}/java
${MAKE} -C ${DAIKONDIR}/java

# USER_DAIKON_OPTIONS is sometimes set in a Makefile.
# PERSONAL_DAIKON_OPTIONS is never set by a checked-in Makefile; a user can
Expand Down