Skip to content
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

Adds makefiles include directory to recursive make invocations #37

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Adds makefiles include directory to recursive make invocations #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3d6090
Adds SUBDIR_ALL to make it optional that all targets recurse
dbosk Jan 11, 2018
64f6866
Adds new precompiled version of subdir.mk
dbosk Jan 11, 2018
8756617
subdir.mk propagates INCLUDE_MAKEFILES as search path
dbosk Jan 11, 2018
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
12 changes: 10 additions & 2 deletions subdir.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
ifndef SUBDIR_MK
SUBDIR_MK=true

INCLUDE_MAKEFILES?=.

ifdef SUBDIR
.PHONY: ${SUBDIR}
${SUBDIR}::
${MAKE} -C $@ -I ${INCLUDE_MAKEFILES} ${MAKECMDGOALS}
endif

SUBDIR_ALL?=yes

ifeq (${SUBDIR_ALL},yes)
ifneq (${MAKECMDGOALS},)
.PHONY: ${MAKECMDGOALS}
${MAKECMDGOALS}: ${SUBDIR}
else
${.DEFAULT_GOAL}: ${SUBDIR}
endif
${SUBDIR}::
${MAKE} -C $@ ${MAKECMDGOALS}
endif

endif
29 changes: 25 additions & 4 deletions subdir.mk.nw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,15 @@ The subdirectories must be listed in the variable [[SUBDIR]], which holds
a space-separated list of directory names.
Then each subdirectory may in turn hold a new set of subdirectories to descend
into.
We note that the subdirectories will be built in depth-first search order.
We note that the subdirectories will be built in depth-first search order
(unless we allow parallel execution).

By default, for any goals passed on the command line we will add the directories
in [[SUBDIR]] as prerequisites.
This behaviour can be overridden by setting [[SUBDIR_ALL]] to anything different
from [[yes]].
Like this we can add the subdirectories in [[SUBDIR]] as prerequisites manually
to only a subset of desired targets.

\section{Implementation}

Expand All @@ -19,11 +26,18 @@ containing the space-separated list of subdirectories, exists.
ifndef SUBDIR_MK
SUBDIR_MK=true

INCLUDE_MAKEFILES?=.

ifdef SUBDIR
<<add subdirectories as prerequisites for the goals>>
<<let the recipe for each subdirectory recurse into it>>
endif

SUBDIR_ALL?=yes

ifeq (${SUBDIR_ALL},yes)
<<add subdirectories as prerequisites for the goals>>
endif

endif
@

Expand All @@ -33,9 +47,16 @@ the targets specified on the command-line, in all subdirectories listed in
For each directory, we specify a recipe which runs make in the subdirectory
with the goals specified on the command-line.
<<let the recipe for each subdirectory recurse into it>>=
.PHONY: ${SUBDIR}
${SUBDIR}::
${MAKE} -C $@ ${MAKECMDGOALS}
@ To ensure these recipes are run we need to ensure that they are prerequisites
${MAKE} -C $@ -I ${INCLUDE_MAKEFILES} ${MAKECMDGOALS}
@ We also want to give the sub-make access to our [[INCLUDE_MAKEFILES]], hence
the [[-I]] option.
This is mostly due to (backwards) compatibility with the MIUN versions (see
\cref{miun.compat.mk}) of the makefiles, which pre-dates the
[[INCLUDE_MAKEFILES]] construction.

To ensure these recipes are run we need to ensure that they are prerequisites
to the goals.
This also means that if no goals are given on the command-line, then we should
use the default goal.
Expand Down