From b965a36a1cd1732eaa7fa4cea4bc0c86132d04fe Mon Sep 17 00:00:00 2001 From: sof Date: Fri, 6 Jun 1997 22:11:51 +0000 Subject: [PATCH 1/1] [project @ 1997-06-06 22:11:51 by sof] Improved test for how to invoke makedepend script on Haskell source --- mk/target.mk | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/mk/target.mk b/mk/target.mk index 80d74ab..4da238e 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -69,17 +69,19 @@ ifneq "$(MKDEPENDC_SRCS)" "" $(MKDEPENDC) -f .depend $(MKDEPENDC_OPTS) -- $(CC_OPTS) -- $(MKDEPENDC_SRCS) endif ifneq "$(MKDEPENDHS_SRCS)" "" -ifeq ($(notdir $(MKDEPENDHS)),ghc) -# 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) $(MKDEPENDHS_SRCS) -else -# Old way: call mkdependHS-1.2 - $(MKDEPENDHS) -f .depend $(MKDEPENDHS_OPTS) \ - $(foreach way,$(WAYS),-s $(way)) \ - -- $(HC_OPTS) -- $(MKDEPENDHS_SRCS) -endif + @if echo $(notdir $(MKDEPENDHS)) | grep -s ghc ; then \ + echo $(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(MKDEPENDHS_OPTS) $(HC_OPTS) $(MKDEPENDHS_SRCS) ; \ + $(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(MKDEPENDHS_OPTS) $(HC_OPTS) $(MKDEPENDHS_SRCS) ; \ + else \ + echo $(MKDEPENDHS) -f .depend $(MKDEPENDHS_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(HC_OPTS) -- $(MKDEPENDHS_SRCS) ; \ + $(MKDEPENDHS) -f .depend $(MKDEPENDHS_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(HC_OPTS) -- $(MKDEPENDHS_SRCS) ; \ + fi endif - +# +# The above decides whether to invoke the computation of dependencies +# the ghc-0.xx or the ghc-2.x way by looking for "ghc" in the name of +# of the `make depend' script. Not bulletproof this. +# ################################################################## # boot -- 1.7.10.4