[project @ 2001-11-06 11:05:22 by simonmar]

[ghc-hetmet.git] / ghc / compiler / Makefile

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 3f7fae9..a03cfb6 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.189 2001/08/16 22:54:24 sof Exp $
+# $Id: Makefile,v 1.197 2001/11/06 11:05:22 simonmar Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -14,12 +14,16 @@ WAYS=$(GhcCompilerWays)
 # Note: there have been reports of people running up against the ARG_MAX limit
 # when linking ghc with all its constituent object files. The likely source of 
 # the problem is that the environment is a bit too big, so a workaround could
-# be to do ` env PATH=$(PATH) make ghc 'to minimise the environment. (or the
+# be to do `env PATH=$(PATH) make ghc' to minimise the environment. (or the
 # equivalent of `env' if it doesn't exist locally).
 #
 ifneq "$(way)" "dll"
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 HS_PROG=ghc$(_way)-$(ProjectVersion)
 else
+HS_PROG=ghc$(_way)
+endif
+else
 HS_PROG=ghc-$(ProjectVersion)
 endif
 
@@ -86,7 +90,7 @@ CLEAN_FILES += $(CONFIG_HS)
 DIRS = \
   utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \
   specialise simplCore stranal stgSyn simplStg codeGen absCSyn main \
-  profiling parser usageSP cprAnalysis javaGen compMan
+  profiling parser usageSP cprAnalysis compMan
 
 ifeq ($(GhcWithNativeCodeGen),YES)
 DIRS += nativeGen
@@ -99,6 +103,11 @@ DIRS += ilxGen
 SRC_HC_OPTS += -DILX
 endif
 
+ifeq ($(GhcWithJavaGen),YES)
+DIRS += javaGen
+SRC_HC_OPTS += -DJAVA
+endif
+
 #
 # Canonicalize the GHC version number - assume it is has the form x.yy.[z] or 
 # x.yy[.date] where date = yyyymmdd
@@ -223,6 +232,11 @@ SRC_HC_OPTS += \
 # Disaster!  Then the hc file sees the GHC 5.02 (or whatever)
 # include files.   For the moment we've reverted to using
 # an explicit path in the .hs sources
+#
+# For the benefit of <5.00 compilers, do include GHC_INCLUDE_DIR
+# when generating dependencies. (=> it gets passed onto mkdependHS,
+# which needs it).
+SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
 
 ifneq "$(mingw32_TARGET_OS)" "1"
 SRC_HC_OPTS += -package concurrent -package posix -package text -package util
@@ -274,7 +288,7 @@ utils/PrimPacked_HC_OPTS    = -fvia-C -monly-3-regs
 
 # ByteCodeItbls uses primops that the NCG doesn't support yet.
 ghci/ByteCodeItbls_HC_OPTS     = -fvia-C
-ghci/ByteCodeLink_HC_OPTS      = -fvia-C
+ghci/ByteCodeLink_HC_OPTS      = -fvia-C -monly-3-regs
 
 # CSE interacts badly with top-level IORefs (reportedly in DriverState and
 # DriverMkDepend), causing some of them to be commoned up.  We have a fix for
@@ -295,7 +309,7 @@ main/SysTools_HC_OPTS               = -fno-cse
 # compiler doesn't realise that the stcall foreign imports are indeed
 # stdcall, and doesn't generate the Foo@8 name for them
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-main/SysTools_HC_OPTS          += '-\#include <windows.h>'
+main/SysTools_HC_OPTS          += '-\#include <windows.h>' '-\#include <process.h>'
 endif
 
 # ----------------------------------------------------------------------------
@@ -324,7 +338,8 @@ PRIMOP_BITS=primop-data-decl.hs-incl \
             primop-usage.hs-incl  \
             primop-primop-info.hs-incl
 
-SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR)
+SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional
+SRC_CPP_OPTS += ${GhcCppOpts}
 
 ifneq "$(BootingFromHc)" "YES"
 prelude/PrimOp.lhs prelude/PrimOp.o: $(PRIMOP_BITS)
@@ -379,11 +394,6 @@ ghc-inplace : $(HS_PROG)
        echo '#!/bin/sh' >>$@
        echo exec $(FPTOOLS_TOP_ABS_UNIX)/ghc/compiler/$(HS_PROG) -B$(FPTOOLS_TOP_ABS) '"$$@"' >>$@
        chmod 755 $@
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-       @$(RM) $@.bat
-       echo "@"$(subst /,\\,$(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG)) "-B$(FPTOOLS_TOP_ABS) %1 %2 %3 %4 %5 %6 %7 %8 %9" >$@.bat
-       chmod 755 $@.bat
-endif
 
 CLEAN_FILES += ghc-inplace
 
@@ -392,9 +402,13 @@ CLEAN_FILES += ghc-inplace
 
 # We don't want ghc treated as an ordinary executable,
 # but put it together with the libraries.
-# Also don't want any interface files intstalled
+# Also don't want any interface files installed
 
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 INSTALL_LIBEXECS += $(HS_PROG)
+else
+INSTALL_PROGS += $(HS_PROG)
+endif
 
 #-----------------------------------------------------------------------------
 #              clean