[project @ 2001-09-13 11:40:28 by simonmar]

[ghc-base.git] / Makefile

diff --git a/Makefile b/Makefile
index 2d87d9b..6c8f6bb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,12 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.1 2001/06/28 14:15:01 simonmar Exp $
+# $Id: Makefile,v 1.6 2001/09/13 11:35:09 simonmar Exp $
 
-TOP=../..
+TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-ifeq "$(way)" ""
-SUBDIRS = cbits
-else
-SUBDIRS=
-endif
+# -----------------------------------------------------------------------------
+
+SUBDIRS = cbits include
 
 ALL_DIRS = \
        Control \
@@ -19,6 +17,7 @@ ALL_DIRS = \
        Data/Array \
        Database \
        Debug \
+       Debug/QuickCheck \
        FileFormat \
        Foreign \
        Foreign/C \
@@ -29,20 +28,14 @@ ALL_DIRS = \
        Network \
        NHC \
        System \
+       System/Mem \
        System/IO \
        Text \
+       Text/PrettyPrint \
+       Text/Regex \
        Text/Show
 
-PRE_SRCS += $(wildcard $(patsubst %, %/*.hsc, $(ALL_DIRS)))
-SRC_HSC2HS_OPTS += -Iinclude -I.
-
-ALL_HS_SRCS = $(wildcard $(patsubst %, %/*.hs, . $(ALL_DIRS)))
-ALL_LHS_SRCS += $(wildcard GHC/*.lhs)
-ALL_HS_OBJS = $(patsubst %.hs, %.o, $(ALL_HS_SRCS)) \
-       $(patsubst %.lhs, %.o, $(ALL_LHS_SRCS))
-
-
-srcs : $(HS_SRCS) GHC/Prim.$(way_)hi
+PKG=core
 
 # dependencies between .hsc files
 GHC/IO.hs : GHC/Handle.hs
@@ -50,25 +43,9 @@ GHC/IO.hs : GHC/Handle.hs
 GHC/Prim.$(way_)hi : GHC/Prim.hi-boot
        cp $< $@
 
-SRC_HC_OPTS += -cpp -fglasgow-exts -fvia-C -I$(FPTOOLS_TOP)/ghc/includes -Iinclude -package-name std -H128m $(GhcLibHcOpts)
-
-LIBNAME = libHScore$(_way).a
+lib : GHC/Prim.$(way_)hi
 
-CLEAN_FILES += $(ALL_HS_OBJS)
-
-all :: $(LIBNAME)
-
-lib : srcs
-       $(GHC_INPLACE) $(HC_OPTS) --make $(ALL_HS_SRCS) $(ALL_LHS_SRCS)
-
-$(LIBNAME) : lib
-       $(RM) $@
-       $(AR) $(AR_OPTS) $@ $(ALL_HS_OBJS)
-       $(RANLIB) $@
-
-%.o : %.hs
-       $(GHC_INPLACE) $(HC_OPTS) --make $<
-%.o : %.lhs
-       $(GHC_INPLACE) $(HC_OPTS) --make $<
+# -----------------------------------------------------------------------------
 
 include $(TOP)/mk/target.mk
+