VirtualBox

Changeset 76654 in vbox


Ignore:
Timestamp:
Jan 6, 2019 3:53:14 PM (6 years ago)
Author:
vboxsync
Message:

Main/Makefile.kmk: ifdef is preferred over $(if ) for constructing DEFS (sorry Frank).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Main/Makefile.kmk

    r76620 r76654  
    2929# Include sub-makefile(s).
    3030#
    31 ifndef VBOX_ONLY_EXTPACKS
     31if 0 #ndef VBOX_ONLY_EXTPACKS
    3232 ifdef VBOX_WITH_WEBSERVICES
    3333  include $(PATH_SUB_CURRENT)/webservice/Makefile.kmk
     
    5353
    5454
    55 # Construct VBOX_MAIN_DEFS
    56 ## @todo eliminate or expand VBOX_MAIN_DEFS.
    57 VBOX_MAIN_DEFS   =
     55#
     56# VBOX_MAIN_DEFS is used by VBoxC, VBoxClient-x86, VBoxSVC and VBoxSVCM, making
     57# sure they all have the same set of features enabled.
     58#
     59VBOX_MAIN_DEFS :=
    5860ifneq ($(KBUILD_TARGET),win)
    5961 ifndef VBOX_WITH_XPCOM
    60   $(error "VBox: VBOX_WITH_XPCOM isn't defined")
    61  endif
    62  VBOX_MAIN_DEFS += VBOX_WITH_GENERIC_SESSION_WATCHER
    63 endif
    64 VBOX_MAIN_DEFS += \
    65         $(if $(VBOX_WITH_AUDIO_ALSA),VBOX_WITH_AUDIO_ALSA,) \
    66         $(if $(VBOX_WITH_AUDIO_DEBUG),VBOX_WITH_AUDIO_DEBUG,) \
    67         $(if $(VBOX_WITH_AUDIO_OSS),VBOX_WITH_AUDIO_OSS,) \
    68         $(if $(VBOX_WITH_AUDIO_PULSE),VBOX_WITH_AUDIO_PULSE,) \
    69         $(if $(VBOX_WITH_AUDIO_VALIDATIONKIT),VBOX_WITH_AUDIO_VALIDATIONKIT,) \
    70         $(if $(VBOX_WITH_AUDIO_VRDE),VBOX_WITH_AUDIO_VRDE,) \
    71         $(if $(VBOX_WITH_COPYTOGUEST),VBOX_WITH_COPYTOGUEST,) \
    72         $(if $(VBOX_WITH_CRHGSMI),VBOX_WITH_CRHGSMI,) \
    73         $(if $(VBOX_WITH_CROGL),VBOX_WITH_CROGL,) \
    74         $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \
    75         $(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,) \
    76         $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL,) \
    77         $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,) \
    78         $(if $(VBOX_WITH_GUEST_PROPS_RDONLY_GUEST),VBOX_WITH_GUEST_PROPS_RDONLY_GUEST,) \
    79         $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
    80         $(if $(VBOX_WITH_HOSTNETIF_API),VBOX_WITH_HOSTNETIF_API,) \
    81         $(if $(VBOX_WITH_DHCPD),VBOX_WITH_DHCPD,) \
    82         $(if $(VBOX_WITH_LIVE_MIGRATION),VBOX_WITH_LIVE_MIGRATION,) \
    83         $(if $(VBOX_WITH_MIDL_PROXY_STUB),VBOX_WITH_MIDL_PROXY_STUB,) \
    84         $(if $(VBOX_WITH_NETFLT),VBOX_WITH_NETFLT,) \
    85         $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,) \
    86         $(if $(VBOX_WITH_PDM_ASYNC_COMPLETION),VBOX_WITH_PDM_ASYNC_COMPLETION,) \
    87         $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,) \
    88         $(if $(VBOX_WITH_RAW_RING1),VBOX_WITH_RAW_RING1,) \
    89         $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,) \
    90         $(if $(VBOX_WITH_USB_CARDREADER),VBOX_WITH_USB_CARDREADER,) \
    91         $(if $(VBOX_WITH_USB_CARDREADER_TEST),VBOX_WITH_USB_CARDREADER_TEST,) \
    92         $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO,) \
    93         $(if $(VBOX_WITH_VMSVGA),VBOX_WITH_VMSVGA,) \
    94         $(if $(VBOX_WITH_VMSVGA3D),VBOX_WITH_VMSVGA3D,) \
    95         $(if $(VBOX_WITH_VUSB),VBOX_WITH_VUSB,) \
    96         $(if-expr defined(VBOX_WITH_EHCI) && defined(VBOX_WITH_USB),VBOX_WITH_EHCI,)
     62$(error "VBox: VBOX_WITH_XPCOM isn't defined")
     63 endif
     64VBOX_MAIN_DEFS += VBOX_WITH_GENERIC_SESSION_WATCHER
     65endif
     66ifdef VBOX_WITH_AUDIO_ALSA
     67VBOX_MAIN_DEFS += VBOX_WITH_AUDIO_ALSA
     68endif
     69ifdef VBOX_WITH_AUDIO_DEBUG
     70VBOX_MAIN_DEFS += VBOX_WITH_AUDIO_DEBUG
     71endif
     72ifdef VBOX_WITH_AUDIO_OSS
     73VBOX_MAIN_DEFS += VBOX_WITH_AUDIO_OSS
     74endif
     75ifdef VBOX_WITH_AUDIO_PULSE
     76VBOX_MAIN_DEFS += VBOX_WITH_AUDIO_PULSE
     77endif
     78ifdef VBOX_WITH_AUDIO_VALIDATIONKIT
     79VBOX_MAIN_DEFS += VBOX_WITH_AUDIO_VALIDATIONKIT
     80endif
     81ifdef VBOX_WITH_AUDIO_VRDE
     82VBOX_MAIN_DEFS += VBOX_WITH_AUDIO_VRDE
     83endif
     84ifdef VBOX_WITH_COPYTOGUEST
     85VBOX_MAIN_DEFS += VBOX_WITH_COPYTOGUEST
     86endif
     87ifdef VBOX_WITH_CRHGSMI
     88VBOX_MAIN_DEFS += VBOX_WITH_CRHGSMI
     89endif
     90ifdef VBOX_WITH_CROGL
     91VBOX_MAIN_DEFS += VBOX_WITH_CROGL
     92endif
     93ifdef VBOX_WITH_E1000
     94VBOX_MAIN_DEFS += VBOX_WITH_E1000
     95endif
     96ifdef VBOX_WITH_EXTPACK
     97VBOX_MAIN_DEFS += VBOX_WITH_EXTPACK
     98endif
     99ifdef VBOX_WITH_GUEST_CONTROL
     100VBOX_MAIN_DEFS += VBOX_WITH_GUEST_CONTROL
     101endif
     102ifdef VBOX_WITH_GUEST_PROPS
     103VBOX_MAIN_DEFS += VBOX_WITH_GUEST_PROPS
     104 ifdef VBOX_WITH_GUEST_PROPS_RDONLY_GUEST
     105VBOX_MAIN_DEFS += VBOX_WITH_GUEST_PROPS_RDONLY_GUEST
     106 endif
     107endif
     108ifdef VBOX_WITH_HGCM
     109VBOX_MAIN_DEFS += VBOX_WITH_HGCM
     110endif
     111ifdef VBOX_WITH_HOSTNETIF_API
     112VBOX_MAIN_DEFS += VBOX_WITH_HOSTNETIF_API
     113endif
     114ifdef VBOX_WITH_DHCPD
     115VBOX_MAIN_DEFS += VBOX_WITH_DHCPD
     116endif
     117ifdef VBOX_WITH_LIVE_MIGRATION
     118VBOX_MAIN_DEFS += VBOX_WITH_LIVE_MIGRATION
     119endif
     120ifdef VBOX_WITH_MIDL_PROXY_STUB
     121VBOX_MAIN_DEFS += VBOX_WITH_MIDL_PROXY_STUB
     122endif
     123ifdef VBOX_WITH_NETFLT
     124VBOX_MAIN_DEFS += VBOX_WITH_NETFLT
     125endif
     126ifdef VBOX_WITH_PCI_PASSTHROUGH
     127VBOX_MAIN_DEFS += VBOX_WITH_PCI_PASSTHROUGH
     128endif
     129ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
     130VBOX_MAIN_DEFS += VBOX_WITH_PDM_ASYNC_COMPLETION
     131endif
     132ifdef VBOX_WITH_RAW_MODE
     133VBOX_MAIN_DEFS += VBOX_WITH_RAW_MODE
     134 ifdef VBOX_WITH_RAW_RING1
     135VBOX_MAIN_DEFS += VBOX_WITH_RAW_RING1
     136 endif
     137endif
     138ifdef VBOX_WITH_SDS
     139VBOX_MAIN_DEFS += VBOX_WITH_SDS
     140endif
     141ifdef VBOX_WITH_USB_CARDREADER
     142VBOX_MAIN_DEFS += VBOX_WITH_USB_CARDREADER
     143endif
     144ifdef VBOX_WITH_USB_CARDREADER_TEST
     145VBOX_MAIN_DEFS += VBOX_WITH_USB_CARDREADER_TEST
     146endif
     147ifdef VBOX_WITH_VIRTIO
     148VBOX_MAIN_DEFS += VBOX_WITH_VIRTIO
     149endif
     150ifdef VBOX_WITH_VMSVGA
     151VBOX_MAIN_DEFS += VBOX_WITH_VMSVGA
     152endif
     153ifdef VBOX_WITH_VMSVGA3D
     154VBOX_MAIN_DEFS += VBOX_WITH_VMSVGA3D
     155endif
     156ifdef VBOX_WITH_VUSB
     157VBOX_MAIN_DEFS += VBOX_WITH_VUSB
     158endif
     159ifdef VBOX_WITH_EHCI
     160 ifdef VBOX_WITH_USB
     161 VBOX_MAIN_DEFS += VBOX_WITH_EHCI
     162 endif
     163endif
    97164
    98165
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette