X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Futils%2Fhsc2hs%2FMakefile;h=21d917ffa3ec48665cabdc8dd470c6b805894363;hb=e8812a6376ff6263cf624da3228ceaa0d319dafb;hp=ea35fed6e55db6bed82db8c54dbeb71f3e3a9c83;hpb=645c395c12a6011a8b44d701e634d7e09d7e5c87;p=ghc-hetmet.git

diff --git a/ghc/utils/hsc2hs/Makefile b/ghc/utils/hsc2hs/Makefile
index ea35fed..21d917f 100644
--- a/ghc/utils/hsc2hs/Makefile
+++ b/ghc/utils/hsc2hs/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.29 2002/01/21 19:56:20 sof Exp $
+# $Id: Makefile,v 1.36 2002/10/29 04:01:01 mthomas Exp $
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
@@ -9,17 +9,23 @@ INCLUDE_DIR=ghc/includes
 
 INSTALLING=1
 
-ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 HS_PROG           = hsc2hs-bin
-else
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+HS_PROG           = hsc2hs$(exeext)
+endif
+ifeq "$(HOSTPLATFORM)" "i386-unknown-cygwinw32"
 HS_PROG           = hsc2hs$(exeext)
 endif
-SRC_HC_OPTS      += -package util -cpp
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-SRC_HC_OPTS      += -package win32 '-\#include <process.h>'
-endif 
 
-ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ghc_ge_504 = $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else echo NO; fi)
+
+ifeq "$(ghc_ge_504)" "NO"
+SRC_HC_OPTS +=  -package util
+endif
+
+SRC_HC_OPTS      += -cpp
+
+ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 INSTALLED_SCRIPT_PROG  = hsc2hs
 endif
 INPLACE_SCRIPT_PROG    = hsc2hs-inplace
@@ -45,12 +51,12 @@ endif # BIN_DIST
 else
 HSC2HS_BINDIR=$(FPTOOLS_TOP_ABS)/$(CURRENT_DIR)
 HSC2HS_DIR=$(FPTOOLS_TOP_ABS)/$(CURRENT_DIR)
-ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-HSC2HS_EXTRA="--cc=$(CC) --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(FPTOOLS_TOP_ABS)/$(INCLUDE_DIR)"
-else
+
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 extra_flags=$(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS)))
-HSC2HS_EXTRA="--cc=$(CC) $(extra_flags) --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(FPTOOLS_TOP_ABS)/$(INCLUDE_DIR)"
 endif
+
+HSC2HS_EXTRA="--cc=$(CC) $(extra_flags) --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(FPTOOLS_TOP_ABS)/$(INCLUDE_DIR)"
 endif
 
 $(SCRIPT_PROG) : Makefile
@@ -74,12 +80,12 @@ INSTALL_DATAS += template-hsc.h
 # -----------------------------------------------------------------------------
 # Create driver configuration
 
-CONFIG_HS = Config.hs
+CONFIG_HS   = Config.hs
+CLEAN_FILES += $(CONFIG_HS)
+EXTRA_SRCS  += $(CONFIG_HS)
 
 boot :: $(CONFIG_HS)
 
-all :: $(CONFIG_HS)
-
 $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
 	@$(RM) -f $(CONFIG_HS)
 	@echo -n "Creating $(CONFIG_HS) ... "
@@ -87,27 +93,22 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
 	@echo "cDEFAULT_TMPDIR       = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS)
 	@echo "cGCC                  = \"$(WhatGccIsCalled)\"" >> $(CONFIG_HS)
 	@echo "progNameSuffix        = \"$(exeext)\"" >> $(CONFIG_HS)
-ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 	@echo "pathSep               = '/'" >> $(CONFIG_HS)
 else
-	@echo "pathSep               = '\\\\'" >> $(CONFIG_HS)
+	@echo "pathSep               = (toEnum 92 :: Char)" >> $(CONFIG_HS)
 endif
 	@echo done.
 
-CLEAN_FILES += $(CONFIG_HS)
-
+# -----------------------------------------------------------------------------
 # don't recurse on 'make install'
 #
 ifeq "$(INSTALLING)" "1"
-all clean distclean maintainer-clean ::
+all :: $(HS_PROG)
 	$(MAKE) INSTALLING=0 BIN_DIST=0 $(MFLAGS) $@
-endif
 
-MKDEPENDHS_SRCS += $(CONFIG_HS)
+clean distclean maintainer-clean :: 
+	$(MAKE) INSTALLING=0 BIN_DIST=0 $(MFLAGS) $@
+endif
 
 include $(TOP)/mk/target.mk
-
-# hsc2hs-inplace is needed to boot in ghc/lib/std...
-ifneq "$(BootingFromHc)" "YES"
-boot :: all
-endif