projects
/
ghc-base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2004-06-13 17:16:40 by panne]
[ghc-base.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
ebc5f2e
..
f1085cb
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,6
+1,3
@@
-# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.47 2003/07/31 17:45:22 ross Exp $
-
TOP=..
include $(TOP)/mk/boilerplate.mk
TOP=..
include $(TOP)/mk/boilerplate.mk
@@
-11,6
+8,7
@@
SUBDIRS = cbits include
ALL_DIRS = \
Control \
Control/Concurrent \
ALL_DIRS = \
Control \
Control/Concurrent \
+ Control/Parallel \
Control/Monad \
Control/Monad/ST \
Data \
Control/Monad \
Control/Monad/ST \
Data \
@@
-19,7
+17,6
@@
ALL_DIRS = \
Data/Array/IO \
Data/STRef \
Debug \
Data/Array/IO \
Data/STRef \
Debug \
- Debug/QuickCheck \
Foreign \
Foreign/C \
Foreign/Marshal \
Foreign \
Foreign/C \
Foreign/Marshal \
@@
-39,11
+36,12
@@
ALL_DIRS = \
PACKAGE = base
PACKAGE = base
-SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude -\#include HsBase.h
+SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude -"\#include" HsBase.h
SRC_HSC2HS_OPTS += -Iinclude -I$(FPTOOLS_TOP)/ghc/includes
SRC_HSC2HS_OPTS += -Iinclude -I$(FPTOOLS_TOP)/ghc/includes
-# Make sure we can get hold of regex.h
+# If there is no system-supplied POSIX regex library, use our own
ifneq "$(HavePosixRegex)" "YES"
ifneq "$(HavePosixRegex)" "YES"
+# Make sure we can get hold of regex.h
SRC_HC_OPTS += -Icbits/regex
SRC_HSC2HS_OPTS += -Icbits/regex
endif
SRC_HC_OPTS += -Icbits/regex
SRC_HSC2HS_OPTS += -Icbits/regex
endif
@@
-75,6
+73,15
@@
boot :: GHC/PrimopWrappers.hs
EXTRA_SRCS += GHC/PrimopWrappers.hs
CLEAN_FILES += GHC/PrimopWrappers.hs
EXTRA_SRCS += GHC/PrimopWrappers.hs
CLEAN_FILES += GHC/PrimopWrappers.hs
+# -----------------------------------------------------------------------------
+ifneq "$(BootingFromHc)" "YES"
+STUBOBJS += \
+ Control/Concurrent_stub.$(way_)o
+
+CLEAN_FILES += $(STUBOBJS) \
+ Control/Concurrent_stub.[ch]
+endif
+
#-----------------------------------------------------------------------------
# Building the library for GHCi
#
#-----------------------------------------------------------------------------
# Building the library for GHCi
#
@@
-110,8
+117,8
@@
EXCLUDED_HADDOCK_SRCS = \
GHC/PrimopWrappers.hs \
GHC/PArr.hs
GHC/PrimopWrappers.hs \
GHC/PArr.hs
-SRC_HADDOCK_OPTS += -t "Haskell Core Libraries (base package)" \
- --no-implicit-prelude -p prologue.txt
+SRC_HADDOCK_OPTS += -t "Haskell Hierarchical Libraries ($(PACKAGE) package)" \
+ --no-implicit-prelude
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
@@
-121,7
+128,7
@@
ifeq "$(OBJECT_FILEFORMAT)" "PEi"
HSbase.o : $(GHCI_LIBOBJS)
$(LD) -r $(LD_X) -o HSbase1.o $(filter GHC/%, $(GHCI_LIBOBJS))
$(LD) -r $(LD_X) -o HSbase2.o $(filter Text/%, $(GHCI_LIBOBJS))
HSbase.o : $(GHCI_LIBOBJS)
$(LD) -r $(LD_X) -o HSbase1.o $(filter GHC/%, $(GHCI_LIBOBJS))
$(LD) -r $(LD_X) -o HSbase2.o $(filter Text/%, $(GHCI_LIBOBJS))
- $(LD) -r $(LD_X) -o HSbase3.o $(filter-out GHC/% Text/%, $(GHCI_LIBOBJS))
+ $(LD) -r $(LD_X) -o HSbase3.o $(filter-out GHC/% Text/%, $(GHCI_LIBOBJS) $(STUBOBJS))
@touch HSbase.o
endif # OBJECT_FILEFORMAT = PEi
@touch HSbase.o
endif # OBJECT_FILEFORMAT = PEi