Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
obsidiansystems
GHC
Commits
20d0ce2f
Commit
20d0ce2f
authored
May 26, 2008
by
Ian Lynagh
Browse files
Simplify specifying that some libraries need to use the build.* rules
Now you just add them to SUBDIRS_BUILD instead of SUBDIRS.
parent
d7d75586
Changes
1
Hide whitespace changes
Inline
Side-by-side
libraries/Makefile
View file @
20d0ce2f
...
...
@@ -74,9 +74,11 @@ ifeq "$(GhcLibsWithObjectIO)" "YES"
SUBDIRS
+=
$(
wildcard
ObjectIO
)
endif
SUBDIRS
+=
$(
wildcard
parallel
)
SUBDIRS
+=
$(
wildcard
ndp
)
SUBDIRS
_BUILD
+=
$(
wildcard
ndp
)
endif
SUBDIRS
+=
$(SUBDIRS_BUILD)
# -----------------------------------------------------------------------------
empty
=
...
...
@@ -293,9 +295,9 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
# needs to be done. However, we're careful not to overwrite GNUmakefile
# if it hasn't changed, so that dependency-generation isn't forced
# every time.
#
I doubt that the makefile way will work with ndp, so filter it out and use
#
a rule below to call build.library.ndp
instead
$(foreach SUBDIR,$(filter-out
ndp
,$(SUBDIRS)),make.library.$(SUBDIR))
:
\
#
Packages in $(SUBDIRS_BUILD) need to use the build.* rules instead of
#
make.*, so filter them out and use an alternate rule below
instead
.
$(foreach SUBDIR,$(filter-out
$(SUBDIRS_BUILD)
,$(SUBDIRS)),make.library.$(SUBDIR))
:
\
make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%
\
%/setup/Setup ifBuildable/ifBuildable installPackage/installPackage
if
$(IFBUILDABLE)
$*
;
then
\
...
...
@@ -310,8 +312,9 @@ make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
MAKEFILE_LOCAL
=
$(FPTOOLS_TOP_ABS)
/libraries/Makefile.local
# Hack for ndp, as described above
make.library.ndp
:
build.library.ndp
# Alternate rule, as described above
$(foreach SUBDIR,$(SUBDIRS_BUILD),make.library.$(SUBDIR))
:
\
make.library.%: build.library.%
# Build the library using 'setup build' (not the default)
$(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR))
:
\
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment