X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FMakefile;h=b32efa2ffe48eaa7f151716b3396315d44fa3eb0;hb=73fabb8997b9ed762fd386259670f3a2fbc57501;hp=12d384a66a871ee9c869d2df27129dc386787073;hpb=4f29261602abf03416181dba04f5d83752940d55;p=ghc-hetmet.git

diff --git a/ghc/includes/Makefile b/ghc/includes/Makefile
index 12d384a..b32efa2 100644
--- a/ghc/includes/Makefile
+++ b/ghc/includes/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.19 2002/02/11 13:59:01 simonmar Exp $
+# $Id: Makefile,v 1.25 2004/10/08 10:16:14 ross Exp $
 #
 
 TOP = ..
@@ -11,47 +11,59 @@ 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
+#
+ifeq "$(GhcUnregisterised)" "YES"
+SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER
+endif
+
+#
 # Header file built from the configure script's findings
 #
-H_CONFIG = config.h
+H_CONFIG = ghcconfig.h
 
 boot :: gmp.h
 
-all :: $(H_CONFIG) NativeDefs.h
+all :: $(H_CONFIG)
 
 # gmp.h is copied from the GMP directory
 gmp.h : $(FPTOOLS_TOP)/ghc/rts/gmp/gmp.h
 	$(CP) $< $@
 
-# The fptools configure script creates the configuration header file 
-# and puts it in fptools/mk/config.h. We copy it down to here, prepending
-# some make variables specifying cpp platform variables.
-#
+# The fptools configure script creates the configuration header file and puts it
+# in fptools/mk/config.h. We copy it down to here (without any PACKAGE_FOO
+# definitions to avoid clashes), prepending some make variables specifying cpp
+# platform variables.
+
 $(H_CONFIG) : $(FPTOOLS_TOP)/mk/config.h $(FPTOOLS_TOP)/mk/config.mk
 
 $(H_CONFIG) :
 	@echo "Creating $@..."
 	@$(RM) $@
-	@echo "#ifndef __FPTOOLS_CONFIG_H__"  >$@
-	@echo "#define __FPTOOLS_CONFIG_H__" >>$@
+	@echo "#ifndef __GHCCONFIG_H__"  >$@
+	@echo "#define __GHCCONFIG_H__" >>$@
 	@echo >> $@
 	@echo "#define HostPlatform_TYPE   $(HostPlatform_CPP)" >> $@
-	@echo "#define TargetPlatform_TYPE $(HostPlatform_CPP)" >> $@
-	@echo "#define BuildPlatform_TYPE  $(HostPlatform_CPP)" >> $@
+	@echo "#define TargetPlatform_TYPE $(TargetPlatform_CPP)" >> $@
+	@echo "#define BuildPlatform_TYPE  $(BuildPlatform_CPP)" >> $@
 	@echo >> $@
 	@echo "#define $(HostPlatform_CPP)_HOST		1" >> $@
-	@echo "#define $(HostPlatform_CPP)_TARGET	1" >> $@
-	@echo "#define $(HostPlatform_CPP)_BUILD  	1" >> $@
+	@echo "#define $(TargetPlatform_CPP)_TARGET	1" >> $@
+	@echo "#define $(BuildPlatform_CPP)_BUILD  	1" >> $@
 	@echo >> $@
 	@echo "#define $(HostArch_CPP)_HOST_ARCH	1" >> $@
-	@echo "#define $(HostArch_CPP)_TARGET_ARCH	1" >> $@
-	@echo "#define $(HostArch_CPP)_BUILD_ARCH  	1" >> $@
+	@echo "#define $(TargetArch_CPP)_TARGET_ARCH	1" >> $@
+	@echo "#define $(BuildArch_CPP)_BUILD_ARCH  	1" >> $@
 	@echo "#define HOST_ARCH			\"$(HostArch_CPP)\"" >> $@
+	@echo "#define TARGET_ARCH			\"$(TargetArch_CPP)\"" >> $@
+	@echo "#define BUILD_ARCH			\"$(BuildArch_CPP)\"" >> $@
 	@echo >> $@
 	@echo "#define $(HostOS_CPP)_HOST_OS		1" >> $@
