Changeset 742

Timestamp:

Dec 17, 2006, 8:41:22 AM (19 years ago)

Author:

bird

Message:

Fixed the sub-makefile bustage and added two sanitychecks.

Location:

trunk/kBuild

Files:

• header.kmk (modified) (1 diff)
• subfooter.kmk (modified) (2 diffs)
• subheader.kmk (modified) (1 diff)

trunk/kBuild/header.kmk

@@ -751 +751 @@
 endif # __header_kmk__
 
+

trunk/kBuild/subfooter.kmk

@@ -25 +25 @@
 #
 
+#
+# Sanity check.
+#
+ifdef __footer_kmk__
+$(error kBuild: footer.kmk has already been included. Fix your sub-makefiles!)
+endif
 
 #
@@ -53 +59 @@
 
 
-#
-# Switch back to the context of previous makefile on the stack.
-#
-MAKEFILE_CURRENT := $(call stack-pop,_SUB_MAKEFILE_STACK)
-PATH_SUB_CURRENT := $(abspath $(dir $(MAKEFILE_CURRENT)))
 
-#
-# When we reach the last makefile we include the footer.
-#
-ifeq ($(_SUB_MAKEFILE_STACK),)
+ifneq ($(_SUB_MAKEFILE_STACK),)
+ #
+ # Switch back to the context of previous makefile on the stack.
+ #
+ MAKEFILE_CURRENT := $(call stack-pop,_SUB_MAKEFILE_STACK)
+ PATH_SUB_CURRENT := $(abspath $(dir $(MAKEFILE_CURRENT)))
+
+else
+ #
+ # We've reached the end of the line, include the real footer.
+ #
  include $(PATH_KBUILD)/footer.kmk
+
 endif
 
-

trunk/kBuild/subheader.kmk

@@ -24 +24 @@
 #
 #
+
+#
+# Sanity check.
+#
+ifdef __footer_kmk__
+$(error kBuild: footer.kmk has already been included. Fix your sub-makefiles!)
+endif
 
 ifndef _SUB_MAKEFILE_NOT_FIRST