Changeset 6756 in vbox for trunk/src/VBox

Timestamp:

Feb 2, 2008 8:21:39 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

27838

Message:

Converted the (recursive) x11 makefiles to sub-makefiles.

Location:

trunk/src/VBox/Additions

Files:

• Makefile.kmk (modified) (1 diff)
• x11/Makefile.kmk (modified) (1 diff)
• x11/xclient/Makefile.kmk (modified) (3 diffs)
• x11/xgraphics/Makefile.kmk (modified) (3 diffs)
• x11/xmouse/Makefile.kmk (modified) (5 diffs)

trunk/src/VBox/Additions/Makefile.kmk

@@ -56 +56 @@
  include $(PATH_SUB_CURRENT)/WINNT/Makefile.kmk
 endif
-## @todo Convert linux and x11 to sub-makefiles too.
 ifdef VBOX_WITH_LINUX_ADDITIONS
- SUBDIRS += linux x11
+ SUBDIRS += linux
+ #include $(PATH_SUB_CURRENT)/linux/Makefile.kmk
+ include $(PATH_SUB_CURRENT)/x11/Makefile.kmk
 else if1of ($(BUILD_TARGET), solaris)
- SUBDIRS += x11
+ include $(PATH_SUB_CURRENT)/x11/Makefile.kmk
 endif
 

trunk/src/VBox/Additions/x11/Makefile.kmk

@@ -19 +19 @@
 include $(PATH_KBUILD)/subheader.kmk
 
-# Include sub-dirs.
-SUBDIRS =
+# Include sub-makefiles.
 if1of ($(BUILD_TARGET),l4 linux solaris)
-SUBDIRS += \
-        xclient \
-        xgraphics \
-        xmouse
+ include $(PATH_SUB_CURRENT)/xclient/Makefile.kmk
+ include $(PATH_SUB_CURRENT)/xgraphics/Makefile.kmk
+ include $(PATH_SUB_CURRENT)/xmouse/Makefile.kmk
 endif
 

trunk/src/VBox/Additions/x11/xclient/Makefile.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# Makefile for the VirtualBox Guest Addition X11 Client.
+# Sub-Makefile for the VirtualBox Guest Addition X11 Client.
 #
 
@@ -16 +16 @@
 #
 
-DEPTH = ../../../../..
-include $(PATH_KBUILD)/header.kmk
+DEPTH ?= ../../../../..
+SUB_DEPTH = ../..
+include $(PATH_KBUILD)/subheader.kmk
 
 #
@@ -88 +89 @@
 endif
 
-include $(PATH_KBUILD)/footer.kmk
+include $(PATH_KBUILD)/subfooter.kmk

trunk/src/VBox/Additions/x11/xgraphics/Makefile.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# Makefile for the VBox Linux Additions X.org graphics driver.
+# Sub-Makefile for the VBox Linux Additions X.org graphics driver.
 #
 
@@ -16 +16 @@
 #
 
-DEPTH = ../../../../..
-include $(PATH_KBUILD)/header.kmk
+DEPTH ?= ../../../../..
+SUB_DEPTH = ../..
+include $(PATH_KBUILD)/subheader.kmk
 
 #
@@ -179 +180 @@
 
 
-include $(PATH_KBUILD)/footer.kmk
+include $(PATH_KBUILD)/subfooter.kmk

trunk/src/VBox/Additions/x11/xmouse/Makefile.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# Makefile for the VBox Additions XFree86 and X.org mouse drivers.
+# Sub-Makefile for the VBox Additions XFree86 and X.org mouse drivers.
 #
 
@@ -16 +16 @@
 #
 
-DEPTH = ../../../../..
-include $(PATH_KBUILD)/header.kmk
+DEPTH ?= ../../../../..
+SUB_DEPTH = ../..
+include $(PATH_KBUILD)/subheader.kmk
 
 
@@ -80 +81 @@
 vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS)
-vboxmouse_drv_71_INCS = \
+vboxmouse_drv_71_INCS := \
         $(VBOX_PATH_X11_XORG_7_1) \
         $(VBOX_PATH_X11_XORG_7_1)/X11 \
@@ -97 +98 @@
 vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS)
-vboxmouse_drv_14_INCS = \
+vboxmouse_drv_14_INCS := \
         $(VBOX_PATH_X11_XORG_1_4) \
         $(VBOX_PATH_X11_XORG_1_4)/X11 \
@@ -108 +109 @@
 
 
-include $(PATH_KBUILD)/footer.kmk
+include $(PATH_KBUILD)/subfooter.kmk