X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FMakefile;h=cfb2a48446d5be1153172bcb38f1f95b3e53c9e5;hb=cdce647711c0f46f5799b24de087622cb77e647f;hp=a181c2332333d9ac7a45b8abdb5c3a4fcdc7ca90;hpb=edad06244b0a542d6b5c9ce3f3cd72941c5be804;p=ghc-hetmet.git

diff --git a/includes/Makefile b/includes/Makefile
index a181c23..cfb2a48 100644
--- a/includes/Makefile
+++ b/includes/Makefile
@@ -9,12 +9,16 @@ include $(TOP)/mk/boilerplate.mk
 H_FILES = $(filter-out gmp.h,$(wildcard *.h)) gmp.h
 
 #
-# Options -- if we're building unregisterised, add a couple of -D's
+# Options
 #
 ifeq "$(GhcUnregisterised)" "YES"
 SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER
 endif
 
+ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO"
+SRC_CC_OPTS += -DTABLES_NEXT_TO_CODE
+endif
+
 SRC_CC_OPTS += -I. -I../rts
 
 ifneq "$(GhcWithSMP)" "YES"
@@ -51,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 */'.
@@ -158,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
 #
@@ -183,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