[project @ 1998-01-29 11:38:20 by simonm]

[ghc-hetmet.git] / mk / target.mk

diff --git a/mk/target.mk b/mk/target.mk
index 31365a3..c46d23d 100644 (file)
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -72,19 +72,13 @@ ifneq "$(MKDEPENDC_SRCS)" ""
        $(MKDEPENDC) -f .depend $(MKDEPENDC_OPTS) -- $(CC_OPTS) -- $(MKDEPENDC_SRCS)
 endif
 ifneq "$(MKDEPENDHS_SRCS)" ""
-       @if ( echo $(notdir $(MKDEPENDHS)) | grep ghc >/dev/null 2>&1 ); then \
-          echo $(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-optdep-o -optdep$(obj)) $(MKDEPENDHS_OPTS) $(HC_OPTS) $(MKDEPENDHS_SRCS) ; \
-          $(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-optdep-o -optdep$(obj)) $(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
+       $(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-optdep-o -optdep$(obj)) $(MKDEPENDHS_OPTS) $(patsubst -odir,,$(HC_OPTS)) $(MKDEPENDHS_SRCS)
 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.
-#
+
+# the above patsubst is a hack to remove the '-odir $*' from HC_OPTS
+# which is present when we're splitting objects.  The $* maps to
+# nothing, since this isn't a pattern rule, so we have to get rid of
+# the -odir too to avoid problems.
 
 ##################################################################
 #                      boot
@@ -424,7 +418,6 @@ endif
 # get one install rule
 #
 #      INSTALL_PROGS     executable programs in $(bindir)
-#      INSTALL_BIN_LINKS symbolic links to executable programs in $(bindir)
 #      INSTALL_SCRIPTS   executable scripts in $(bindir)
 #      INSTALL_LIBS      platform-dependent libraries in $(libdir) (ranlib'ed)
 #      INSTALL_LIBEXECS  platform-dependent execs in $(libdir)
@@ -468,14 +461,6 @@ install:: $(INSTALL_PROGS)
        done
 endif
 
-ifneq "$(INSTALL_BIN_LINKS)" ""
-install:: $(INSTALL_BIN_LINKS)
-       @$(INSTALL_DIR) $(bindir)
-       for i in $(INSTALL_BIN_LINKS); do \
-               $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i$(exeext) $(bindir); \
-       done
-endif
-
 #
 # Just like INSTALL_PROGS, but prefix with install sites bin/lib/data and
 # install without stripping.