From: simonmar Date: Mon, 14 Feb 2005 16:20:56 +0000 (+0000) Subject: [project @ 2005-02-14 16:20:56 by simonmar] X-Git-Tag: Initial_conversion_from_CVS_complete~1074 X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=04be4ca4ea5f7c023484c5731ee06917c2aca608 [project @ 2005-02-14 16:20:56 by simonmar] More libghccompat nonsense --- diff --git a/ghc/utils/hsc2hs/Makefile b/ghc/utils/hsc2hs/Makefile index 67aa40d..4716d9a 100644 --- a/ghc/utils/hsc2hs/Makefile +++ b/ghc/utils/hsc2hs/Makefile @@ -87,6 +87,22 @@ endif override datadir=$(libdir) INSTALL_DATAS += template-hsc.h +# This is horrible. We ought to be able to omit the entire directory +# from mkDependHS. +SRC_MKDEPENDHS_OPTS += \ + -optdep--exclude-module=Compat.RawSystem \ + -optdep--exclude-module=Compat.Directory \ + -optdep--exclude-module=Distribution.Compat.ReadP \ + -optdep--exclude-module=Distribution.Extension \ + -optdep--exclude-module=Distribution.GetOpt \ + -optdep--exclude-module=Distribution.InstalledPackageInfo \ + -optdep--exclude-module=Distribution.License \ + -optdep--exclude-module=Distribution.Package \ + -optdep--exclude-module=Distribution.ParseUtils \ + -optdep--exclude-module=Distribution.Setup \ + -optdep--exclude-module=Distribution.Version \ + -optdep--exclude-module=System.Directory.Internals + # ----------------------------------------------------------------------------- # don't recurse on 'make install' # diff --git a/ghc/utils/runghc/Makefile b/ghc/utils/runghc/Makefile index 2a1de5c..213422e 100644 --- a/ghc/utils/runghc/Makefile +++ b/ghc/utils/runghc/Makefile @@ -15,4 +15,20 @@ SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat # we must also build with $(GhcHcOpts) here: SRC_HC_OPTS += $(GhcHcOpts) +# This is horrible. We ought to be able to omit the entire directory +# from mkDependHS. +SRC_MKDEPENDHS_OPTS += \ + -optdep--exclude-module=Compat.RawSystem \ + -optdep--exclude-module=Compat.Directory \ + -optdep--exclude-module=Distribution.Compat.ReadP \ + -optdep--exclude-module=Distribution.Extension \ + -optdep--exclude-module=Distribution.GetOpt \ + -optdep--exclude-module=Distribution.InstalledPackageInfo \ + -optdep--exclude-module=Distribution.License \ + -optdep--exclude-module=Distribution.Package \ + -optdep--exclude-module=Distribution.ParseUtils \ + -optdep--exclude-module=Distribution.Setup \ + -optdep--exclude-module=Distribution.Version \ + -optdep--exclude-module=System.Directory.Internals + include $(TOP)/mk/target.mk