X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-package.mk;h=afe69ac159797f40f0da866722da1cc2cfca1a4a;hb=6efacfe8bcbe66dfc3b52397ccbd34a58890520d;hp=863dc73f2d317e5375229444bd73d49ceba657c1;hpb=ce14988222b8da2abc57c68a087a61efe5ba709b;p=ghc-hetmet.git

diff --git a/rules/build-package.mk b/rules/build-package.mk
index 863dc73..afe69ac 100644
--- a/rules/build-package.mk
+++ b/rules/build-package.mk
@@ -28,8 +28,6 @@
 # libraries/base_dist_CC_OPTS = -Iinclude ...
 # libraries/base_dist_LD_OPTS = -package ghc-prim-0.1.0.0
 
-# TODO: soext
-
 define build-package
 # $1 = dir
 # $2 = distdir
@@ -44,11 +42,18 @@ endif
 ifneq "$(BINDIST) $3" "YES 0"
 
 $(call all-target,$1,all_$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)
 
 distclean : clean_$1_$2_config
 
+maintainer-clean : distclean
+
 .PHONY: clean_$1_$2_config
 clean_$1_$2_config:
 	$(RM) $1/config.log $1/config.status $1/include/Hs*Config.h
@@ -123,10 +128,14 @@ $1_$2_SplitObjs = NO
 endif
 endif
 
-# C and S files are built the "v" vanlilla way
+# 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)
+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)))
@@ -136,7 +145,7 @@ $(call haddock,$1,$2)
 endif # package-data.mk exists
 
 # Don't put bootstrapping packages in the bindist
-ifeq "$3" "1"
+ifneq "$3" "0"
 BINDIST_EXTRAS += $1/*.cabal $1/$2/setup-config $1/LICENSE
 BINDIST_EXTRAS += $$($1_$2_INSTALL_INCLUDES_SRCS)
 endif