Add a Makefile in libraries/

diff --git a/boot b/boot
index 9c5f1c5..3cb9f6a 100644 (file)
--- a/boot
+++ b/boot
@@ -58,6 +58,7 @@ for f in $libraries; do
        fi
        top=`echo $f | sed 's#[^/]\+#..#g'`
        echo "${f}_PACKAGE = ${pkg}" >> $f/ghc.mk
+       echo "${f}_dist-install_GROUP = libraries" >> $f/ghc.mk
        echo "\$(eval \$(call build-package,${f},dist-install,${stage}))" >> $f/ghc.mk
        rm -f $f/GNUmakefile
        echo "Creating $f/GNUmakefile"

diff --git a/ghc.mk b/ghc.mk
index 690850d..d30573b 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -895,3 +895,6 @@ maintainer-clean : distclean
        $(RM) libraries/process/include/HsProcessConfig.h.in
        $(RM) libraries/unix/include/HsUnixConfig.h.in
        $(RM) libraries/old-time/include/HsTimeConfig.h.in
+
+.PHONY: all_libraries
+

diff --git a/libraries/Makefile b/libraries/Makefile
new file mode 100644 (file)
index 0000000..900b639
--- /dev/null
+++ b/libraries/Makefile
@@ -0,0 +1,3 @@
+dir = libraries
+TOP = ..
+include $(TOP)/mk/sub-makefile.mk

diff --git a/rules/build-package.mk b/rules/build-package.mk
index fb7d9d2..6612312 100644 (file)
--- a/rules/build-package.mk
+++ b/rules/build-package.mk
@@ -42,6 +42,11 @@ 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)