Changeset 32719 in vbox

Timestamp:

Sep 23, 2010 12:58:30 PM (14 years ago)

Author:

vboxsync

Message:

VBoxManage/Makefile.kmk: DEFS cleanup

File:

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

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

@@ -32 +32 @@
  VBoxManage_TEMPLATE   = VBOXMAINCLIENTEXE
  VBoxManage_DEFS.win   = _WIN32_WINNT=0x0500
- ifdef VBOX_DYNAMIC_NET_ATTACH
-  VBoxManage_DEFS += VBOX_DYNAMIC_NET_ATTACH
- endif
- ifdef VBOX_WITH_NETFLT
-  VBoxManage_DEFS += VBOX_WITH_NETFLT
- endif
- ifdef VBOX_WITH_VIDEOHWACCEL
-  VBoxManage_DEFS += VBOX_WITH_VIDEOHWACCEL
- endif
  VBoxManage_SOURCES = \
         VBoxManage.cpp \
@@ -63 +54 @@
 
 VBoxManage_DEFS      += \
+        $(if $(VBOX_WITH_AHCI), VBOX_WITH_AHCI) \
+        $(if $(VBOX_WITH_ALSA), VBOX_WITH_ALSA) \
+        $(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_VDE), VBOX_WITH_VDE) \
+        $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL) \
+        $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO) \
         $(if $(VBOX_WITH_VRDP), VBOX_WITH_VRDP) \
-        $(if $(VBOX_WITH_HEADLESS), VBOX_WITH_HEADLESS) \
-        $(if $(VBOX_WITH_ALSA), VBOX_WITH_ALSA) \
-        $(if $(VBOX_WITH_SOLARIS_OSS), VBOX_WITH_SOLARIS_OSS) \
-        $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE) \
-        $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \
-        $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO) \
-        $(if $(VBOX_WITH_AHCI), VBOX_WITH_AHCI) \
-        $(if $(VBOX_WITH_SCSI), VBOX_WITH_SCSI) \
-        $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS) \
-        $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL) \
-        $(if $(VBOX_WITH_HOSTNETIF_API), VBOX_WITH_HOSTNETIF_API) \
-        $(if $(VBOX_WITH_VDE), VBOX_WITH_VDE) \
-        $(if $(VBOX_WITH_HGCM), VBOX_WITH_HGCM)
+        $(if $(VBOX_DYNAMIC_NET_ATTACH), VBOX_DYNAMIC_NET_ATTACH)
 
 ifneq ($(KBUILD_TARGET),win)