VirtualBox

Changeset 53981 in vbox for trunk/src/VBox/ExtPacks


Ignore:
Timestamp:
Jan 27, 2015 6:58:32 PM (10 years ago)
Author:
vboxsync
Message:

Adding the VBoxDTrace wrapper binary to the installers. Fixing extpack build break. Simplified VBOX_WITH_DTRACE* test in the makefiles.

Location:
trunk/src/VBox/ExtPacks
Files:
2 edited

Legend:

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

    r53979 r53981  
    2222 include $(PATH_SUB_CURRENT)/Puel/Makefile.kmk
    2323endif
    24 if    defined(VBOX_WITH_EXTPACK_VBOXDTRACE) \
    25    || defined(VBOX_WITH_DTRACE) \
    26    || defined(VBOX_WITH_DTRACE_R3) \
    27    || defined(VBOX_WITH_DTRACE_R0) \
    28    || defined(VBOX_WITH_DTRACE_R0DRV) \
    29    || defined(VBOX_WITH_DTRACE_RC)
     24if defined(VBOX_WITH_EXTPACK_VBOXDTRACE) || defined(VBOX_WITH_DTRACE)
    3025 include $(PATH_SUB_CURRENT)/VBoxDTrace/Makefile.kmk
    3126endif
  • trunk/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk

    r53979 r53981  
    3131
    3232
    33 #
    34 # The generic wrapper that selects native or extpack dtrace cmd and adds our
    35 # library path to the command line.
    36 #
    37 # Note! This is not installed as part of the extension pack, but always shipped
    38 #       with the base VBox installation.
    39 #
    40 PROGRAMS += VBoxDTrace
    41 VBoxDTrace_TEMPLATE := VBOXR3EXE
    42 VBoxDTrace_SOURCES := VBoxDTraceWrapper.cpp
    43 VBoxDTrace_LIBS = $(LIB_RUNTIME)
     33ifndef VBOX_ONLY_ADDITIONS
     34 #
     35 # The generic wrapper that selects native or extpack dtrace cmd and adds our
     36 # library path to the command line.
     37 #
     38 # Note! This is not installed as part of the extension pack, but always shipped
     39 #       with the base VBox installation.
     40 #
     41 PROGRAMS += VBoxDTrace
     42 VBoxDTrace_TEMPLATE := VBOXR3EXE
     43 VBoxDTrace_SOURCES := VBoxDTraceWrapper.cpp
     44 VBoxDTrace_LIBS = $(LIB_RUNTIME)
     45endif
    4446
    4547
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