Changeset 10127 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 3, 2008 2:51:57 AM (17 years ago)

Author:

vboxsync

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

32645

Message:

Exclude windows one level up. VBOX_KBUILD_HACKING

Location:

trunk/src/VBox/Additions/common

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxControl/Makefile.kmk (modified) (3 diffs)

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

@@ -20 +20 @@
 #
 
-DEPTH ?= ../../../..
+ifdef VBOX_KBUILD_HACKING
+SUB_DEPTH = ../../../..
+else
+DEPTH    ?= ../../../..
 SUB_DEPTH = ..
+endif
 include $(KBUILD_PATH)/subheader.kmk
 
 # Include sub-makefile.
 include $(PATH_SUB_CURRENT)/VBoxGuestLib/Makefile.kmk
+if1of ($(KBUILD_TARGET), freebsd os2 solaris)
 include $(PATH_SUB_CURRENT)/VBoxControl/Makefile.kmk
-if1of ($(KBUILD_TARGET), freebsd os2 solaris)
 include $(PATH_SUB_CURRENT)/VBoxGuest/Makefile.kmk
 include $(PATH_SUB_CURRENT)/VBoxService/Makefile.kmk

trunk/src/VBox/Additions/common/VBoxControl/Makefile.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# Makefile for the Cross Platform Guest Addition Services.
+# Sub-Makefile for the Guest Additions Command Line Management Interface.
 #
 
 #
-# Copyright (C) 2007 Sun Microsystems, Inc.
+# Copyright (C) 2008 Sun Microsystems, Inc.
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20 +20 @@
 #
 
-DEPTH ?= ../../../../..
+ifdef VBOX_KBUILD_HACKING
+SUB_DEPTH = ../../../../..
+else
 SUB_DEPTH = ../..
+DEPTH    ?= ../../../../..
+endif
 include $(KBUILD_PATH)/subheader.kmk
-
-ifneq ($(KBUILD_TARGET),win)
- PROGRAMS += VBoxControl
-endif
 
 #
 # VBoxControl
 #
-VBoxControl_TEMPLATE      = VBOXGUESTR3EXE
-VBoxControl_DEFS         += \
-        $(if $(VBOX_WITH_INFO_SVC),VBOX_HGCM VBOX_WITH_INFO_SVC,)
-VBoxControl_SOURCES       = \
+PROGRAMS += VBoxControl
+VBoxControl_TEMPLATE = VBOXGUESTR3EXE
+ifdef VBOX_WITH_INFO_SVC
+ VBoxControl_DEFS += VBOX_HGCM VBOX_WITH_INFO_SVC
+endif
+VBoxControl_SOURCES = \
         VBoxControl.cpp \
         VBoxControlSVN.cpp
-VBoxControl_LIBS          = \
+VBoxControl_LIBS = \
         $(VBOX_LIB_IPRT_GUEST_R3) \
         $(VBOX_LIB_VBGL_R3)
@@ -46 +48 @@
 
 include $(KBUILD_PATH)/subfooter.kmk
+