Commit ad8005b2 authored by sof's avatar sof
Browse files

[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).
parent fe798002
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# $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=../.. TOP=../..
include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/boilerplate.mk
...@@ -69,8 +69,11 @@ INSTALL_DATAS += template-hsc.h ...@@ -69,8 +69,11 @@ INSTALL_DATAS += template-hsc.h
# Create driver configuration # Create driver configuration
CONFIG_HS = Config.hs CONFIG_HS = Config.hs
boot :: $(CONFIG_HS) boot :: $(CONFIG_HS)
all :: $(CONFIG_HS)
$(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
@$(RM) -f $(CONFIG_HS) @$(RM) -f $(CONFIG_HS)
@echo -n "Creating $(CONFIG_HS) ... " @echo -n "Creating $(CONFIG_HS) ... "
...@@ -88,9 +91,11 @@ all clean distclean maintainer-clean :: ...@@ -88,9 +91,11 @@ all clean distclean maintainer-clean ::
$(MAKE) INSTALLING=0 BIN_DIST=0 $(MFLAGS) $@ $(MAKE) INSTALLING=0 BIN_DIST=0 $(MFLAGS) $@
endif endif
MKDEPENDHS_SRCS += $(CONFIG_HS)
include $(TOP)/mk/target.mk
# hsc2hs-inplace is needed to boot in ghc/lib/std... # hsc2hs-inplace is needed to boot in ghc/lib/std...
ifneq "$(BootingFromHc)" "YES" ifneq "$(BootingFromHc)" "YES"
boot :: all boot :: all
endif endif
include $(TOP)/mk/target.mk
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment