[commit: nofib] master: Remove references to MKDEPENDC (301adc7)

Ian Lynagh igloo at earth.li
Tue May 28 14:59:24 CEST 2013


Repository : ssh://darcs.haskell.org//srv/darcs/nofib

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/301adc7389415568c2a954cf22136216c7e154a6

>---------------------------------------------------------------

commit 301adc7389415568c2a954cf22136216c7e154a6
Author: Ian Lynagh <ian at well-typed.com>
Date:   Tue May 28 13:57:23 2013 +0100

    Remove references to MKDEPENDC
    
    It no longer exists

>---------------------------------------------------------------

 mk/boilerplate.mk |    1 -
 mk/ghc-opts.mk    |    3 +--
 mk/ghc-paths.mk   |    2 --
 mk/ghc-target.mk  |    2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index f5567f7..929d03d 100644
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -93,7 +93,6 @@ endef
 
 $(eval $(call ghc-ge,6,13))
 
-MKDEPENDC := $(GHC_TOP)/$(MKDEPENDC)
 RUNTEST   = $(NOFIB_TOP)/runstdtest/runstdtest
 
 USE_NEW_MKDEPEND_FLAGS = YES
diff --git a/mk/ghc-opts.mk b/mk/ghc-opts.mk
index 4000991..49d8fea 100644
--- a/mk/ghc-opts.mk
+++ b/mk/ghc-opts.mk
@@ -17,7 +17,7 @@
 #
 #		AR AS CPP CTAGS C FLEX HC HSTAGS LD LINT 
 #		LIT2CHANGELOG LIT2HTML LIT2LATEX LIT2PGM
-#		MKDEPENDC MKDEPENDHS MKDEPENDLIT RUNTEST
+#		MKDEPENDHS MKDEPENDLIT RUNTEST
 #		UNLIT          
 
 
@@ -98,7 +98,6 @@ LIT2CHANGELOG_OPTS = $(SRC_LIT2CHANGELOG_OPTS) $(WAY$(_way)_LIT2CHANGELOG_OPTS)
 LIT2HTML_OPTS      = $(SRC_LIT2HTML_OPTS) $(WAY$(_way)_LIT2HTML_OPTS) $(EXTRA_LIT2HTML_OPTS)
 LIT2LATEX_OPTS     = $(SRC_LIT2LATEX_OPTS) $(WAY$(_way)_LIT2LATEX_OPTS) $(EXTRA_LIT2LATEX_OPTS)
 LIT2PGM_OPTS       = $(SRC_LIT2PGM_OPTS) $(WAY$(_way)_LIT2PGM_OPTS) $(EXTRA_LIT2PGM_OPTS)
-MKDEPENDC_OPTS     = $(SRC_MKDEPENDC_OPTS) $(WAY$(_way)_MKDEPENDC_OPTS) $(EXTRA_MKDEPENDC_OPTS)
 MKDEPENDHS_OPTS    = $(BOOTSTRAPPING_PACKAGE_CONF_MKDEPENDHS_OPTS) \
                      $(SRC_MKDEPENDHS_OPTS) $(WAY$(_way)_MKDEPENDHS_OPTS) \
                      $(EXTRA_MKDEPENDHS_OPTS)
diff --git a/mk/ghc-paths.mk b/mk/ghc-paths.mk
index 4cb2bbf..8150766 100644
--- a/mk/ghc-paths.mk
+++ b/mk/ghc-paths.mk
@@ -201,8 +201,6 @@ else
 MKDEPENDHS_SRCS=
 endif
 
-MKDEPENDC_SRCS=$(C_SRCS)
-
 #------------------------------------------------------------------
 #
 # make TAGS defaults
diff --git a/mk/ghc-target.mk b/mk/ghc-target.mk
index fc84366..16b9258 100644
--- a/mk/ghc-target.mk
+++ b/mk/ghc-target.mk
@@ -82,7 +82,7 @@ else
 MKDEPENDHS_FLAGS = -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way))
 endif
 
-depend :: $(MKDEPENDHS_SRCS) $(MKDEPENDC_SRCS) $(PKGCONF_DEP)
+depend :: $(MKDEPENDHS_SRCS) $(PKGCONF_DEP)
 	@$(RM) .depend
 	@touch .depend
 ifneq "$(DOC_SRCS)" ""





More information about the ghc-commits mailing list