X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fopts.mk;h=5f7c0ad2a893aea66cf9532767844110acd56b57;hb=f375de8d47450937685daf623ae72066f9fdad66;hp=0c4fd8a7f3077ed7e5358e7c596cd91ecff3f01f;hpb=ab9db328d48d03709d7107d410d3172c2fe15d92;p=ghc-hetmet.git

diff --git a/mk/opts.mk b/mk/opts.mk
index 0c4fd8a..5f7c0ad 100644
--- a/mk/opts.mk
+++ b/mk/opts.mk
@@ -5,7 +5,7 @@
 #	This file defines Make variables for the
 #	option flags for each utility program
 #
-# 	$Id: opts.mk,v 1.7 1998/06/11 18:43:55 sof Exp $
+# 	$Id: opts.mk,v 1.13 2000/03/28 11:09:31 rrt Exp $
 #
 #################################################################################
 
@@ -51,14 +51,7 @@
 # These flags make flex 8-bit
 SRC_FLEX_OPTS	+= -8
 
-#
-# Make sure we install things with group 'grasp' at Glasgow
-# At Glasgow, we would rather the installed binaries were stripped.
-# (Delete if you feel otherwise.)
 SRC_INSTALL_BIN_OPTS	+= -s
-ifeq ($(AT_GLASGOW),1)
-SRC_INSTALL_OPTS	+= -g grasp
-endif
 
 # lint gets all CPP's flags too
 SRC_LINT_OPTS		+= -axz -DLINT $(SRC_CPP_OPTS)
@@ -73,6 +66,11 @@ WAY$(_way)_LINT_OPTS	+= WAY$(_way)_CPP_OPTS
 # 
 SRC_TEXI2HTML_OPTS +=-menu -verbose -glossary
 
+#
+# Default fptools options for dllwrap.
+#
+SRC_BLD_DLL_OPTS += -mno-cygwin --target=i386-mingw32
+
 
 #################################################################################
 #
@@ -92,6 +90,7 @@ RUNTEST_OPTS       = $(SRC_RUNTEST_OPTS) $(WAY$(_way)_RUNTEST_OPTS) \
 
 AR_OPTS            = $(SRC_AR_OPTS) $(WAY$(_way)_AR_OPTS) $(EXTRA_AR_OPTS)
 AS_OPTS            = $(SRC_AS_OPTS) $(WAY$(_way)_AS_OPTS) $(EXTRA_AS_OPTS)
+BLD_DLL_OPTS       = $(SRC_BLD_DLL_OPTS) $(WAY$(_way)_BLD_DLL_OPTS) $($*_HC_OPTS) $(EXTRA_BLD_DLL_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)
@@ -115,6 +114,10 @@ MKDEPENDHS_OPTS    = $(SRC_MKDEPENDHS_OPTS) $(WAY$(_way)_MKDEPENDHS_OPTS) \
                      $(EXTRA_MKDEPENDHS_OPTS)
 MKDEPENDLIT_OPTS   = $(SRC_MKDEPENDLIT_OPTS) $(WAY$(_way)_MKDEPENDLIT_OPTS) \
                      $(EXTRA_MKDEPENDLIT_OPTS)
+SGML2DVI_OPTS      = $(SRC_SGML2DVI_OPTS) $(WAY$(_way)_SGML2DVI_OPTS) $(EXTRA_SGML2DVI_OPTS)
+SGML2INFO_OPTS     = $(SRC_SGML2INFO_OPTS) $(WAY$(_way)_SGML2INFO_OPTS) $(EXTRA_INFO_OPTS)
+SGML2RTF_OPTS      = $(SRC_SGML2RTF_OPTS) $(WAY$(_way)_SGML2RTF_OPTS) $(EXTRA_SGML2RTF_OPTS)
+SGML2HTML_OPTS     = $(SRC_SGML2HTML_OPTS) $(WAY$(_way)_SGML2HTML_OPTS) $(EXTRA_SGML2HTML_OPTS)
 UGEN_OPTS          = $(SRC_UGEN_OPTS) $(WAY$(_way)_UGEN_OPTS) $(EXTRA_UGEN_OPTS)
 UNLIT_OPTS         = $(SRC_UNLIT_OPTS) $(WAY$(_way)_UNLIT_OPTS) $(EXTRA_UNLIT_OPTS)
 YACC_OPTS          = $(SRC_YACC_OPTS) $(WAY$(_way)_YACC_OPTS) $(EXTRA_YACC_OPTS)