X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FMakefile;h=1481c359b9d2a65efb6a419045a410e86e355ffe;hb=0d18f0278dd9bcdeb7ae0798ade2b67ee0f6fd2f;hp=058056c258fa50422552f3a7a9bd4b39907766f6;hpb=06a6a6fcb245d716fa338757597c4d60df524339;p=ghc-hetmet.git

diff --git a/ghc/includes/Makefile b/ghc/includes/Makefile
index 058056c..1481c35 100644
--- a/ghc/includes/Makefile
+++ b/ghc/includes/Makefile
@@ -1,54 +1,33 @@
-#
-# ghc/includes
+# -----------------------------------------------------------------------------
+# $Id: Makefile,v 1.14 2000/12/08 11:47:00 rrt Exp $
 #
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
 
 #
-# Just to make sure, no ways stuff in here, please.
+# All header files
 #
-override WAYS=
-
-# De-litted header files
-LH_FILES=$(wildcard *.lh)
-
-DELIT_H_FILES = $(patsubst %.lh, %.h, $(LH_FILES))
+H_FILES = $(filter-out gmp.h,$(wildcard *.h)) gmp.h
 
 #
 # Header file built from the configure script's findings
 #
 H_CONFIG = config.h
 
+boot :: gmp.h
 
-# Everything else
-H_FILES = stgdefs.h rtsdefs.h StgDirections.h StgMachDeps.h error.h \
-  ieee-flpt.h gmp.h LLC.h HLC.h
-
-MKDEPENDC_SRCS=mkNativeHdr.c
-
-ALL_FILES = $(DELIT_H_FILES) $(H_FILES)
-ifeq ($(GhcWithNativeCodeGen),YES)
-ALL_FILES += $(TARGETPLATFORM).h
-endif
-
-
-#
-# In main/Signals we need to distinguish between irix5 and irix6,
-# so we suitably mangle HostOS_FULL to get at the major version.
-# (A hack, for sure - ToDo: consider systematically adding more
-# fine-grained OS info to this Makefile/configure soup )
+all :: $(H_CONFIG) NativeDefs.h
 
-ifeq "$(HostOS_CPP)" "irix"
-IRIX_MAJOR = $(shell echo $(HostOS_Full) | sed 's/\(irix[^.]*\).*$$/\1/' )
-endif
+# 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.
 #
-$(H_CONFIG) : $(FPTOOLS_TOP)/mk/config.h
+$(H_CONFIG) : $(FPTOOLS_TOP)/mk/config.h $(FPTOOLS_TOP)/mk/config.mk
 
 $(H_CONFIG) :
 	@echo "Creating $@..."
@@ -64,10 +43,12 @@ $(H_CONFIG) :
 	@echo "#define $(HostArch_CPP)_HOST_ARCH	1" >> $@
 	@echo "#define $(HostArch_CPP)_TARGET_ARCH	1" >> $@
 	@echo "#define $(HostArch_CPP)_BUILD_ARCH  	1" >> $@
+	@echo "#define HOST_ARCH			\"$(HostArch_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 HOST_OS 				\"$(HostOS_CPP)\"" >> $@
 ifeq "$(HostOS_CPP)" "irix"
 	@echo "#ifndef $(IRIX_MAJOR)_TARGET_OS		 " >> $@  
 	@echo "#define $(IRIX_MAJOR)_TARGET_OS		1" >> $@  
@@ -80,25 +61,21 @@ endif
 	@cat $(FPTOOLS_TOP)/mk/$@ >> $@
 	@echo "Done."
 
-$(TARGETPLATFORM).h : mkNativeHdr
-	$(RM) $@
-	./mkNativeHdr > $@ || ( rm $@ && exit 1 )
+# ---------------------------------------------------------------------------
+# Make NativeDefs.h for the NCG
 
-#
-# Building mkNativeHdr using the Haskell compiler
-# to do it (ghc really).
-#
-mkNativeHdr : $(HLIT) $(HFILES) mkNativeHdr.c
-	$(CC) -o mkNativeHdr mkNativeHdr.c
+C_PROG = mkNativeHdr
+C_SRCS = mkNativeHdr.c
 
-all :: $(H_CONFIG) $(ALL_FILES)
+NativeDefs.h : mkNativeHdr
+	./mkNativeHdr >NativeDefs.h
 
-#
+CLEAN_FILES += NativeDefs.h
+
+# ---------------------------------------------------------------------------
 # boot setup:
 #
-# When building the dependencies in runtime/ , lib/ we need to get
-# at the de-litted versions of includes/, hence we arrange the
-# `depend' target to depend on `all'.
+# Need config.h to make dependencies in the runtime system source.
 #
 boot :: all
 
@@ -112,16 +89,12 @@ boot :: all
 # it gives (perhaps) a cleaner binary dist structure..might change.
 #
 override datadir:=$(libdir)/includes
-INSTALL_DATAS += $(DELIT_H_FILES) $(H_FILES) $(TARGETPLATFORM).h $(H_CONFIG)
+INSTALL_DATAS += $(H_FILES) $(H_CONFIG)
 
 #
 # `make clean' settings:
 #
-CLEAN_FILES += $(DELIT_H_FILES) $(H_CONFIG) mkNativeHdr.o mkNativeHdr
-
-ifeq ($(GhcWithNativeCodeGen),YES)
-CLEAN_FILES += $(TARGETPLATFORM).h
-endif
+CLEAN_FILES += $(H_CONFIG)
 
 #
 # Finally, slurp in the standard targets.