X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsub-makefile.mk;h=b69122d6ff2d3c86e045bc62c3d829557bdff2b2;hb=4108894c6e92887fe03c2397ff5a8c424413aad6;hp=a1d1e9b608d0e0183798e3a51c36db231b4ee243;hpb=971ccfbbc3d81e8c2f24c985b22bc93748e865e0;p=ghc-hetmet.git

diff --git a/mk/sub-makefile.mk b/mk/sub-makefile.mk
index a1d1e9b..b69122d 100644
--- a/mk/sub-makefile.mk
+++ b/mk/sub-makefile.mk
@@ -16,21 +16,46 @@ TOPMAKE = $(MAKE) -C $(TOP)
 
 default: all
 
-fast :
-	+$(TOPMAKE) all_$(dir) $(dir)_dist-install_NO_BUILD_DEPS=YES \
-	   OMIT_PHASE_1=YES OMIT_PHASE_2=YES OMIT_PHASE_3=YES
+fast: all
+
+FAST_MAKE_OPTS =\
+  $(dir)_dist_NO_BUILD_DEPS=YES \
+  $(dir)_dist-boot_NO_BUILD_DEPS=YES \
+  $(dir)_dist-install_NO_BUILD_DEPS=YES \
+  OMIT_PHASE_1=YES OMIT_PHASE_2=YES OMIT_PHASE_3=YES
+
+ifneq "$(filter fast,$(MAKECMDGOALS))" ""
+EXTRA_MAKE_OPTS += $(FAST_MAKE_OPTS)
+else
+ifeq "$(FAST)" "YES"
+EXTRA_MAKE_OPTS += $(FAST_MAKE_OPTS)
+endif
+endif
 
 # We must not execute multiple recursive invocations of make in parallel.
 .NOTPARALLEL:
 
 STD_TARGETS = all clean distclean maintainer_clean install html ps pdf
+DIRECTORY_INDEPENDENT_TARGETS = show
 
 # The + tells make that we're recursively invoking make, otherwise 'make -j2'
 # goes wrong.
 $(STD_TARGETS): 
-	+$(TOPMAKE) $@_$(dir)
+	+$(TOPMAKE) $@_$(dir) $(EXTRA_MAKE_OPTS)
 
-OTHERTARGETS=$(filter-out fast $(STD_TARGETS) $(SPEC_TARGETS),$(MAKECMDGOALS))
+$(DIRECTORY_INDEPENDENT_TARGETS):
+	+$(TOPMAKE) $@ $(EXTRA_MAKE_OPTS)
+
+OTHERTARGETS=$(filter-out fast help show $(STD_TARGETS) $(SPEC_TARGETS),$(MAKECMDGOALS))
 .PHONY: $(OTHERTARGETS)
 $(OTHERTARGETS):
-	+$(TOPMAKE) $(dir)/$@
+	+$(TOPMAKE) $(dir)/$@ $(EXTRA_MAKE_OPTS)
+
+.PHONY: help
+help : sub-help
+
+.PHONY: sub-help
+sub-help :
+	@echo "You are in subdirectory \"$(dir)\"."
+	@echo "Useful targets in this directory:"
+	@cat $(TOP)/SUBMAKEHELP