Index: /trunk/src/gmake/Makefile.kmk
===================================================================
--- /trunk/src/gmake/Makefile.kmk	(revision 585)
+++ /trunk/src/gmake/Makefile.kmk	(revision 586)
@@ -1,4 +1,7 @@
 # $Id$
 
+
+DEPTH = ../..
+include $(PATH_KBUILD)/header.kmk
 
 #
@@ -284,6 +287,5 @@
 
 
-DEPTH = ../..
-include $(PATH_KBUILD)/rules.kmk
+include $(PATH_KBUILD)/footer.kmk
 
 			
Index: /trunk/src/lib/Makefile.kmk
===================================================================
--- /trunk/src/lib/Makefile.kmk	(revision 585)
+++ /trunk/src/lib/Makefile.kmk	(revision 586)
@@ -25,16 +25,16 @@
 #
 
+DEPTH = ../..
+include $(PATH_KBUILD)/header.kmk
+
 LIBRARIES += kDep
-
-kDep_TEMPLATE      	= LIB
-ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
-kDep_DEFS          += NEED_ISBLANK=1 __WIN32__=1
+kDep_TEMPLATE = LIB
+ifeq ($(filter-out win nt win32 win64,$(BUILD_TARGET)),)
+kDep_DEFS += NEED_ISBLANK=1 __WIN32__=1
 endif
-kDep_SOURCES        = $(PATH_CURRENT)/kDep.c
+kDep_SOURCES = $(PATH_CURRENT)/kDep.c
+kDep_NOINST = 1
 
 
-ifndef DEPTH # Experiment in including stuff from the top level make.
-DEPTH = ../..
-include $(PATH_KBUILD)/rules.kmk
-endif
+include $(PATH_KBUILD)/footer.kmk