Commit 20d0ce2f authored by Ian Lynagh's avatar Ian Lynagh

Simplify specifying that some libraries need to use the build.* rules

Now you just add them to SUBDIRS_BUILD instead of SUBDIRS.
parent d7d75586
...@@ -74,9 +74,11 @@ ifeq "$(GhcLibsWithObjectIO)" "YES" ...@@ -74,9 +74,11 @@ ifeq "$(GhcLibsWithObjectIO)" "YES"
SUBDIRS += $(wildcard ObjectIO) SUBDIRS += $(wildcard ObjectIO)
endif endif
SUBDIRS += $(wildcard parallel) SUBDIRS += $(wildcard parallel)
SUBDIRS += $(wildcard ndp) SUBDIRS_BUILD += $(wildcard ndp)
endif endif
SUBDIRS += $(SUBDIRS_BUILD)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
empty= empty=
...@@ -293,9 +295,9 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup ...@@ -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 # needs to be done. However, we're careful not to overwrite GNUmakefile
# if it hasn't changed, so that dependency-generation isn't forced # if it hasn't changed, so that dependency-generation isn't forced
# every time. # every time.
# I doubt that the makefile way will work with ndp, so filter it out and use # Packages in $(SUBDIRS_BUILD) need to use the build.* rules instead of
# a rule below to call build.library.ndp instead # make.*, so filter them out and use an alternate rule below instead.
$(foreach SUBDIR,$(filter-out ndp,$(SUBDIRS)),make.library.$(SUBDIR)):\ $(foreach SUBDIR,$(filter-out $(SUBDIRS_BUILD),$(SUBDIRS)),make.library.$(SUBDIR)):\
make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
%/setup/Setup ifBuildable/ifBuildable installPackage/installPackage %/setup/Setup ifBuildable/ifBuildable installPackage/installPackage
if $(IFBUILDABLE) $*; then \ if $(IFBUILDABLE) $*; then \
...@@ -310,8 +312,9 @@ make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ ...@@ -310,8 +312,9 @@ make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
MAKEFILE_LOCAL = $(FPTOOLS_TOP_ABS)/libraries/Makefile.local MAKEFILE_LOCAL = $(FPTOOLS_TOP_ABS)/libraries/Makefile.local
# Hack for ndp, as described above # Alternate rule, as described above
make.library.ndp: build.library.ndp $(foreach SUBDIR,$(SUBDIRS_BUILD),make.library.$(SUBDIR)):\
make.library.%: build.library.%
# Build the library using 'setup build' (not the default) # Build the library using 'setup build' (not the default)
$(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\ $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment