X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=f6e0f29961eff6d09501446e3f08975658ea92f4;hb=e63653ad05e8123dc9d6df8f9ba891e0021ff71e;hp=fe894364572fac0f5c6c9bce51836bf96c2d365f;hpb=1f4784a9ee5d38364aa7f0d8f91a22069b73a6ae;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index fe89436..f6e0f29 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -73,6 +73,11 @@ CONFIGURE_OPTS += --enable-library-profiling
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-profiling
 endif
 
+ifeq "$(SplitObjs)" "YES"
+CONFIGURE_OPTS += --enable-split-objs
+CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting
+endif
+
 BOOTSTRAPPING_CABAL = bootstrapping.cabal
 
 .PHONY: subdirs
@@ -145,6 +150,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
 	                     --with-ld=$(LD) \
 	                     --datasubdir=ghc \
 	                     --haddock-args="--use-contents=../index.html --use-index=../doc-index.html" \
+	                     $(addprefix --configure-option=,$(CONFIGURE_ARGS)) \
 	                     --configure-option=--with-cc=$(CC)
 	touch $@
 
@@ -165,19 +171,21 @@ doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR))
 $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
 doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
                %/setup/Setup
-	cd $* && setup/Setup haddock
+	cd $* && ../ifBuildable/ifBuildable setup/Setup haddock
 
 .PHONY: install install-docs install.library.%
 
 INSTALL_DIR=$(prefix)/share/ghc/doc/html/
 
 install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR))
+ifneq "$(NO_HADDOCK_DOCS)" "YES"
 	$(INSTALL_DATA)   index.html doc-index.html 			  $(INSTALL_DIR)
 	$(INSTALL_SCRIPT) gen_contents_index 					  $(INSTALL_DIR)
 	# Hacks:
 	$(INSTALL_DATA)   $(prefix)/share/ghc/doc/html/base/*.css $(INSTALL_DIR)
 	$(INSTALL_DATA)   $(prefix)/share/ghc/doc/html/base/*.js  $(INSTALL_DIR)
 	$(INSTALL_DATA)   $(prefix)/share/ghc/doc/html/base/*.gif $(INSTALL_DIR)
+endif
 
 # Cabal doesn't let us ask to install docs only, so do nothing here
 install-docs:
@@ -201,7 +209,9 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
 install.library.%: stamp/configure.library.install.% %/setup/Setup
 	cd $* && ../ifBuildable/ifBuildable setup/Setup install
 
-.PHONY: clean clean.library.%
+.PHONY: distclean clean clean.library.%
+
+distclean: clean
 
 clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
 	$(RM) -f stamp/$(BOOTSTRAPPING_CABAL)