X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fopts.mk;h=46ed7d8b3f380bb54fe2f39a4afb8b4d19b6d898;hb=f12fa187fdc83cf1946a912644a354b953e93198;hp=915b4b8e0f5f6a4d8ac75805e5ed32be71d575ad;hpb=85b5efb6e1e1ece5df67a01e932f966f280d8e16;p=ghc-hetmet.git

diff --git a/mk/opts.mk b/mk/opts.mk
index 915b4b8..46ed7d8 100644
--- a/mk/opts.mk
+++ b/mk/opts.mk
@@ -5,10 +5,14 @@
 #	This file defines Make variables for the
 #	option flags for each utility program
 #
-# 	$Id: opts.mk,v 1.16 2000/11/21 12:32:55 rrt Exp $
+# 	$Id: opts.mk,v 1.23 2001/05/18 09:14:20 simonmar Exp $
 #
 #################################################################################
 
+#
+# N.B. This is *NOT* the place to put extra options of ANY SORT!
+#
+
 # Exports:	Define P_OPTS for the most important utility programs, P, namely
 #
 #		AR AS CPP CTAGS C FLEX HC HSTAGS LD LINT 
@@ -58,10 +62,10 @@ SRC_LINT_OPTS		+= -axz -DLINT $(SRC_CPP_OPTS)
 WAY$(_way)_LINT_OPTS	+= WAY$(_way)_CPP_OPTS
 
 # Default fptools options for dllwrap.
-SRC_BLD_DLL_OPTS += -mno-cygwin --target=i386-mingw32
+SRC_BLD_DLL_OPTS += -mno-cygwin -mwin32 --target=i386-mingw32
 
 # Flags for CPP when running GreenCard on .pgc files
-GC_CPP_OPTS += -D__GLASGOW_HASKELL__
+GC_CPP_OPTS += -P -E -x c -traditional -D__GLASGOW_HASKELL__
 
 
 #################################################################################
@@ -86,14 +90,20 @@ BLD_DLL_OPTS       = $(SRC_BLD_DLL_OPTS) $(WAY$(_way)_BLD_DLL_OPTS) $($*_HC_OPTS
 CPP_OPTS           = $(SRC_CPP_OPTS) $(WAY$(_way)_CPP_OPTS) $(EXTRA_CPP_OPTS)
 CTAGS_OPTS         = $(SRC_CTAGS_OPTS) $(WAY$(_way)_CTAGS_OPTS) $(EXTRA_CTAGS_OPTS)
 CC_OPTS            = $(SRC_CC_OPTS) $(WAY$(_way)_CC_OPTS) $($*_CC_OPTS) $(EXTRA_CC_OPTS)
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+CC_OPTS += -mno-cygwin -mwin32
+endif
 FLEX_OPTS          = $(SRC_FLEX_OPTS) $(WAY$(_way)_FLEX_OPTS) $(EXTRA_FLEX_OPTS)
 HAPPY_OPTS         = $(SRC_HAPPY_OPTS) $(WAY$(_way)_HAPPY_OPTS) $($*_HAPPY_OPTS) $(EXTRA_HAPPY_OPTS)
-GREENCARD_OPTS     = $(SRC_GREENCARD_OPTS) $(WAY$(_way)_GREENCARD_OPTS) $($*_GREENCARD_OPTS) $(EXTRA_GREENCARD_OPTS)
+GC_OPTS            = $(SRC_GC_OPTS) $(WAY$(_way)_GC_OPTS) $($*_GC_OPTS) $(EXTRA_GC_OPTS)
 HSTAGS_OPTS        = $(SRC_HSTAGS_OPTS) $(WAY$(_way)_HSTAGS_OPTS) $(EXTRA_HSTAGS_OPTS)
+HSC2HS_OPTS        = $(SRC_HSC2HS_OPTS) $(WAY$(_way)_HSC2HS_OPTS) $(EXTRA_HSC2HS_OPTS)
 INSTALL_OPTS       = $(SRC_INSTALL_OPTS) $(WAY$(_way)_INSTALL_OPTS) $(EXTRA_INSTALL_OPTS)
 INSTALL_BIN_OPTS   = $(INSTALL_OPTS) $(SRC_INSTALL_BIN_OPTS)
 LD_OPTS            = $(SRC_LD_OPTS) $(WAY$(_way)_LD_OPTS) $(EXTRA_LD_OPTS)
 LINT_OPTS          = $(SRC_LINT_OPTS) $(WAY$(_way)_LINT_OPTS) $(EXTRA_LINT_OPTS)
+HEVEA_OPTS         = $(SRC_HEVEA_OPTS) $(WAY$(_way)_HEVEA_OPTS) $(EXTRA_HEVEA_OPTS)
+HACHA_OPTS         = $(SRC_HACHA_OPTS) $(WAY$(_way)_HACHA_OPTS) $(EXTRA_HACHA_OPTS)
 LIT2CHANGELOG_OPTS = $(SRC_LIT2CHANGELOG_OPTS) $(WAY$(_way)_LIT2CHANGELOG_OPTS) \
                      $(EXTRA_LIT2CHANGELOG_OPTS)
 LIT2HTML_OPTS      = $(SRC_LIT2HTML_OPTS) $(WAY$(_way)_LIT2HTML_OPTS) $(EXTRA_LIT2HTML_OPTS)