X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=ffb1a90968c8babe08984946ab6582b62294c312;hb=474b582b68ea9289f3da4355da816164138604b0;hp=b9a8cd26e6a6ed0feca86ff6dd3e3a511c042aff;hpb=80c3061aa94a3adc7d0b39336587f3d773e81dbd;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index b9a8cd2..ffb1a90 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -36,7 +36,7 @@ TOP=..
 include $(TOP)/mk/boilerplate.mk
 
 SUBDIRS = base old-locale old-time filepath directory process pretty \
-          template-haskell readline Cabal random haskell98
+          hpc template-haskell readline Cabal random haskell98
 
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
@@ -61,7 +61,6 @@ SUBDIRS += $(wildcard mtl)
 SUBDIRS += $(wildcard fgl)
 SUBDIRS += $(wildcard X11)
 SUBDIRS += $(wildcard time)
-SUBDIRS += $(wildcard hpc)
 ifeq "$(Windows)" "NO"
 # HGL is not working on Win32, so omit it for now.  Better not to ship it
 # at all than to ship a broken version.
@@ -99,6 +98,11 @@ CONFIGURE_OPTS += --enable-library-profiling
 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
@@ -236,22 +240,29 @@ $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\
 make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
 		%/GNUmakefile \
                 %/setup/Setup ifBuildable/ifBuildable
-	ifBuildable/ifBuildable $* $(MAKE)
-	ifBuildable/ifBuildable $* setup/Setup register --inplace
+	if ifBuildable/ifBuildable $*; then \
+	  cd $* && \
+	  $(MAKE) $(MFLAGS) && \
+	  setup/Setup register --inplace; \
+	fi
 
 # Build the library using 'setup build' (not the default)
 $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\
 build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
                  %/setup/Setup ifBuildable/ifBuildable
-	ifBuildable/ifBuildable $* setup/Setup build \
-	                                $(addprefix --ghc-option=,$(GhcLibHcOpts))
+	if ifBuildable/ifBuildable $*; then \
+	  cd $* && \
+	  setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \
+	fi
 
 $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile):\
 %/GNUmakefile: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
                  %/setup/Setup ifBuildable/ifBuildable
 	$(RM) $*/GNUmakefile
 	cp Makefile.local $*
-	ifBuildable/ifBuildable $* setup/Setup makefile -f GNUmakefile
+	if ifBuildable/ifBuildable $*; then \
+	   cd $* && setup/Setup makefile -f GNUmakefile; \
+	fi
 
 .PHONY: doc
 
@@ -263,7 +274,9 @@ doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR))
 $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
 doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
                %/setup/Setup ifBuildable/ifBuildable
-	ifBuildable/ifBuildable $* setup/Setup haddock
+	if ifBuildable/ifBuildable $*; then \
+	  cd $* && setup/Setup haddock; \
+	fi
 
 .PHONY: distclean clean clean.library.%
 
@@ -308,7 +321,10 @@ install-docs:
 # Thus if you install without building then it will just break.
 $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
 install.library.%: installPackage/installPackage ifBuildable/ifBuildable
-	ifBuildable/ifBuildable $* ../installPackage/installPackage $(prefix) $(bindir)/ghc-pkg
+	if ifBuildable/ifBuildable $*; then \
+	  cd $* && \
+	  ../installPackage/installPackage $(prefix) $(bindir)/ghc-pkg; \
+	fi
 
 .PHONY: binary-dist binary-dist.library.%
 
@@ -328,13 +344,15 @@ binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR))
 $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \
 binary-dist.library.%:
 	$(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*
-	ifBuildable/ifBuildable $* cp    $*.cabal      $(BIN_DIST_LIBDIR)/$*
-	ifBuildable/ifBuildable $* cp -a dist          $(BIN_DIST_LIBDIR)/$*
-	# Euch
-	ifBuildable/ifBuildable $* cp -aL include      $(BIN_DIST_LIBDIR)/$* || :
-	ifBuildable/ifBuildable $* $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
-	     \( -name "*_split" -o -name "autogen" \) | xargs rm -rf
-	ifBuildable/ifBuildable $* $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
+	if ifBuildable/ifBuildable $*; then \
+	  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 && \
+	  $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
 	     \( \( -name "*.o" -o -name "*.p_o" \) -a ! -name "HS*" \) \
-	     -exec rm {} \;
-
+	     -exec rm {} \; ; \
+	fi