Changeset 56465 in vbox

Timestamp:

Jun 16, 2015 10:40:04 PM (10 years ago)

Author:

vboxsync

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

101082

Message:

VBoxManageHelp must be built with all the VBOX_WITH_STUFF or the manual will miss major stuff like natnetwork.

File:

• trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -19 +19 @@
 include $(KBUILD_PATH)/subheader.kmk
 
+VBOX_COMMON_VBOXMANAGE_DEFS = \
+        $(if $(VBOX_WITH_AHCI), VBOX_WITH_AHCI) \
+        $(if $(VBOX_WITH_ALSA), VBOX_WITH_ALSA) \
+        $(if $(VBOX_WITH_COPYTOGUEST),VBOX_WITH_COPYTOGUEST) \
+        $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \
+        $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL) \
+        $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS) \
+        $(if $(VBOX_WITH_HEADLESS), VBOX_WITH_HEADLESS) \
+        $(if $(VBOX_WITH_HGCM), VBOX_WITH_HGCM) \
+        $(if $(VBOX_WITH_HOSTNETIF_API), VBOX_WITH_HOSTNETIF_API) \
+        $(if $(VBOX_WITH_NETFLT), VBOX_WITH_NETFLT) \
+        $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE) \
+        $(if $(VBOX_WITH_SCSI), VBOX_WITH_SCSI) \
+        $(if $(VBOX_WITH_SOLARIS_OSS), VBOX_WITH_SOLARIS_OSS) \
+        $(if $(VBOX_WITH_VBOXSDL), VBOX_WITH_VBOXSDL) \
+        $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL) \
+        $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO) \
+        $(if $(VBOX_WITH_USB_CARDREADER),VBOX_WITH_USB_CARDREADER) \
+        $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH) \
+        $(if $(VBOX_WITH_VPX),VBOX_WITH_VPX) \
+        $(if $(VBOX_WITH_NAT_SERVICE),VBOX_WITH_NAT_SERVICE) \
+        $(if $(VBOX_WITH_VMSVGA),VBOX_WITH_VMSVGA)
+
+
 ifdef VBOX_WITH_DOCS
  PROGRAMS += VBoxManageHelp
@@ -25 +49 @@
 VBoxManageHelp_DEFS      += \
         VBOX_ONLY_DOCS \
-        $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL)
+       $(VBOX_COMMON_VBOXMANAGE_DEFS)
 VBoxManageHelp_SOURCES    = \
         VBoxManage.cpp \
@@ -35 +59 @@
  PROGRAMS += VBoxManage
  VBoxManage_TEMPLATE   = VBOXMAINCLIENTEXE
+ VBoxManage_DEFS      += $(VBOX_COMMON_VBOXMANAGE_DEFS)
  VBoxManage_DEFS.win   = _WIN32_WINNT=0x0500
- VBoxManage_INCS          = $(PATH_TARGET)/manual
+ VBoxManage_INCS       = $(PATH_TARGET)/manual
  VBoxManage_INTERMEDIATES = $(PATH_TARGET)/manual/VBoxManageBuiltInHelp.h
  VBoxManage_SOURCES    = \
@@ -67 +92 @@
  VBoxManage_LIBS      += $(LIB_DDU)
 
- VBoxManage_DEFS      += \
-        $(if $(VBOX_WITH_AHCI), VBOX_WITH_AHCI) \
-        $(if $(VBOX_WITH_ALSA), VBOX_WITH_ALSA) \
-        $(if $(VBOX_WITH_COPYTOGUEST),VBOX_WITH_COPYTOGUEST) \
-        $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \
-        $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL) \
-        $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS) \
-        $(if $(VBOX_WITH_HEADLESS), VBOX_WITH_HEADLESS) \
-        $(if $(VBOX_WITH_HGCM), VBOX_WITH_HGCM) \
-        $(if $(VBOX_WITH_HOSTNETIF_API), VBOX_WITH_HOSTNETIF_API) \
-        $(if $(VBOX_WITH_NETFLT), VBOX_WITH_NETFLT) \
-        $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE) \
-        $(if $(VBOX_WITH_SCSI), VBOX_WITH_SCSI) \
-        $(if $(VBOX_WITH_SOLARIS_OSS), VBOX_WITH_SOLARIS_OSS) \
-        $(if $(VBOX_WITH_VBOXSDL), VBOX_WITH_VBOXSDL) \
-        $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL) \
-        $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO) \
-        $(if $(VBOX_WITH_USB_CARDREADER),VBOX_WITH_USB_CARDREADER) \
-        $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH) \
-        $(if $(VBOX_WITH_VPX),VBOX_WITH_VPX) \
-        $(if $(VBOX_WITH_NAT_SERVICE),VBOX_WITH_NAT_SERVICE) \
-        $(if $(VBOX_WITH_VMSVGA),VBOX_WITH_VMSVGA)
-
  # VBoxNetPortForwardString.h
  VBoxManageNATNetwork.cpp_INCS += ../../NetworkServices/NetLib/