projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small rearrangements
[ghc-hetmet.git]
/
libraries
/
Makefile
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
0c845c9
..
56c3f64
100644
(file)
--- a/
libraries/Makefile
+++ b/
libraries/Makefile
@@
-35,15
+35,15
@@
default_target: all
TOP=..
include $(TOP)/mk/boilerplate.mk
TOP=..
include $(TOP)/mk/boilerplate.mk
-SUBDIRS = base old-locale old-time filepath directory process pretty \
- hpc template-haskell readline Cabal random haskell98
-
+SUBDIRS = base array packedstring containers bytestring
+SUBDIRS += old-locale old-time filepath directory
ifeq "$(GhcLibsWithUnix)" "YES"
SUBDIRS += unix
endif
ifeq "$(Windows)" "YES"
SUBDIRS += $(wildcard Win32)
endif
ifeq "$(GhcLibsWithUnix)" "YES"
SUBDIRS += unix
endif
ifeq "$(Windows)" "YES"
SUBDIRS += $(wildcard Win32)
endif
+SUBDIRS += process pretty hpc template-haskell readline Cabal random haskell98
# Set GhcBootLibs=YES from the command line to work with just the libraries
# needed to bootstrap GHC.
# Set GhcBootLibs=YES from the command line to work with just the libraries
# needed to bootstrap GHC.
@@
-98,6
+98,11
@@
CONFIGURE_OPTS += --enable-library-profiling
CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-profiling
endif
CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-profiling
endif
+ifneq "$(findstring $(space)dyn$(space), $(space)$(GhcLibWays)$(space))" ""
+CONFIGURE_OPTS += --enable-shared
+CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-shared
+endif
+
ifeq "$(SplitObjs)" "YES"
CONFIGURE_OPTS += --enable-split-objs
CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting
ifeq "$(SplitObjs)" "YES"
CONFIGURE_OPTS += --enable-split-objs
CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting
@@
-343,7
+348,6
@@
binary-dist.library.%:
cd $* && \
cp $*.cabal $(BIN_DIST_LIBDIR)/$* && \
cp -a dist $(BIN_DIST_LIBDIR)/$* && \
cd $* && \
cp $*.cabal $(BIN_DIST_LIBDIR)/$* && \
cp -a dist $(BIN_DIST_LIBDIR)/$* && \
- # Euch \
(cp -aL include $(BIN_DIST_LIBDIR)/$* || :) && \
$(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
\( -name "*_split" -o -name "autogen" \) | xargs rm -rf && \
(cp -aL include $(BIN_DIST_LIBDIR)/$* || :) && \
$(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
\( -name "*_split" -o -name "autogen" \) | xargs rm -rf && \