-	@echo "#define $(HostOS_CPP)_TARGET_OS		1" >> $@  
-	@echo "#define $(HostOS_CPP)_BUILD_OS 		1" >> $@
+	@echo "#define $(TargetOS_CPP)_TARGET_OS	1" >> $@  
+	@echo "#define $(BuildOS_CPP)_BUILD_OS 		1" >> $@
 	@echo "#define HOST_OS 				\"$(HostOS_CPP)\"" >> $@
+	@echo "#define TARGET_OS			\"$(TargetOS_CPP)\"" >> $@
+	@echo "#define BUILD_OS				\"$(BuildOS_CPP)\"" >> $@
 ifeq "$(HostOS_CPP)" "irix"
 	@echo "#ifndef $(IRIX_MAJOR)_TARGET_OS		 " >> $@  
 	@echo "#define $(IRIX_MAJOR)_TARGET_OS		1" >> $@  
@@ -59,10 +71,11 @@ ifeq "$(HostOS_CPP)" "irix"
 endif
 	@echo >> $@
 	@echo "#define $(HostVendor_CPP)_HOST_VENDOR	1" >> $@
-	@echo "#define $(HostVendor_CPP)_TARGET_VENDOR  1" >> $@
-	@echo "#define $(HostVendor_CPP)_BUILD_VENDOR 	1" >> $@
-	@cat $(FPTOOLS_TOP)/mk/$@ >> $@
-	@echo "#endif /* __FPTOOLS_CONFIG_H__ */"          >> $@
+	@echo "#define $(TargetVendor_CPP)_TARGET_VENDOR  1" >> $@
+	@echo "#define $(BuildVendor_CPP)_BUILD_VENDOR 	1" >> $@
+#	Turn '#define PACKAGE_FOO "blah"' into '/* #undef PACKAGE_FOO */'.
+	@sed 's,^\([	 ]*\)#[	 ]*define[	 ][	 ]*\(PACKAGE_[A-Z]*\)[	 ][ 	]*".*".*$$,\1/* #undef \2 */,' $(FPTOOLS_TOP)/mk/config.h >> $@
+	@echo "#endif /* __GHCCONFIG_H__ */"          >> $@
 	@echo "Done."
 
 # ---------------------------------------------------------------------------
@@ -76,24 +89,27 @@ mkDerivedConstantsHdr : mkDerivedConstants.o
 	$(CC) -o $@ $(CC_OPTS) $(LD_OPTS) mkDerivedConstants.o
 
 DerivedConstants.h : mkDerivedConstantsHdr
-	./mkDerivedConstantsHdr >DerivedConstants.h
+	./mkDerivedConstantsHdr >$@
 
-CLEAN_FILES += mkDerivedConstantsHdr DerivedConstants.h
+CLEAN_FILES += mkDerivedConstantsHdr$(exeext) DerivedConstants.h
 
-# ---------------------------------------------------------------------------
-# Make NativeDefs.h for the NCG
+# -----------------------------------------------------------------------------
+#
+
+all :: GHCConstants.h
 
-all :: NativeDefs.h
+mkGHCConstants.c : $(H_CONFIG)
 
-mkNativeHdr.o : DerivedConstants.h
+mkGHCConstants : mkGHCConstants.o
+	$(CC) -o $@ $(CC_OPTS) $(LD_OPTS) mkGHCConstants.o
 
-mkNativeHdr : mkNativeHdr.o
-	$(CC) -o $@ $(CC_OPTS) $(LD_OPTS) mkNativeHdr.o
+mkGHCConstants.o : mkDerivedConstants.c
+	$(CC) -o $@ -c $<  -DGEN_HASKELL
 
-NativeDefs.h : mkNativeHdr
-	./mkNativeHdr >NativeDefs.h
+GHCConstants.h : mkGHCConstants
+	./mkGHCConstants >$@
 
-CLEAN_FILES += mkNativeHdr NativeDefs.h
+CLEAN_FILES += mkDerivedConstantsHdr$(exeext) DerivedConstants.h
 
 # ---------------------------------------------------------------------------
 # boot setup: