Changing internal data structures used by Hpc

[ghc-hetmet.git] / includes / Makefile

diff --git a/includes/Makefile b/includes/Makefile
index b1c57f9..cfb2a48 100644 (file)
--- a/includes/Makefile
+++ b/includes/Makefile
@@ -11,15 +11,11 @@ H_FILES = $(filter-out gmp.h,$(wildcard *.h)) gmp.h
 #
 # Options
 #
-ifeq "$(GhcWithNoRegs)" "YES"
-SRC_CC_OPTS += -DNO_REGS
+ifeq "$(GhcUnregisterised)" "YES"
+SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER
 endif
 
-ifeq "$(GhcWithMiniInterpreter)" "YES"
-SRC_CC_OPTS += -DUSE_MINIINTERPRETER
-endif
-
-ifeq "$(GhcWithTablesNextToCode)" "YES"
+ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO"
 SRC_CC_OPTS += -DTABLES_NEXT_TO_CODE
 endif
 
@@ -59,6 +55,7 @@ else
 $(H_CONFIG) : $(FPTOOLS_TOP)/mk/config.h $(FPTOOLS_TOP)/mk/config.mk
 
 $(H_CONFIG) : Makefile
+       @echo "Creating $@..."
        @echo "#ifndef __GHCAUTOCONF_H__"  >$@
        @echo "#define __GHCAUTOCONF_H__" >>$@
 #      Turn '#define PACKAGE_FOO "blah"' into '/* #undef PACKAGE_FOO */'.
@@ -166,10 +163,6 @@ CLEAN_FILES += mkGHCConstants$(exeext) GHCConstants.h
 # ---------------------------------------------------------------------------
 # boot setup:
 #
-# Need config.h to make dependencies in the runtime system source.
-#
-boot :: all
-
 #
 # Install all header files
 #
@@ -191,3 +184,14 @@ CLEAN_FILES += $(H_CONFIG) $(H_PLATFORM)
 # Finally, slurp in the standard targets.
 #
 include $(TOP)/mk/target.mk
+
+# We need DerivedConstants.h in order to make dependencies in the RTS
+# sources, so 'make boot' here should behave like 'make all'.
+#
+# However, note that we should do this only *after* 'make boot' has
+# created .depend in here; otherwise an out-of-date .depend file can
+# prevent 'make boot' from working, requiring manual removal of
+# .depend (see #1095).  This is why the following target comes *after*
+# target.mk is included above (target.mk contains "boot :: depend").
+#
+boot :: all