X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=919bb696b85dda9dd6234fb077e9fc65e710cdc6;hb=76302ff26e9059846cf2a2f4edb24f03c5ea3740;hp=41311b35ef448618c5de2e6ee6f2119f1f253283;hpb=a93c4f67ea57f7143e5f540c522121d1e67da498;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 41311b3..919bb69 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -90,7 +90,7 @@ CONFIGURE_OPTS += --enable-split-objs
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting
 endif
 
-BOOTSTRAPPING_CABAL = bootstrapping.cabal
+BOOTSTRAPPING_STAMPS = $(addprefix stamp/bootstrapping.,Cabal filepath)
 
 .PHONY: subdirs
 
@@ -99,11 +99,8 @@ subdirs:
 
 .PHONY: boot
 
-boot: ifBuildable/ifBuildable \
+boot: $(BOOTSTRAPPING_STAMPS) ifBuildable/ifBuildable \
 	  $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup)
-	# XXX Hideous hacks:
-	$(GENPRIMOP) --make-haskell-source < ../compiler/prelude/primops.txt > base/GHC/Prim.hs
-	$(GENPRIMOP) --make-haskell-wrappers < ../compiler/prelude/primops.txt > base/GHC/PrimopWrappers.hs
 
 # We build the Setup program in a setup subdirectory to stop it trying
 # to use bits of base and Cabal when we build those packages.
@@ -112,22 +109,25 @@ boot: ifBuildable/ifBuildable \
 # We ought to be depending on %/Setup.*hs, but make makes that difficult.
 
 $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \
-%/setup/Setup: stamp/$(BOOTSTRAPPING_CABAL)
+%/setup/Setup: $(BOOTSTRAPPING_STAMPS)
 	-$(RM) -rf $*/setup
 	mkdir $*/setup
 	$(CP) $*/Setup.*hs $*/setup
-	cd $*/setup && $(GHC) -Wall --make -i../../$(BOOTSTRAPPING_CABAL) Setup.*hs -o Setup
+	cd $*/setup && $(GHC) -i../../bootstrapping.Cabal \
+	                      -i../../bootstrapping.filepath \
+	                      -Wall -cpp --make Setup.*hs -o Setup
 
-ifBuildable/ifBuildable: ifBuildable.hs stamp/$(BOOTSTRAPPING_CABAL)
+ifBuildable/ifBuildable: ifBuildable.hs
 	-$(RM) -rf ifBuildable
 	mkdir ifBuildable
 	$(CP) ifBuildable.hs ifBuildable/
 	cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
 
-stamp/$(BOOTSTRAPPING_CABAL):
-	$(RM) -rf $(BOOTSTRAPPING_CABAL)
-	$(CP) -R Cabal $(BOOTSTRAPPING_CABAL)
-	$(FIND) $(BOOTSTRAPPING_CABAL) \( -name "*.o" -o -name "*.hi" \) -exec $(RM) -f {} \;
+$(BOOTSTRAPPING_STAMPS): stamp/bootstrapping.%:
+	$(RM) -rf bootstrapping.$*
+	$(CP) -R $* bootstrapping.$*
+	$(FIND) bootstrapping.$* \( -name "*.o" -o -name "*.hi" \) \
+	                         -exec $(RM) -f {} \;
 	touch $@
 
 .PHONY: all build configure
@@ -226,13 +226,36 @@ install.library.%: stamp/configure.library.install.% \
                    %/setup/Setup ifBuildable/ifBuildable
 	ifBuildable/ifBuildable $* setup/Setup install
 
+.PHONY: binary-dist binary-dist.library.%
+
+BIN_DIST_LIBDIR=$(BIN_DIST_DIR)/libraries
+
+binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR))
+	cp    Makefile           $(BIN_DIST_LIBDIR)
+	cp    gen_contents_index $(BIN_DIST_LIBDIR)
+	cp    index.html         $(BIN_DIST_LIBDIR)
+	cp    doc-index.html     $(BIN_DIST_LIBDIR)
+	cp -a stamp              $(BIN_DIST_LIBDIR)
+
+$(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \
+binary-dist.library.%:
+	$(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*/setup
+	ifBuildable/ifBuildable $* cp    setup/Setup   $(BIN_DIST_LIBDIR)/$*/setup
+	ifBuildable/ifBuildable $* cp    $*.cabal      $(BIN_DIST_LIBDIR)/$*
+	ifBuildable/ifBuildable $* cp -a dist          $(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 \
+	     \( \( -name "*.o" -o -name "*.p_o" \) -a ! -name "HS*" \) \
+	     -exec rm {} \;
+
 .PHONY: distclean clean clean.library.%
 
 distclean: clean
 
 clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
-	$(RM) -f stamp/$(BOOTSTRAPPING_CABAL)
-	$(RM) -rf $(BOOTSTRAPPING_CABAL)
+	$(RM) -f stamp/bootstrapping.*
+	$(RM) -rf bootstrapping.*
 	$(RM) -rf ifBuildable
 	$(RM) -f libraries.txt index.html doc-index.html