VirtualBox

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

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

File:
1 edited

Legend:

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

    r98214 r98416  
    4848 vboxmouse_drv_DEFS.amd64 += _XSERVER64
    4949 vboxmouse_drv_DEFS += \
    50         _POSIX_C_SOURCE=199309L _POSIX_SOURCE _XOPEN_SOURCE _DEFAULT_SOURCE \
    51         _BSD_SOURCE _SVID_SOURCE _GNU_SOURCE SHAPE XINPUT XKB LBX XAPPGROUP \
    52         XCSECURITY TOGCUP XF86BIGFONT DPMSExtension PIXPRIV PANORAMIX RENDER \
    53         GCCUSESGAS AVOID_GLYPHBLT PIXPRIV SINGLEDEPTH XFreeXDGA XvExtension \
    54         XFree86LOADER XFree86Server XF86VIDMODE XvMCExtension SMART_SCHEDULE \
    55         BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \
    56         IN_MODULE XFree86Module PNP_MOUSE IN_XF86_MODULE
     50        _POSIX_C_SOURCE=199309L _POSIX_SOURCE _XOPEN_SOURCE _DEFAULT_SOURCE \
     51        _BSD_SOURCE _SVID_SOURCE _GNU_SOURCE SHAPE XINPUT XKB LBX XAPPGROUP \
     52        XCSECURITY TOGCUP XF86BIGFONT DPMSExtension PIXPRIV PANORAMIX RENDER \
     53        GCCUSESGAS AVOID_GLYPHBLT PIXPRIV SINGLEDEPTH XFreeXDGA XvExtension \
     54        XFree86LOADER XFree86Server XF86VIDMODE XvMCExtension SMART_SCHEDULE \
     55        BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \
     56        IN_MODULE XFree86Module PNP_MOUSE IN_XF86_MODULE
    5757 vboxmouse_drv_INCS := \
    58         $(VBOX_PATH_X11_ROOT)/XFree86-4.3 \
    59         $(VBOX_PATH_X11_ROOT)/XFree86-4.3/X11 \
    60         $(VBOX_PATH_X11_ROOT)/XFree86-4.3/X11/extensions \
    61         $(VBOX_PATH_X11_ROOT)/XFree86-4.3/Xserver \
    62         $(PATH_SUB_CURRENT)
     58        $(VBOX_PATH_X11_ROOT)/XFree86-4.3 \
     59        $(VBOX_PATH_X11_ROOT)/XFree86-4.3/X11 \
     60        $(VBOX_PATH_X11_ROOT)/XFree86-4.3/X11/extensions \
     61        $(VBOX_PATH_X11_ROOT)/XFree86-4.3/Xserver \
     62        $(PATH_SUB_CURRENT)
    6363 vboxmouse_drv_SOURCES = \
    64         vboxmouse.c
     64        vboxmouse.c
    6565 # Any global symbols in the driver object files will be added to XFree86's
    6666 # symbol table, which can cause problems if we e.g. define a symbol in two
    6767 # modules.
    6868 vboxmouse_drv_POST_CMDS = \
    69         objcopy --keep-global-symbol vboxmouseModuleData $(out) $(out)-objcopy$$(NLTAB) \
    70         $(MV) -f $(out)-objcopy $(out)
     69        objcopy --keep-global-symbol vboxmouseModuleData $(out) $(out)-objcopy$$(NLTAB) \
     70        $(MV) -f $(out)-objcopy $(out)
    7171endif
    7272
     
    157157
    158158
    159 ifneq ($(KBUILD_TARGET), linux)
    160 
    161 #
    162 # vboxmouse_drv_17
    163 #
    164 DLLS += vboxmouse_drv_17
    165 vboxmouse_drv_17_TEMPLATE = VBoxGuestR3XOrgMod
    166 vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
    167 vboxmouse_drv_17_INCS := \
    168         $(vboxmouse_xorg_INCS) \
    169         $(VBOX_PATH_X11_ROOT)/xorg-server-1.7.7 \
    170         $(PATH_SUB_CURRENT)
    171 vboxmouse_drv_17_SOURCES = \
    172         vboxmouse.c
    173 
    174 
    175 #
    176 # vboxmouse_drv_18
    177 #
    178 DLLS += vboxmouse_drv_18
    179 vboxmouse_drv_18_TEMPLATE = VBoxGuestR3XOrgMod
    180 vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
    181 vboxmouse_drv_18_INCS := \
    182         $(vboxmouse_xorg_INCS) \
    183         $(VBOX_PATH_X11_ROOT)/xorg-server-1.8.0 \
    184         $(PATH_SUB_CURRENT)
    185 vboxmouse_drv_18_SOURCES = \
    186         vboxmouse.c
    187 
    188 
    189 #
    190 # vboxmouse_drv_19
    191 #
    192 DLLS += vboxmouse_drv_19
    193 vboxmouse_drv_19_TEMPLATE = VBoxGuestR3XOrgMod
    194 vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
    195 vboxmouse_drv_19_INCS := \
    196         $(vboxmouse_xorg_INCS) \
    197         $(VBOX_PATH_X11_ROOT)/xorg-server-1.9.0 \
    198         $(PATH_SUB_CURRENT)
    199 vboxmouse_drv_19_SOURCES = \
    200         vboxmouse.c
    201 
    202 
    203 #
    204 # vboxmouse_drv_110
    205 #
    206 DLLS += vboxmouse_drv_110
    207 vboxmouse_drv_110_TEMPLATE = VBoxGuestR3XOrgMod
    208 vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
    209 vboxmouse_drv_110_INCS := \
    210         $(vboxmouse_xorg_INCS) \
    211         $(VBOX_PATH_X11_ROOT)/xorg-server-1.10.0 \
    212         $(PATH_SUB_CURRENT)
    213 vboxmouse_drv_110_SOURCES = \
    214         vboxmouse.c
    215 
    216 DLLS += vboxmouse_drv_111
    217 vboxmouse_drv_111_TEMPLATE = VBoxGuestR3XOrgMod
    218 vboxmouse_drv_111_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
    219 vboxmouse_drv_111_INCS := \
    220         $(vboxmouse_xorg_INCS) \
    221         $(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0 \
    222         $(PATH_SUB_CURRENT)
    223 vboxmouse_drv_111_SOURCES = \
    224         vboxmouse.c
    225 
    226 DLLS += vboxmouse_drv_112
    227 vboxmouse_drv_112_TEMPLATE = VBoxGuestR3XOrgMod
    228 vboxmouse_drv_112_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
    229 vboxmouse_drv_112_INCS := \
    230     $(vboxmouse_xorg_INCS) \
    231         $(VBOX_PATH_X11_ROOT)/xorg-server-1.12.0 \
    232         $(PATH_SUB_CURRENT)
    233 vboxmouse_drv_112_SOURCES = \
    234         vboxmouse.c
     159ifneq ($(KBUILD_TARGET),linux)
     160
     161 #
     162 # vboxmouse_drv_17
     163 #
     164 DLLS += vboxmouse_drv_17
     165 vboxmouse_drv_17_TEMPLATE = VBoxGuestR3XOrgMod
     166 vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
     167 vboxmouse_drv_17_INCS := \
     168        $(vboxmouse_xorg_INCS) \
     169        $(VBOX_PATH_X11_ROOT)/xorg-server-1.7.7 \
     170        $(PATH_SUB_CURRENT)
     171 vboxmouse_drv_17_SOURCES = \
     172        vboxmouse.c
     173
     174
     175 #
     176 # vboxmouse_drv_18
     177 #
     178 DLLS += vboxmouse_drv_18
     179 vboxmouse_drv_18_TEMPLATE = VBoxGuestR3XOrgMod
     180 vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
     181 vboxmouse_drv_18_INCS := \
     182        $(vboxmouse_xorg_INCS) \
     183        $(VBOX_PATH_X11_ROOT)/xorg-server-1.8.0 \
     184        $(PATH_SUB_CURRENT)
     185 vboxmouse_drv_18_SOURCES = \
     186        vboxmouse.c
     187
     188
     189 #
     190 # vboxmouse_drv_19
     191 #
     192 DLLS += vboxmouse_drv_19
     193 vboxmouse_drv_19_TEMPLATE = VBoxGuestR3XOrgMod
     194 vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
     195 vboxmouse_drv_19_INCS := \
     196        $(vboxmouse_xorg_INCS) \
     197        $(VBOX_PATH_X11_ROOT)/xorg-server-1.9.0 \
     198        $(PATH_SUB_CURRENT)
     199 vboxmouse_drv_19_SOURCES = \
     200        vboxmouse.c
     201
     202
     203 #
     204 # vboxmouse_drv_110
     205 #
     206 DLLS += vboxmouse_drv_110
     207 vboxmouse_drv_110_TEMPLATE = VBoxGuestR3XOrgMod
     208 vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
     209 vboxmouse_drv_110_INCS := \
     210        $(vboxmouse_xorg_INCS) \
     211        $(VBOX_PATH_X11_ROOT)/xorg-server-1.10.0 \
     212        $(PATH_SUB_CURRENT)
     213 vboxmouse_drv_110_SOURCES = \
     214        vboxmouse.c
     215
     216 DLLS += vboxmouse_drv_111
     217 vboxmouse_drv_111_TEMPLATE = VBoxGuestR3XOrgMod
     218 vboxmouse_drv_111_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
     219 vboxmouse_drv_111_INCS := \
     220        $(vboxmouse_xorg_INCS) \
     221        $(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0 \
     222        $(PATH_SUB_CURRENT)
     223 vboxmouse_drv_111_SOURCES = \
     224        vboxmouse.c
     225
     226 DLLS += vboxmouse_drv_112
     227 vboxmouse_drv_112_TEMPLATE = VBoxGuestR3XOrgMod
     228 vboxmouse_drv_112_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
     229 vboxmouse_drv_112_INCS := \
     230        $(vboxmouse_xorg_INCS) \
     231        $(VBOX_PATH_X11_ROOT)/xorg-server-1.12.0 \
     232        $(PATH_SUB_CURRENT)
     233 vboxmouse_drv_112_SOURCES = \
     234        vboxmouse.c
    235235
    236236endif # neq ($(KBUILD_TARGET),linux)
     
    249249
    250250ifdef VBOX_WITH_TESTCASES
    251 # ifndef VBOX_ONLY_ADDITIONS
     251 # ifndef VBOX_ONLY_ADDITIONS
    252252 ifndef VBOX_USE_SYSTEM_XORG_HEADERS
    253253  ifeq ($(KBUILD_TARGET),linux)
     
    259259      TESTING += $(vboxmouse_drv_0_OUTDIR)/tstvboxmouse68.run
    260260      OTHERS += $(vboxmouse_drv_0_OUTDIR)/tstvboxmouse68.run
    261 $$(vboxmouse_drv_0_OUTDIR)/tstvboxmouse68.run: $$(vboxmouse_drv_1_STAGE_TARGET)
     261      $$(vboxmouse_drv_0_OUTDIR)/tstvboxmouse68.run: $$(vboxmouse_drv_1_STAGE_TARGET)
    262262        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    263263        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \
     
    266266     endif
    267267
    268 ##
    269 # Using the extra expansion to replace $(ver) before eval, thus everything
    270 # else needs escaped dollars.
     268     ##
     269     # Using the extra expansion to replace $(ver) before eval, thus everything
     270     # else needs escaped dollars.
    271271     define def_vboxmouse_test
    272272      TESTING += $$(vboxmouse_drv$(ver)_0_OUTDIR)/tstvboxmouse$(ver).run
     
    277277                $$(vboxmouse_drv$(ver)_1_STAGE_TARGET) $$(VBOXMOUSE_SRC_PATH)/../undefined_xfree86 $(VBOXMOUSE_SRC_PATH)/../undefined_xfree86_modules $$(VBOXMOUSE_SRC_PATH)/../undefined_xorg
    278278        $$(QUIET)$$(APPEND) -t "$$@" "done"
    279     endef
     279     endef
    280280
    281281     $(foreach ver, _70 _71 _13 _14 _15 _16, $(eval $(def_vboxmouse_test)))
    282282
    283      ifneq ($(KBUILD_TARGET), linux)
     283     ifneq ($(KBUILD_TARGET),linux)
    284284      $(foreach ver, _17 _18 _19 _110 _111 _112 _113, $(eval $(def_vboxmouse_test)))
    285285
     
    290290  endif # eq ($(KBUILD_TARGET),linux)
    291291 endif # ! VBOX_USE_SYSTEM_XORG_HEADERS
    292 # endif # ! VBOX_ONLY_ADDITIONS
     292 # endif # ! VBOX_ONLY_ADDITIONS
    293293endif # VBOX_WITH_TESTCASES
    294294
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