[project @ 2000-04-17 11:39:56 by simonmar]

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 2ebedc4..762aee8 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -215,15 +215,17 @@ endif
 #      -O is pretty desirable, otherwise no inlining of prelude
 #              things (incl "+") happens when compiling with this compiler
 
-ifeq "$(GhcWithHscBuiltViaC)" "YES"
 GhcLibHcOpts=-O
-else
-GhcLibHcOpts=-O -split-objs -odir $*
-endif
 
 # Win32 only: Enable the RTS and libraries to be built as DLLs
-#
+# Don't split object files for libs if we're building DLLs
 EnableWin32DLLs=@EnableWin32DLLs@
+ifeq "($EnableWin32DLLs)" "YES"
+SplitObjs=NO
+else
+SplitObjs=YES
+endif
+
 
 # Strip local symbols from libraries?  This can make the libraries smaller,
 # but makes debugging somewhat more difficult.  Doesn't work with all ld's.
@@ -560,6 +562,7 @@ CP                  = cp
 CPP                    = @CPP@
 CTAGS                  = $(ETAGS)
 RAWCPP                  = $(CPP) -undef -traditional
+FIND                   = @FindCmd@
 INSTALL                        = @INSTALL@
 #
 # Sigh - the autoconf macro for INSTALL will subst a relative path to the fallback
@@ -639,10 +642,10 @@ SGML2RTF          = db2rtf
 
 SGMLSTYLESHEET          = $(FPTOOLS_TOP_ABS)/docs/fptools-both.dsl
 
-SGML2DVI_OPTS           = -d $(SGMLSTYLESHEET)
-SGML2HTML_OPTS          = -d $(SGMLSTYLESHEET)
-SGML2INFO_OPTS          = -d $(SGMLSTYLESHEET)
-SGML2RTF_OPTS           = -d $(SGMLSTYLESHEET)
+SRC_SGML2DVI_OPTS       = -d $(SGMLSTYLESHEET)
+SRC_SGML2HTML_OPTS      = -d $(SGMLSTYLESHEET)
+SRC_SGML2INFO_OPTS      = -d $(SGMLSTYLESHEET)
+SRC_SGML2RTF_OPTS       = -d $(SGMLSTYLESHEET)
 
 #-----------------------------------------------------------------------------
 #              FPtools support software