[project @ 1997-01-07 13:19:38 by simonm]

use ghc/mk/ways.mk.

diff --git a/ghc/lib/Makefile b/ghc/lib/Makefile
index 006c382..1e256cd 100644 (file)
--- a/ghc/lib/Makefile
+++ b/ghc/lib/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.3 1996/12/19 09:13:55 simonpj Exp $
+# $Id: Makefile,v 1.4 1997/01/07 13:19:38 simonm Exp $
 
 TOP = ../..
 include $(TOP)/ghc/mk/ghc.mk
@@ -8,43 +8,20 @@ SUBDIRS = cbits
 ifeq ($(IncludeTestDirsInBuild),YES)
   SUBDIRS += tests
 endif
-
 include $(TOP)/mk/subdir.mk
 
 # per-build options: shared with runtime system
 include ../mk/buildflags.mk
 
-#-----------------------------------------------------------------------------
-# libHS.a, in several different 'ways'
-
-all ::
-       @for i in $(WAY_SUFFIXES); do \
-               echo; \
-               echo =========== Making libraries for way $$i; \
-               echo; \
-               $(MAKE) -f Makefile.libHS suffix=$$i; \
-       done
+MAKEFILE=Makefile.libHS
+DESCR=libraries
+include $(TOP)/ghc/mk/ways.mk
 
 # Shortcut for typical case when testing: just make the "normal" version
+# (simonm Todo: better way to do this?)
 libHS.a ::
        $(MAKE)  -f Makefile.libHS suffix=norm
 
-install ::
-       @for i in $(WAY_SUFFIXES); do \
-               $(MAKE) -f Makefile.libHS suffix=$$i install; \
-       done
-
-clean ::
-       @for i in $(WAY_SUFFIXES); do \
-               $(MAKE) -f Makefile.libHS suffix=$$i clean; \
-       done
-
-# Dependencies are done by Makefile.libHS
-
-depend ::
-       @$(MAKE) -f Makefile.libHS depend
-
-
 # install MODULES file
 
 install ::