X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Futils%2Fhsc2hs%2FMakefile;h=2ea57863487470b38a13776bd6f28414ab2b6544;hb=703279c8b897153618e49bd960e2ca37de1fe7b7;hp=9ff860cef7aae33693f5026cfeec9123c3635c7a;hpb=837fa0bb303c5e50c27d899692f5e87599f73abf;p=ghc-hetmet.git

diff --git a/ghc/utils/hsc2hs/Makefile b/ghc/utils/hsc2hs/Makefile
index 9ff860c..2ea5786 100644
--- a/ghc/utils/hsc2hs/Makefile
+++ b/ghc/utils/hsc2hs/Makefile
@@ -1,5 +1,6 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.12 2001/03/16 09:07:41 qrczak Exp $
+# To compile with nhc98 on unix:
+#     nhc98 -cpp -package base -o hsc2hs-bin Main.hs
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
@@ -10,9 +11,30 @@ INCLUDE_DIR=ghc/includes
 INSTALLING=1
 
 HS_PROG           = hsc2hs-bin
-SRC_HC_OPTS      += -package util -O
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+HS_PROG           = hsc2hs$(exeext)
+endif
+ifeq "$(HOSTPLATFORM)" "i386-unknown-cygwinw32"
+HS_PROG           = hsc2hs$(exeext)
+endif
+
+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
+
+# Note: Somehow we should pass $(exeext) here, but the history of changes used
+# for calling the C preprocessor via GHC has changed a few times, making a
+# clean solution impossible. So we revert to a hack in Main.hs...
+SRC_HC_OPTS      += -Wall
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+SRC_HC_OPTS      += -Dmingw32_HOST_OS=1
+endif
 
+ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 INSTALLED_SCRIPT_PROG  = hsc2hs
+endif
 INPLACE_SCRIPT_PROG    = hsc2hs-inplace
 
 ifeq "$(INSTALLING)" "1"
@@ -25,59 +47,52 @@ endif
 
 ifeq "$(INSTALLING)" "1"
 ifeq "$(BIN_DIST)"   "1"
+HSC2HS_BINDIR=$$\"\"libexecdir
 HSC2HS_DIR=$$\"\"libdir
 HSC2HS_EXTRA=
 else
+HSC2HS_BINDIR=$(libexecdir)
 HSC2HS_DIR=$(libdir)
 HSC2HS_EXTRA=--cc=$(bindir)/ghc-$(ProjectVersion)
 endif # BIN_DIST
 else
-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
-HSC2HS_EXTRA="--cc=$(CC) --cflag=-mno-cygwin --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(FPTOOLS_TOP_ABS)/$(INCLUDE_DIR)"
+HSC2HS_BINDIR=$(FPTOOLS_TOP_ABS)/$(CURRENT_DIR)
+HSC2HS_DIR=$(FPTOOLS_TOP_ABS_PLATFORM)/$(CURRENT_DIR)
+
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+extra_flags=$(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS)))
 endif
+
+HSC2HS_EXTRA="--cc=$(CC) --ld=$(CC) $(extra_flags) --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(FPTOOLS_TOP_ABS_PLATFORM)/$(INCLUDE_DIR)"
 endif
 
 $(SCRIPT_PROG) : Makefile
 $(INSTALLED_SCRIPT_PROG) : $(TOP)/mk/config.mk
 
-SCRIPT_SUBST_VARS = HSC2HS_DIR HS_PROG HSC2HS_EXTRA
+SCRIPT_SUBST_VARS = HSC2HS_BINDIR HSC2HS_DIR HS_PROG HSC2HS_EXTRA
 
 SCRIPT_OBJS=hsc2hs.sh
 INTERP=$(SHELL)
 
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 INSTALL_SCRIPTS  += $(SCRIPT_PROG)
 INSTALL_LIBEXECS += $(HS_PROG)
+else
+INSTALL_PROGS    += $(HS_PROG)
+endif
 
 override datadir=$(libdir)
 INSTALL_DATAS += template-hsc.h
 
 # -----------------------------------------------------------------------------
-# Create driver configuration
-
-CURRENT_DIR=ghc/utils/hsc2hs
-CONFIG_HS = Config.hs
-boot :: $(CONFIG_HS)
-
-$(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
-	@$(RM) -f $(CONFIG_HS)
-	@echo -n "Creating $(CONFIG_HS) ... "
-	@echo "module Config where" >>$(CONFIG_HS)
-	@echo "cDEFAULT_TMPDIR       = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS)
-	@echo done.
-
-CLEAN_FILES += $(CONFIG_HS)
-
 # don't recurse on 'make install'
 #
 ifeq "$(INSTALLING)" "1"
-all clean veryclean maintainer-clean ::
+all :: $(HS_PROG)
 	$(MAKE) INSTALLING=0 BIN_DIST=0 $(MFLAGS) $@
-endif
 
-# hsc2hs-inplace is needed to boot in ghc/lib/std...
-boot :: all
+clean distclean maintainer-clean :: 
+	$(MAKE) INSTALLING=0 BIN_DIST=0 $(MFLAGS) $@
+endif
 
 include $(TOP)/mk/target.mk