From: andy Date: Wed, 8 Mar 2000 22:05:43 +0000 (+0000) Subject: [project @ 2000-03-08 22:05:43 by andy] X-Git-Tag: Approximately_9120_patches~5040 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=8d26468391f96e5efd0b31ffab6fd10953d9569b;p=ghc-hetmet.git [project @ 2000-03-08 22:05:43 by andy] Adding version of Makefile that looks in the new location for Prelude.hs --- diff --git a/ghc/interpreter/lib/Makefile b/ghc/interpreter/lib/Makefile index d979287..d49c380 100644 --- a/ghc/interpreter/lib/Makefile +++ b/ghc/interpreter/lib/Makefile @@ -1,10 +1,12 @@ # -------------------------------------------------------------------------- # -# $Id: Makefile,v 1.6 2000/03/08 21:45:03 andy Exp $ +# $Id: Makefile,v 1.7 2000/03/08 22:05:43 andy Exp $ # -------------------------------------------------------------------------- # TOP = ../.. include $(TOP)/mk/boilerplate.mk +PRELUDE = Prelude.hs + STD_LIBS = Array.lhs Char.lhs Complex.lhs CPUTime.lhs \ Directory.lhs IO.lhs Ix.lhs List.lhs Locale.lhs \ Maybe.lhs Monad.lhs Numeric.lhs Ratio.lhs \ @@ -50,17 +52,13 @@ UTIL_LIBS = QuickCheck.hs QuickCheckBatch.hs QuickCheckPoly.hs \ Regex.lhs RegexString.lhs Observe.lhs Memo.lhs Readline.lhs \ Select.lhs -LIBS = $(STD_LIBS) \ +LIBS = $(PRELUDE) \ + $(STD_LIBS) \ $(DATA_LIBS) \ $(LANG_LIBS) \ $(TEXT_LIBS) \ $(UTIL_LIBS) -#List.lhs Ix.lhs Complex.lhs Char.lhs Ratio.lhs Random.lhs \ -# Array.lhs Maybe.lhs Monad.lhs Numeric.lhs Directory.lhs \ -# System.lhs Locale.lhs CPUTime.lhs IO.lhs Pretty.lhs \ -# GetOpt.lhs Bits.lhs Word.lhs Addr.lhs NumExts.lhs Int.lhs \ - all :: $(LIBS) @@ -69,6 +67,9 @@ HUGSCPP = ../../utils/hscpp/hscpp -D__HUGS__ -DUSE_REPORT_PRELUDE -D__HASKELL98_ %.lhs :: $(GHC_LIB_DIR)/std/%.lhs $(HUGSCPP) -I../../includes $< > $*.lhs +%.hs :: $(GHC_LIB_DIR)/hugs/%.hs + $(HUGSCPP) -I../../includes $< > $*.hs + %.lhs :: $(FPTOOLS_TOP)/hslibs/concurrent/%.lhs $(HUGSCPP) -I../../includes $< > $*.lhs