VirtualBox

Ignore:
Timestamp:
Feb 1, 2023 4:25:17 PM (2 years ago)
Author:
vboxsync
Message:

Additions/*.kmk: Automatic scm cleanups. bugref:10348

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

    r98214 r98416  
    121121        vbva.c \
    122122        $(vboxvideo_drv_lib_SOURCES)
    123  # Any global symbols in the driver object files will be added to XFree86's
    124  # symbol table, which can cause problems if we e.g. define a symbol in two
    125  # modules.
    126  vboxvideo_drv_POST_CMDS = \
     123# Any global symbols in the driver object files will be added to XFree86's
     124# symbol table, which can cause problems if we e.g. define a symbol in two
     125# modules.
     126vboxvideo_drv_POST_CMDS = \
    127127        objcopy --keep-global-symbol vboxvideoModuleData $(out) $(out)-objcopy$$(NLTAB) \
    128128        $(MV) -f $(out)-objcopy $(out)
     
    221221        $(vboxvideo_xorg_INCS) \
    222222        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.5 \
    223 vboxvideo_drv_16_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
     223        vboxvideo_drv_16_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
    224224vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES)
    225225vboxvideo_drv_16_LIBS += $(vboxvideo_drv_70_LIBS)
     
    411411 vboxvideo_drv_system_TEMPLATE = VBoxGuestR3XOrgMod
    412412 vboxvideo_drv_system_CFLAGS := \
    413         $(vboxvideo_drv_70_CFLAGS) -include xorg-server.h
     413        $(vboxvideo_drv_70_CFLAGS) -include xorg-server.h
    414414 vboxvideo_drv_system_DEFS := $(filter-out _XORG_SERVER_H_ _DIX_CONFIG_H_, $(vboxvideo_15_DEFS))
    415415 vboxvideo_drv_system_INCS += \
    416         $(PATH_ROOT)/src/VBox/Runtime/include \
    417         $(VBOX_GRAPHICS_INCS) \
    418         /usr/include/xorg \
    419         /usr/include/pixman-1
     416        $(PATH_ROOT)/src/VBox/Runtime/include \
     417        $(VBOX_GRAPHICS_INCS) \
     418        /usr/include/xorg \
     419        /usr/include/pixman-1
    420420 vboxvideo_drv_system_SOURCES := $(vboxvideo_drv_17_SOURCES)
    421421endif
     
    426426
    427427ifdef VBOX_WITH_TESTCASES
    428 # ifndef VBOX_ONLY_ADDITIONS
     428 # ifndef VBOX_ONLY_ADDITIONS
    429429 ifndef VBOX_USE_SYSTEM_XORG_HEADERS
    430   if1of ($(KBUILD_TARGET),linux solaris)
     430  if1of ($(KBUILD_TARGET), linux solaris)
    431431   ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
    432432    ifndef VBOX_ONLY_SDK
     
    436436      TESTING += $(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run
    437437      OTHERS += $(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run
    438 $$(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run: $$(vboxvideo_drv_1_STAGE_TARGET)
     438      $$(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run: $$(vboxvideo_drv_1_STAGE_TARGET)
    439439        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    440440        $(QUIET)$(ASH) $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST)  \
     
    443443     endif
    444444
    445 ##
    446 # Using the extra expansion to replace $(ver) before eval, thus everything
    447 # else needs escaped dollars.
     445     ##
     446     # Using the extra expansion to replace $(ver) before eval, thus everything
     447     # else needs escaped dollars.
    448448     define def_vboxvideo_test
    449449      TESTING += $$(vboxvideo_drv$(ver)_0_OUTDIR)/tstvboxvideo$(ver).run
     
    454454                $$(vboxvideo_drv$(ver)_1_STAGE_TARGET) $$(VBOXVIDEO_SRC_PATH)/../undefined_xfree86 $(VBOXVIDEO_SRC_PATH)/../undefined_xfree86_modules $$(VBOXVIDEO_SRC_PATH)/../undefined_xorg
    455455        $$(QUIET)$$(APPEND) -t "$$@" "done"
    456     endef
    457 
    458     $(foreach ver, _70 _71 _13 _14 _15 _16 _17 _18 _19 _110 _111 _112 _113 _114 _115 _116 _117 _118, $(eval $(def_vboxvideo_test)))
     456     endef
     457
     458     $(foreach ver, _70 _71 _13 _14 _15 _16 _17 _18 _19 _110 _111 _112 _113 _114 _115 _116 _117 _118, $(eval $(def_vboxvideo_test)))
    459459
    460460    endif # ! VBOX_ONLY_SDK
     
    462462  endif # 1of ($(KBUILD_TARGET),linux solaris)
    463463 endif # ! VBOX_USE_SYSTEM_XORG_HEADERS
    464 # endif # ! VBOX_ONLY_ADDITIONS
     464 # endif # ! VBOX_ONLY_ADDITIONS
    465465endif # VBOX_WITH_TESTCASES
    466466
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