X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-package.mk;h=8e813892dfcefdbc30b916ce36e2fabff97062fe;hb=d4f9480c7e7bf8167a97ff964f9d85400398c5c4;hp=afe69ac159797f40f0da866722da1cc2cfca1a4a;hpb=7f65bf79c5b53006cda40fe02b6d8f6ca5351d38;p=ghc-hetmet.git

diff --git a/rules/build-package.mk b/rules/build-package.mk
index afe69ac..8e81389 100644
--- a/rules/build-package.mk
+++ b/rules/build-package.mk
@@ -39,16 +39,23 @@ endif
 
 # We don't install things compiled by stage 0, so no need to put them
 # in the bindist.
-ifneq "$(BINDIST) $3" "YES 0"
+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)" ""
 all_$$($1_$2_GROUP): all_$1_$2
 endif
 
-$(call clean-target,$1,$2,$1/$2)
+ifneq "$$(CHECKED_$1)" "YES"
+CHECKED_$1 = YES
+check_packages: check_$1
+.PHONY: check_$1
+check_$1: $$(GHC_CABAL_INPLACE)
+	$$(GHC_CABAL_INPLACE) check $1
+endif
 
 distclean : clean_$1_$2_config
 
@@ -56,8 +63,8 @@ maintainer-clean : distclean
 
 .PHONY: clean_$1_$2_config
 clean_$1_$2_config:
-	$(RM) $1/config.log $1/config.status $1/include/Hs*Config.h
-	$(RM) -r $1/autom4te.cache
+	"$$(RM)" $$(RM_OPTS) $1/config.log $1/config.status $1/include/Hs*Config.h
+	"$$(RM)" $$(RM_OPTS) -r $1/autom4te.cache
 
 # --- CONFIGURATION
 
@@ -79,7 +86,7 @@ endif
 
 $(call all-target,$1_$2,$1/$2/package-data.mk)
 
-ifneq "$(BINDIST)" "YES"
+ifneq "$$(BINDIST)" "YES"
 # We have a rule for package-data.mk only when the package is
 # disabled, because we want the build to fail if we haven't run phase 0.
 $(call build-package-data,$1,$2)
@@ -128,17 +135,22 @@ $1_$2_SplitObjs = NO
 endif
 endif
 
-# C and S files are built the "v" vanlilla way and possibly also the "dyn" way.
-$(call c-objs,$1,$2,v)
 $(call distdir-opts,$1,$2,$3)
-$(call c-suffix-rules,$1,$2,v,YES)
+
+# C and S files are possibly built the "dyn" way.
 ifeq "$(BuildSharedLibs)" "YES"
 $(call c-objs,$1,$2,dyn)
 $(call c-suffix-rules,$1,$2,dyn,YES)
 endif
 
 # Now generate all the build rules for each way in this directory:
-$$(foreach way,$$($1_$2_WAYS),$$(eval $$(call build-package-way,$1,$2,$$(way),$3)))
+$$(foreach way,$$($1_$2_WAYS),$$(eval \
+    $$(call c-objs,$1,$2,$$(way)) \
+	$$(call c-suffix-rules,$1,$2,$$(way),YES) \
+    $$(call cmm-objs,$1,$2,$$(way)) \
+    $$(call cmm-suffix-rules,$1,$2,$$(way)) \
+    $$(call build-package-way,$1,$2,$$(way),$3) \
+  ))
 
 $(call haddock,$1,$2)
 
@@ -146,7 +158,7 @@ endif # package-data.mk exists
 
 # Don't put bootstrapping packages in the bindist
 ifneq "$3" "0"
-BINDIST_EXTRAS += $1/*.cabal $1/$2/setup-config $1/LICENSE
+BINDIST_EXTRAS += $1/*.cabal $$(wildcard $1/*.buildinfo) $1/$2/setup-config $1/LICENSE
 BINDIST_EXTRAS += $$($1_$2_INSTALL_INCLUDES_SRCS)
 endif