projects
/
haskell-directory.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add Data.Function
[haskell-directory.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
6078fba
..
a8fb0a7
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-12,6
+12,8
@@
ALL_DIRS = \
Control/Monad \
Control/Monad/ST \
Data \
Control/Monad \
Control/Monad/ST \
Data \
+ Data/ByteString \
+ Data/ByteString/Lazy \
Data/Generics \
Data/Array \
Data/Array/IO \
Data/Generics \
Data/Array \
Data/Array/IO \
@@
-29,18
+31,16
@@
ALL_DIRS = \
System/Process \
System/Directory \
Text \
System/Process \
System/Directory \
Text \
- Text/Html \
Text/PrettyPrint \
Text/ParserCombinators \
Text/PrettyPrint \
Text/ParserCombinators \
- Text/Regex \
Text/Show \
Text/Read
PACKAGE = base
Text/Show \
Text/Read
PACKAGE = base
-VERSION = 1.0
+VERSION = 2.0
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$(GHC_INCLUDE_DIR)
# -----------------------------------------------------------------------------
# Per-module flags
# -----------------------------------------------------------------------------
# Per-module flags
@@
-48,29
+48,25
@@
SRC_HSC2HS_OPTS += -Iinclude -I$(FPTOOLS_TOP)/ghc/includes
# ESSENTIAL, for getting reasonable performance from the I/O library:
SRC_HC_OPTS += -funbox-strict-fields
# ESSENTIAL, for getting reasonable performance from the I/O library:
SRC_HC_OPTS += -funbox-strict-fields
-# Grrr, gcc-4.1.0 has a bug in -O2 and higher that causes miscompilation of
-# GHC.Show.itos. See gcc bug #26824. We must drop back to -O1.
-GHC/Show_HC_OPTS += -optc-O1
-
# -----------------------------------------------------------------------------
# PrimOpWrappers
# -----------------------------------------------------------------------------
# PrimOpWrappers
-# These two lines are required for pre-processing ghc/compiler/prelude/primops.txt
+# These two lines are required for pre-processing compiler/prelude/primops.txt
SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR)
SRC_CPP_OPTS += ${GhcCppOpts}
ifeq "$(BootingFromHc)" "YES"
SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR)
SRC_CPP_OPTS += ${GhcCppOpts}
ifeq "$(BootingFromHc)" "YES"
-GHC/PrimopWrappers.hs: GHC/Prim.hs
+GHC/PrimopWrappers.hs:
touch GHC/PrimopWrappers.hs
else
GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt GHC/Prim.hs
@$(RM) $@
touch GHC/PrimopWrappers.hs
else
GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt GHC/Prim.hs
@$(RM) $@
- $(GHC_GENPRIMOP) --make-haskell-wrappers < $< > $@
+ $(GENPRIMOP) --make-haskell-wrappers < $< > $@
endif
GHC/Prim.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt
@$(RM) $@
endif
GHC/Prim.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt
@$(RM) $@
- $(GHC_GENPRIMOP) --make-haskell-source < $< > $@
+ $(GENPRIMOP) --make-haskell-source < $< > $@
EXCLUDED_SRCS = GHC/Prim.hs
EXTRA_HADDOCK_SRCS = GHC/Prim.hs
EXCLUDED_SRCS = GHC/Prim.hs
EXTRA_HADDOCK_SRCS = GHC/Prim.hs
@@
-84,7
+80,7
@@
CLEAN_FILES += GHC/PrimopWrappers.hs
ifneq "$(BootingFromHc)" "YES"
STUBOBJS += \
Control/Concurrent_stub.$(way_)o
ifneq "$(BootingFromHc)" "YES"
STUBOBJS += \
Control/Concurrent_stub.$(way_)o
-
+
CLEAN_FILES += $(STUBOBJS) \
Control/Concurrent_stub.[ch]
endif
CLEAN_FILES += $(STUBOBJS) \
Control/Concurrent_stub.[ch]
endif
@@
-139,6
+135,6
@@
System/Posix/Types.o Foreign/C/Types.o: include/CTypes.h
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-DIST_CLEAN_FILES += base.buildinfo config.cache config.status config.mk
+DIST_CLEAN_FILES += base.buildinfo config.cache config.status
include $(TOP)/mk/target.mk
include $(TOP)/mk/target.mk