X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Ftarget.mk;h=1880852b0bc2898a96b3765e476017452a5b4fdf;hb=cc1d779c5f9a4ab80829b24bd715b976a7f5d98c;hp=94555e6903bfcc3341384ec27159649104f49e34;hpb=d9f022ce0add3e1ce813e70af38efd95caf1420c;p=ghc-hetmet.git

diff --git a/mk/target.mk b/mk/target.mk
index 94555e6..1880852 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -59,28 +59,29 @@
 #
 .PHONY: depend
 
-depend :: $(HS_SRCS) $(C_SRCS)
+depend :: $(MKDEPENDHS_SRCS) $(MKDEPENDC_SRCS)
 	@$(RM) .depend
 	@touch .depend
 ifneq "$(DOC_SRCS)" ""
 	$(MKDEPENDLIT) -o .depend $(MKDEPENDLIT_OPTS) $(filter %.lit,$(DOC_SRCS))
 endif
-ifneq "$(C_SRCS)" ""
-	$(MKDEPENDC) -f .depend $(MKDEPENDC_OPTS) -- $(CC_OPTS) -- $(C_SRCS) $(MKDEPENDC_SRCS)
+ifneq "$(MKDEPENDC_SRCS)" ""
+	$(MKDEPENDC) -f .depend $(MKDEPENDC_OPTS) \
+                -- $(CC_OPTS) -- $(MKDEPENDC_SRCS)
 endif
-ifneq "$(HS_SRCS)" ""
+ifneq "$(MKDEPENDHS_SRCS)" ""
 ifeq ($(notdir $(MKDEPENDHS)),ghc)
-#	New way of doing dependencies: the ghc driver knows how
+#	New way of doing dependencies: the ghc driver knows how to invoke script
 	$(MKDEPENDHS) -M -optdep-f -optdep.depend \
 		$(foreach way,$(WAYS),-optdep-s -optdep$(way)) \
 		$(MKDEPENDHS_OPTS) \
 		$(HC_OPTS) \
-		$(HS_SRCS)
+		$(MKDEPENDHS_SRCS)
 else
 #	Old way: call mkdependHS-1.2
 	$(MKDEPENDHS) -f .depend $(MKDEPENDHS_OPTS) \
 		$(foreach way,$(WAYS),-s $(way)) \
-		-- $(HC_OPTS) -- $(HS_SRCS) $(MKDEPENDHS_SRCS)
+		-- $(HC_OPTS) -- $(MKDEPENDHS_SRCS)
 endif
 endif
 
@@ -886,7 +887,7 @@ all docs runtests TAGS clean veryclean maintainer-clean install ::
 	  echo "==fptools== $(MAKE) way=$$i $@;"; \
 	  echo "PWD = $(shell pwd)"; \
 	  echo "------------------------------------------------------------------------"; \
-	  $(MAKE) way=$$i $(MFLAGS) $@ ; \
+	  $(MAKE) way=$$i --no-print-directory $(MFLAGS) $@ ; \
 	done
 	@echo "------------------------------------------------------------------------"
 	@echo "===fptools== Finished recusrively making \`$@' for ways: $(WAYS) ..."