X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FMakefile;h=8d9e0442fada36eca06c99ff6d77ff5cd9f7adb1;hb=76f99ef2cb3cc8b83d1123c7728d629d69a4eaf4;hp=13528c563fc736b2c18111c02553e93ea5575da1;hpb=f271c1f89f2f60d1416a029f1aa5ff2b33dd4be9;p=ghc-hetmet.git

diff --git a/ghc/includes/Makefile b/ghc/includes/Makefile
index 13528c5..8d9e044 100644
--- a/ghc/includes/Makefile
+++ b/ghc/includes/Makefile
@@ -1,6 +1,4 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.24 2004/09/19 09:15:03 panne Exp $
-#
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -20,11 +18,12 @@ endif
 #
 # Header file built from the configure script's findings
 #
-H_CONFIG = ghcconfig.h
+H_CONFIG   = ghcautoconf.h
+H_PLATFORM = ghcplatform.h
 
 boot :: gmp.h
 
-all :: $(H_CONFIG)
+all :: $(H_CONFIG) $(H_PLATFORM)
 
 # gmp.h is copied from the GMP directory
 gmp.h : $(FPTOOLS_TOP)/ghc/rts/gmp/gmp.h
@@ -37,45 +36,56 @@ gmp.h : $(FPTOOLS_TOP)/ghc/rts/gmp/gmp.h
 
 $(H_CONFIG) : $(FPTOOLS_TOP)/mk/config.h $(FPTOOLS_TOP)/mk/config.mk
 
-$(H_CONFIG) :
+$(H_CONFIG) : Makefile
+	@echo "#ifndef __GHCAUTOCONF_H__"  >$@
+	@echo "#define __GHCAUTOCONF_H__" >>$@
+#	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 /* __GHCAUTOCONF_H__ */"          >> $@
+	@echo "Done."
+
+$(H_PLATFORM) : Makefile
 	@echo "Creating $@..."
 	@$(RM) $@
-	@echo "#ifndef __GHCCONFIG_H__"  >$@
-	@echo "#define __GHCCONFIG_H__" >>$@
+	@echo "#ifndef __GHCPLATFORM_H__"  >$@
+	@echo "#define __GHCPLATFORM_H__" >>$@
 	@echo >> $@
-	@echo "#define HostPlatform_TYPE   $(HostPlatform_CPP)" >> $@
-	@echo "#define TargetPlatform_TYPE $(TargetPlatform_CPP)" >> $@
-	@echo "#define BuildPlatform_TYPE  $(BuildPlatform_CPP)" >> $@
+	@echo "#define BuildPlatform_TYPE  $(HostPlatform_CPP)" >> $@
+	@echo "#define HostPlatform_TYPE   $(TargetPlatform_CPP)" >> $@
 	@echo >> $@
-	@echo "#define $(HostPlatform_CPP)_HOST		1" >> $@
-	@echo "#define $(TargetPlatform_CPP)_TARGET	1" >> $@
-	@echo "#define $(BuildPlatform_CPP)_BUILD  	1" >> $@
+	@echo "#define $(HostPlatform_CPP)_BUILD  1" >> $@
+	@echo "#define $(TargetPlatform_CPP)_HOST  1" >> $@
 	@echo >> $@
-	@echo "#define $(HostArch_CPP)_HOST_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 "#define $(HostArch_CPP)_BUILD_ARCH  1" >> $@
+	@echo "#define $(TargetArch_CPP)_HOST_ARCH  1" >> $@
+	@echo "#define BUILD_ARCH  \"$(HostArch_CPP)\"" >> $@
+	@echo "#define HOST_ARCH  \"$(TargetArch_CPP)\"" >> $@
 	@echo >> $@
-	@echo "#define $(HostOS_CPP)_HOST_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)\"" >> $@
+	@echo "#define $(HostOS_CPP)_BUILD_OS  1" >> $@
+	@echo "#define $(TargetOS_CPP)_HOST_OS  1" >> $@
+	@echo "#define BUILD_OS  \"$(HostOS_CPP)\"" >> $@
+	@echo "#define HOST_OS  \"$(TargetOS_CPP)\"" >> $@
 ifeq "$(HostOS_CPP)" "irix"
