X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=96c185210595cc7c14d7cf9246c0fa8253385af5;hb=9cfc3137aff7cdff305a718051a48a52e1832651;hp=2ebedc439b77d6bbfbd13c3afa7f02c40d7b2654;hpb=ba714d9f37750d4f0aeec576ec7168826bc5f614;p=ghc-hetmet.git diff --git a/mk/config.mk.in b/mk/config.mk.in index 2ebedc4..96c1852 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -86,7 +86,7 @@ HostVendor_CPP = @HostVendor_CPP@ # LeadingUnderscore=@LeadingUnderscore@ -# Pin a suffix on executables? If so, what. (cygwin32 only). +# Pin a suffix on executables? If so, what (Windows only). exeext=@exeext@ ################################################################################ @@ -168,7 +168,7 @@ GhcCompilerWays= # # -dcore-lint check the types after every pass of the compiler; # a pretty strong internal check -GhcHcOpts= +GhcHcOpts=-O # GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files? GhcWithHscBuiltViaC=@BootingFromHc@ @@ -209,21 +209,24 @@ GhcLibWays=p endif # Option flags to pass to GHC when it's compiling prelude modules +# *and* standard library modules (std) *and* modules in hslibs # Typically these are things like -O or -dcore-lint # The ones that are *essential* are wired into ghc/lib/Makefile # # -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. @@ -260,17 +263,22 @@ GhcRtsCcOpts=-O2 -optc-fomit-frame-pointer HsLibsFor = ghc # hslibs for GHC also uses the following variables (defined above): -# GhcLibWays, GhcLibHcOpts, EnableWin32DLLs, StripLibraries +# GhcLibWays, GhcLibHcOpts, GhcLibToolsHcOpts, EnableWin32DLLs, StripLibraries + +# Haskell compiler options for tools in hslibs +GhcLibToolsHcOpts=-O # Build the Haskell Readline bindings? # -GhcLibsWithReadline=NO -# +GhcLibsWithReadline=@HaveReadlineHeaders@ + +# Libraries needed for linking with readline +LibsReadline=@LibsReadline@ + # Include path to readline.h # (no path == in standard include path) # ReadlineIncludePath= -HaveLibReadline=@HaveLibReadline@ ################################################################################ # @@ -372,7 +380,6 @@ datadir = @datadir@ #sharedstatedir = @sharedstatedir@ #localstatedir = @localstatedir@ libdir = @libdir@ -infodir = @infodir@ includedir = @includedir@ oldincludedir = @oldincludedir@ mandir = @mandir@ @@ -405,9 +412,6 @@ endif ifeq "$(strip $(libdir))" "" libdir = $(exec_prefix)/lib endif -ifeq "$(strip $(infodir))" "" -infodir = $(prefix)/info -endif ifeq "$(strip $(includedir))" "" includedir = $(prefix)/include endif @@ -473,13 +477,9 @@ ETAGS_PREFIX = $(GLAFP_UTILS)/etags/ MSUB_PREFIX = $(GLAFP_UTILS)/msub/ LNDIR_PREFIX = $(GLAFP_UTILS)/lndir/ MKDIRHIER_PREFIX = $(GLAFP_UTILS)/mkdirhier/ - -# Still used? -LITERATE = $(FPTOOLS_TOP)/literate +DOCBOOK_PREFIX = $(GLAFP_UTILS)/docbook/ LITERATE_PREFIX = $(FPTOOLS_TOP)/literate/ -INFO_PREFIX = $(FPTOOLS_TOP)/literate/info-utils/ -TEXI2HTML_PREFIX = $(LITERATE_PREFIX)texi2html/ HAPPY_PREFIX = $(FPTOOLS_TOP)/happy/src/ GREENCARD_PREFIX = $(FPTOOLS_TOP)/green-card/src/ @@ -560,6 +560,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 @@ -595,7 +596,7 @@ SHELL = /bin/sh # We do not use SHELL to execute long commands, as `make' will more than likely # override whatever setting you have in your environment while executing. -# By default, REAL_SHELL is set equal SHELL, which is not really a smart move +# By default, REAL_SHELL is set equal to SHELL, which is not really a smart move # as it is SHELL that will show up the bogosity in the first place, but setting # it to anything else isn't really portable. # @@ -610,7 +611,7 @@ TAR = @TarCmd@ ZIP = zip # -# Under cygwin32, we have to deal with .exe suffixes +# Under Windows, we have to deal with .exe suffixes # EXE_SUFFIX=@ExeSuffix@ @@ -630,19 +631,22 @@ UNAME = uname YACC = @YaccCmd@ #----------------------------------------------------------------------------- -# SGML stuff (currently not configured - we assume you have it) +# SGML stuff + +JADE = @JadeCmd@ -SGML2DVI = db2dvi -SGML2HTML = db2html -SGML2INFO = db2info -SGML2RTF = db2rtf +SGML2DVI = $(DOCBOOK_PREFIX)db2dvi +SGML2HTML = $(DOCBOOK_PREFIX)db2html +SGML2PS = $(DOCBOOK_PREFIX)db2ps +SGML2PDF = $(DOCBOOK_PREFIX)db2pdf +SGML2RTF = $(DOCBOOK_PREFIX)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_SGML2PS_OPTS = -d $(SGMLSTYLESHEET) +SRC_SGML2RTF_OPTS = -d $(SGMLSTYLESHEET) #----------------------------------------------------------------------------- # FPtools support software @@ -667,17 +671,12 @@ BLD_DLL = dllwrap # # Stuff from fptools/literate # -INFO = $(UTIL_PREFIX)info -MAKEINFO = $(INFO_PREFIX)makeinfo -POSTMAKEINFO = $(INFO_PREFIX)postmakeinfo LIT2PGM = $(LITERATE_PREFIX)lit2pgm -LIT2TEXI = $(LITERATE_PREFIX)lit2texi LIT2HTML = $(LITERATE_PREFIX)lit2html LIT2LATEX = $(LITERATE_PREFIX)lit2latex MKDEPENDLIT = $(LITERATE_PREFIX)mkdependlit LIT2CHANGELOG = $(LITERATE_PREFIX)lit2changelog LIT2TEXT = $(LITERATE_PREFIX)lit2text -TEXI2HTML = $(TEXI2HTML_PREFIX)texi2html # # Stuff from fptools/ghc/utils