From: sof Date: Fri, 12 Oct 2001 18:44:52 +0000 (+0000) Subject: [project @ 2001-10-12 18:44:52 by sof] X-Git-Tag: Approximately_9120_patches~843 X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=ad8005b28a79ae2d10e025acd0a999fe99960c85 [project @ 2001-10-12 18:44:52 by sof] Robustified: - 'make clean' followed by 'make all' should now work as expected. - 'make boot' now forces 'depend' and 'all' to fire (not the other way around). --- diff --git a/ghc/utils/hsc2hs/Makefile b/ghc/utils/hsc2hs/Makefile index 228864b..49f56d5 100644 --- a/ghc/utils/hsc2hs/Makefile +++ b/ghc/utils/hsc2hs/Makefile @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.23 2001/10/12 14:29:11 rrt Exp $ +# $Id: Makefile,v 1.24 2001/10/12 18:44:52 sof Exp $ TOP=../.. include $(TOP)/mk/boilerplate.mk @@ -69,8 +69,11 @@ INSTALL_DATAS += template-hsc.h # Create driver configuration CONFIG_HS = Config.hs + boot :: $(CONFIG_HS) +all :: $(CONFIG_HS) + $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @$(RM) -f $(CONFIG_HS) @echo -n "Creating $(CONFIG_HS) ... " @@ -88,9 +91,11 @@ all clean distclean maintainer-clean :: $(MAKE) INSTALLING=0 BIN_DIST=0 $(MFLAGS) $@ endif +MKDEPENDHS_SRCS += $(CONFIG_HS) + +include $(TOP)/mk/target.mk + # hsc2hs-inplace is needed to boot in ghc/lib/std... ifneq "$(BootingFromHc)" "YES" boot :: all endif - -include $(TOP)/mk/target.mk