-	@echo "#ifndef $(IRIX_MAJOR)_TARGET_OS		 " >> $@  
-	@echo "#define $(IRIX_MAJOR)_TARGET_OS		1" >> $@  
-	@echo "#endif					 " >> $@  
+	@echo "#ifndef $(IRIX_MAJOR)_HOST_OS" >> $@  
+	@echo "#define $(IRIX_MAJOR)_HOST_OS  1" >> $@  
+	@echo "#endif" >> $@  
 endif
 	@echo >> $@
-	@echo "#define $(HostVendor_CPP)_HOST_VENDOR	1" >> $@
+	@echo "#define $(HostVendor_CPP)_BUILD_VENDOR  1" >> $@
+	@echo "#define $(TargetVendor_CPP)_HOST_VENDOR  1" >> $@
+	@echo "#define BUILD_VENDOR  \"$(HostVendor_CPP)\"" >> $@
+	@echo "#define HOST_VENDOR  \"$(TargetVendor_CPP)\"" >> $@
+	@echo >> $@
+	@echo "/* These TARGET macros are for backwards compatibily... DO NOT USE! */" >> $@
+	@echo "#define TargetPlatform_TYPE $(TargetPlatform_CPP)" >> $@
+	@echo "#define $(TargetPlatform_CPP)_TARGET  1" >> $@
+	@echo "#define $(TargetArch_CPP)_TARGET_ARCH  1" >> $@
+	@echo "#define TARGET_ARCH  \"$(TargetArch_CPP)\"" >> $@
+	@echo "#define $(TargetOS_CPP)_TARGET_OS  1" >> $@  
+	@echo "#define TARGET_OS  \"$(TargetOS_CPP)\"" >> $@
 	@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_BUGREPORT\|PACKAGE_NAME\|PACKAGE_STRING\|PACKAGE_TARNAME\|PACKAGE_VERSION\)[	 ].*$$,\1/* #undef \2 */,' $(FPTOOLS_TOP)/mk/config.h >> $@
-	@echo "#endif /* __GHCCONFIG_H__ */"          >> $@
+	@echo >> $@
+	@echo "#endif /* __GHCPLATFORM_H__ */"          >> $@
 	@echo "Done."
 
 # ---------------------------------------------------------------------------
@@ -98,8 +108,6 @@ CLEAN_FILES += mkDerivedConstantsHdr$(exeext) DerivedConstants.h
 
 all :: GHCConstants.h
 
-mkGHCConstants.c : $(H_CONFIG)
-
 mkGHCConstants : mkGHCConstants.o
 	$(CC) -o $@ $(CC_OPTS) $(LD_OPTS) mkGHCConstants.o
 
@@ -109,7 +117,7 @@ mkGHCConstants.o : mkDerivedConstants.c
 GHCConstants.h : mkGHCConstants
 	./mkGHCConstants >$@
 
-CLEAN_FILES += mkDerivedConstantsHdr$(exeext) DerivedConstants.h
+CLEAN_FILES += mkGHCConstants$(exeext) GHCConstants.h
 
 # ---------------------------------------------------------------------------
 # boot setup:
@@ -128,12 +136,12 @@ boot :: all
 # it gives (perhaps) a cleaner binary dist structure..might change.
 #
 override datadir:=$(libdir)/include
-INSTALL_DATAS += $(H_FILES) $(H_CONFIG)
+INSTALL_DATAS += $(H_FILES) $(H_CONFIG) $(H_PLATFORM)
 
 #
 # `make clean' settings:
 #
-CLEAN_FILES += $(H_CONFIG)
+CLEAN_FILES += $(H_CONFIG) $(H_PLATFORM)
 
 #
 # Finally, slurp in the standard targets.