X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-package.mk;h=fc3d0f71a60562ac296f69f71f66a43a495592ce;hb=75d9236613acdcfa54deb81b12bd4546c31e7c9f;hp=4005c731798e49fa4e81aeb8f675b275babbd4b8;hpb=aea784af873f089a40af71849d83f59008562a58;p=ghc-hetmet.git

diff --git a/rules/build-package.mk b/rules/build-package.mk
index 4005c73..fc3d0f7 100644
--- a/rules/build-package.mk
+++ b/rules/build-package.mk
@@ -29,6 +29,7 @@
 # libraries/base_dist_LD_OPTS = -package ghc-prim-0.1.0.0
 
 define build-package
+$(call trace, build-package($1,$2,$3))
 # $1 = dir
 # $2 = distdir
 # $3 = GHC stage to use (0 == bootstrapping compiler)
@@ -37,12 +38,33 @@ ifeq "$$(findstring $3,0 1 2)" ""
 $$(error $1/$2: stage argument to build-package should be 0, 1, or 2)
 endif
 
+$(call clean-target,$1,$2,$1/$2)
+
+distclean : clean_$1_$2_config
+
+maintainer-clean : distclean
+
+.PHONY: clean_$1_$2_config
+clean_$1_$2_config:
+	"$$(RM)" $$(RM_OPTS) $1/config.log $1/config.status $1/include/Hs*Config.h
+	"$$(RM)" $$(RM_OPTS_REC) $1/autom4te.cache
+
+ifneq "$$($1_$2_NOT_NEEDED)" "YES"
+$$(eval $$(call build-package-helper,$1,$2,$3))
+endif
+endef
+
+
+define build-package-helper
+# $1 = dir
+# $2 = distdir
+# $3 = GHC stage to use (0 == bootstrapping compiler)
+
 # We don't install things compiled by stage 0, so no need to put them
 # in the bindist.
 ifneq "$$(BINDIST) $3" "YES 0"
 
 $(call all-target,$1,all_$1_$2)
-$(call clean-target,$1,$2,$1/$2)
 # This give us things like
 #     all_libraries: all_libraries/base_dist-install
 ifneq "$$($1_$2_GROUP)" ""
@@ -57,23 +79,14 @@ check_$1: $$(GHC_CABAL_INPLACE)
 	$$(GHC_CABAL_INPLACE) check $1
 endif
 
-distclean : clean_$1_$2_config
-
-maintainer-clean : distclean
-
-.PHONY: clean_$1_$2_config
-clean_$1_$2_config:
-	"$$(RM)" $$(RM_OPTS) $1/config.log $1/config.status $1/include/Hs*Config.h
-	"$$(RM)" $$(RM_OPTS) -r $1/autom4te.cache
-
 # --- CONFIGURATION
 
-$(call package-config,$1,$2,$3)
-
 ifneq "$$(NO_INCLUDE_PKGDATA)" "YES"
 include $1/$2/package-data.mk
 endif
 
+$(call package-config,$1,$2,$3)
+
 ifeq "$$($1_$2_DISABLE)" "YES"
 
 ifeq "$$(DEBUG)" "YES"
@@ -121,7 +134,7 @@ $(call includes-sources,$1,$2)
 $1_$2_WAYS_DASHED = $$(subst $$(space),,$$(patsubst %,-%,$$(strip $$($1_$2_WAYS))))
 $1_$2_depfile_base = $1/$2/build/.depend$$($1_$2_WAYS_DASHED)
 
-$(call build-dependencies,$1,$2)
+$(call build-dependencies,$1,$2,$3)
 
 # --- BUILDING
 
@@ -135,7 +148,7 @@ endif
 endif
 
 # C and S files are possibly built the "dyn" way.
-ifeq "$(BuildSharedLibs)" "YES"
+ifeq "$$(BuildSharedLibs)" "YES"
 $(call c-objs,$1,$2,dyn)
 $(call c-suffix-rules,$1,$2,dyn,YES)
 endif
@@ -149,7 +162,9 @@ $$(foreach way,$$($1_$2_WAYS),$$(eval \
     $$(call build-package-way,$1,$2,$$(way),$3) \
   ))
 
+ifneq "$$($1_$2_HADDOCK_ME)" "NO"
 $(call haddock,$1,$2)
+endif
 
 endif # package-data.mk exists