X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fincludes%2FMakefile;h=c6d7309ab82163815a90b7ff98d68a63b400b84b;hb=8b356754aa206277c2b9f928b038bdb97a6e8aa3;hp=19471af94b6ecc4f99cdcb2d6a3e61d6a8dab133;hpb=009c94a95f06dd06fed8c16433ddbf1660e51edc;p=ghc-hetmet.git

diff --git a/ghc/includes/Makefile b/ghc/includes/Makefile
index 19471af..c6d7309 100644
--- a/ghc/includes/Makefile
+++ b/ghc/includes/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.13 2000/08/07 16:07:53 rrt Exp $
+# $Id: Makefile,v 1.17 2001/10/19 18:33:11 qrczak Exp $
 #
 
 TOP = ..
@@ -27,7 +27,7 @@ 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 $@..."
@@ -64,13 +64,30 @@ endif
 # ---------------------------------------------------------------------------
 # Make NativeDefs.h for the NCG
 
-C_PROG = mkNativeHdr
-C_SRCS = mkNativeHdr.c
+all :: DerivedConstants.h
+
+mkDerivedConstantsHdr : mkDerivedConstants.o
+	$(CC) -o $@ $(CC_OPTS) $(LD_OPTS) mkDerivedConstants.o
+
+DerivedConstants.h : mkDerivedConstantsHdr
+	./mkDerivedConstantsHdr >DerivedConstants.h
+
+CLEAN_FILES += mkDerivedConstantsHdr DerivedConstants.h
+
+# ---------------------------------------------------------------------------
+# Make NativeDefs.h for the NCG
+
+all :: NativeDefs.h
+
+mkNativeHdr.o : DerivedConstants.h
+
+mkNativeHdr : mkNativeHdr.o
+	$(CC) -o $@ $(CC_OPTS) $(LD_OPTS) mkNativeHdr.o
 
 NativeDefs.h : mkNativeHdr
 	./mkNativeHdr >NativeDefs.h
 
-CLEAN_FILES += NativeDefs.h
+CLEAN_FILES += mkNativeHdr NativeDefs.h
 
 # ---------------------------------------------------------------------------
 # boot setup:
@@ -88,7 +105,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)
 
 #