Move "all" taget to Lib.mak

To be able to do this, the top-level Build.mak is included in Lib.mak too,
because the $(all) variable should be populated before defining the "all"
target, so it can have $(all) as a prerequisite.

diff --git a/Lib.mak b/Lib.mak
index 259a65906889addfd4fa636c5fb403046a1c7b64..2be60c5a7fca54fd0c2271ffb03026fa9fec18a3 100644 (file)
--- a/Lib.mak
+++ b/Lib.mak
@@ -240,4 +240,12 @@ $(if $V,,$(if $(setup_build_dir__), \
        $(info !! Something changed: $(setup_build_dir__) \
                        re-building affected files...)))
 
+# Include the Build.mak for this directory
+include $T/Build.mak
+
+# Phony rule to make all the targets (sub-makefiles can append targets to build
+# to the $(all) variable).
+.PHONY: all
+all: $(all)
+
 endif

diff --git a/Toplevel.mak b/Toplevel.mak
index bcf2b5662237e63aa0cbe12b526ccc0d0f3aa9c4..03e46c593aca163a5cede01a6b48d949de77d61e 100644 (file)
--- a/Toplevel.mak
+++ b/Toplevel.mak
@@ -5,11 +5,3 @@ P := remake
 # Include the build system library
 include $T/Lib.mak
 
-# Include the Build.mak for this directory
-include $T/Build.mak
-
-# Phony rule to make all the targets (sub-makefiles can append targets to build
-# to the $(all) variable).
-.PHONY: all
-all: $(all)
-

diff --git a/subproj/Toplevel.mak b/subproj/Toplevel.mak
index 4738f47629f3f8b2cfe0cfb608252b947d73dcaf..6109188af8b2a589cecbd0a9dba41a50fe1a8bc7 100644 (file)
--- a/subproj/Toplevel.mak
+++ b/subproj/Toplevel.mak
@@ -8,11 +8,3 @@ sinclude $T/Config.mak
 # Include the build system library
 include $T/Lib.mak
 
-# Include the Build.mak for this directory
-include $T/Build.mak
-
-# Phony rule to make all the targets (sub-makefiles can append targets to build
-# to the $(all) variable).
-.PHONY: all
-all: $(all)
-