X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FMakefile;h=2d6a27a7c2b74b496b96e8053a409332727114e0;hb=423d477bfecd490de1449c59325c8776f91d7aac;hp=d9c2d1eca7ce10226c5143dc5611631bea6f57e5;hpb=567b2505b2d3d5874f3bf3641fd8d82b3207ea94;p=ghc-hetmet.git

diff --git a/ghc/includes/Makefile b/ghc/includes/Makefile
index d9c2d1e..2d6a27a 100644
--- a/ghc/includes/Makefile
+++ b/ghc/includes/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.12 2000/08/02 14:13:27 rrt Exp $
+# $Id: Makefile,v 1.23 2004/08/13 13:09:18 simonmar Exp $
 #
 
 TOP = ..
@@ -11,11 +11,20 @@ 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
@@ -25,28 +34,35 @@ gmp.h : $(FPTOOLS_TOP)/ghc/rts/gmp/gmp.h
 # and puts it in fptools/mk/config.h. We copy it down to here, prepending
 # some make variables specifying cpp platform variables.
 #
-$(H_CONFIG) : $(FPTOOLS_TOP)/mk/config.h
+$(H_CONFIG) : $(FPTOOLS_TOP)/mk/config.h $(FPTOOLS_TOP)/mk/config.mk
 
 $(H_CONFIG) :
 	@echo "Creating $@..."
 	@$(RM) $@
-	@echo "#define HostPlatform_TYPE   $(HostPlatform_CPP)"  > $@
-	@echo "#define TargetPlatform_TYPE $(HostPlatform_CPP)" >> $@
-	@echo "#define BuildPlatform_TYPE  $(HostPlatform_CPP)" >> $@
+	@echo "#ifndef __GHCCONFIG_H__"  >$@
+	@echo "#define __GHCCONFIG_H__" >>$@
+	@echo >> $@
+	@echo "#define HostPlatform_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" >> $@  
@@ -54,21 +70,44 @@ 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 "#define $(TargetVendor_CPP)_TARGET_VENDOR  1" >> $@
+	@echo "#define $(BuildVendor_CPP)_BUILD_VENDOR 	1" >> $@
+	@cat $(FPTOOLS_TOP)/mk/config.h >> $@
+	@echo "#endif /* __GHCCONFIG_H__ */"          >> $@
 	@echo "Done."
 
 # ---------------------------------------------------------------------------
-# Make NativeDefs.h for the NCG
+# Make DerivedConstants.h for the compiler
+
+all :: DerivedConstants.h
+
+mkDerivedConstants.c : $(H_CONFIG)
+
+mkDerivedConstantsHdr : mkDerivedConstants.o
+	$(CC) -o $@ $(CC_OPTS) $(LD_OPTS) mkDerivedConstants.o
+
+DerivedConstants.h : mkDerivedConstantsHdr
+	./mkDerivedConstantsHdr >$@
+
+CLEAN_FILES += mkDerivedConstantsHdr$(exeext) DerivedConstants.h
+
+# -----------------------------------------------------------------------------
+#
+
+all :: GHCConstants.h
+
+mkGHCConstants.c : $(H_CONFIG)
+
+mkGHCConstants : mkGHCConstants.o
+	$(CC) -o $@ $(CC_OPTS) $(LD_OPTS) mkGHCConstants.o
 
-C_PROG = mkNativeHdr
-C_SRCS = mkNativeHdr.c
+mkGHCConstants.o : mkDerivedConstants.c
+	$(CC) -o $@ -c $<  -DGEN_HASKELL
 
-NativeDefs.h : mkNativeHdr
-	./mkNativeHdr >NativeDefs.h
+GHCConstants.h : mkGHCConstants
+	./mkGHCConstants >$@
 
-CLEAN_FILES += NativeDefs.h
+CLEAN_FILES += mkDerivedConstantsHdr$(exeext) DerivedConstants.h
 
 # ---------------------------------------------------------------------------
 # boot setup:
@@ -86,7 +125,7 @@ boot :: all
 # (ditto for interface files). This is not *really* needed, but
 # it gives (perhaps) a cleaner binary dist structure..might change.
 #
-override datadir:=$(libdir)/includes
+override datadir:=$(libdir)/include
 INSTALL_DATAS += $(H_FILES) $(H_CONFIG)
 
 #