X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FMakefile;h=e653d3e9fea517c05445de6a0098c90e86ed2828;hb=f7bcfb698d9a895a168fd29eefd7dba8fd9be849;hp=83b74d49a782a54acc7fee3485e89a5cc9cf77a0;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/includes/Makefile b/includes/Makefile
index 83b74d4..e653d3e 100644
--- a/includes/Makefile
+++ b/includes/Makefile
@@ -9,14 +9,22 @@ 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"
+SRC_CC_OPTS += -DNOSMP
+endif
+
 #
 # Header file built from the configure script's findings
 #
@@ -47,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 */'.