VirtualBox

Ignore:
Timestamp:
Sep 10, 2012 7:30:58 PM (12 years ago)
Author:
vboxsync
Message:

Additions/x11: clean up header dependencies.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

    r43270 r43275  
    3232vboxvideo_15_DEFS := \
    3333        $(vboxvideo_13_DEFS) VBOX_DRI NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS
     34vboxvideo_13_INCS = \
     35        $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
     36        $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
     37        $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
     38        $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
     39        $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
     40        $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
     41        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
     42        $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
     43        $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
     44        $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
     45        $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
     46        $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
    3447
    3548#
    … …  
    153166vboxvideo_drv_13_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100300000
    154167vboxvideo_drv_13_INCS = \
    155         $(VBOX_PATH_X11_XORG_1_3) \
    156         $(VBOX_PATH_X11_XORG_1_3)/X11 \
    157         $(VBOX_PATH_X11_XORG_1_3)/xorg \
    158         $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
    159         $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
    160         $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
    161         $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0
     168        $(vboxvideo_13_INCS) \
     169        $(VBOX_PATH_X11_ROOT)/xorg-server-1.3.0.0
    162170vboxvideo_drv_13_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
    163171vboxvideo_drv_13_SOURCES = $(vboxvideo_drv_SOURCES) edid.c
    … …  
    172180vboxvideo_drv_14_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100400000
    173181vboxvideo_drv_14_INCS = \
    174         $(VBOX_PATH_X11_XORG_1_4) \
    175         $(VBOX_PATH_X11_XORG_1_4)/X11 \
    176         $(VBOX_PATH_X11_XORG_1_4)/xorg \
    177         $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
    178         $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
    179         $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
    180         $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0
     182        $(vboxvideo_13_INCS) \
     183        $(VBOX_PATH_X11_ROOT)/xorg-server-1.4.2
    181184vboxvideo_drv_14_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
    182185vboxvideo_drv_14_SOURCES  = $(vboxvideo_drv_13_SOURCES)
    … …  
    194197endif
    195198vboxvideo_drv_15_INCS = \
    196         $(VBOX_PATH_X11_XORG_1_5) \
    197         $(VBOX_PATH_X11_XORG_1_5)/X11 \
    198         $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
    199         $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
    200         $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
    201         $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
     199        $(vboxvideo_13_INCS) \
    202200        $(VBOX_PATH_X11_ROOT)/xorg-server-1.5.3
    203201vboxvideo_drv_15_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
    … …  
    217215vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100600000
    218216vboxvideo_drv_16_INCS = \
    219         $(VBOX_PATH_X11_XORG_1_6) \
    220         $(VBOX_PATH_X11_XORG_1_6)/X11 \
    221         $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
    222         $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
    223         $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
    224         $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
     217        $(vboxvideo_13_INCS) \
    225218        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0 \
    226         $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
    227219vboxvideo_drv_16_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
    228220vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES)
    … …  
    236228vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    237229vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100699000
    238 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
    239230vboxvideo_drv_17_INCS = \
    240         $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
    241         $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
    242         $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
    243         $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
    244         $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
    245         $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
    246         $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
    247         $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
    248         $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
    249         $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
    250         $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
    251         $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \
    252         $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
    253         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
     231        $(vboxvideo_13_INCS) \
     232        $(VBOX_PATH_X11_ROOT)/xorg-server-1.7.7
    254233vboxvideo_drv_17_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
    255234vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
    … …  
    263242vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    264243vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100800000
    265 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
    266244vboxvideo_drv_18_INCS = \
    267         $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
    268         $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
    269         $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
    270         $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
    271         $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
    272         $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
    273         $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
    274         $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
    275         $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
    276         $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
    277         $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
    278         $(VBOX_PATH_X11_ROOT)/xorg-server-1.8.0 \
    279         $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
    280         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
     245        $(vboxvideo_13_INCS) \
     246        $(VBOX_PATH_X11_ROOT)/xorg-server-1.8.0
    281247vboxvideo_drv_18_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
    282248vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES)
    … …  
    290256vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    291257vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100900000
    292 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
    293258vboxvideo_drv_19_INCS = \
    294         $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
    295         $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
    296         $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
    297         $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
    298         $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
    299         $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
    300         $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
    301         $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
    302         $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
    303         $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
    304         $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
    305         $(VBOX_PATH_X11_ROOT)/xorg-server-1.9.0 \
    306         $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
    307         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
     259        $(vboxvideo_13_INCS) \
     260        $(VBOX_PATH_X11_ROOT)/xorg-server-1.9.0
    308261vboxvideo_drv_19_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
    309262vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES)
    … …  
    317270vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    318271vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101000000
    319 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
    320272vboxvideo_drv_110_INCS = \
    321         $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
    322         $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
    323         $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
    324         $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
    325         $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
    326         $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
    327         $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
    328         $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
    329         $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
    330         $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
    331         $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
    332         $(VBOX_PATH_X11_ROOT)/xorg-server-1.10.0 \
    333         $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
    334         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
     273        $(vboxvideo_13_INCS) \
     274        $(VBOX_PATH_X11_ROOT)/xorg-server-1.10.0
    335275vboxvideo_drv_110_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
    336276vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES)
    … …  
    344284vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    345285vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
    346 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
    347286vboxvideo_drv_111_INCS = \
    348         $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
    349         $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
    350         $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
    351         $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
    352         $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
    353         $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
    354         $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
    355         $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
    356         $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
    357         $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
    358         $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
    359         $(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0 \
    360         $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
    361         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
     287        $(vboxvideo_13_INCS) \
     288        $(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0
    362289vboxvideo_drv_111_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
    363290vboxvideo_drv_111_SOURCES := $(vboxvideo_drv_15_SOURCES)
    … …  
    371298vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    372299vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
    373 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
    374300vboxvideo_drv_112_INCS = \
    375         $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
    376         $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
    377         $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
    378         $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
    379         $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
    380         $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
    381         $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
    382         $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
    383         $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
    384         $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
    385         $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
    386         $(VBOX_PATH_X11_ROOT)/xorg-server-1.12.0 \
    387         $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
    388         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
     301        $(vboxvideo_13_INCS) \
     302        $(VBOX_PATH_X11_ROOT)/xorg-server-1.12.0
    389303vboxvideo_drv_112_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
    390304vboxvideo_drv_112_SOURCES := $(vboxvideo_drv_15_SOURCES)
    … …  
    394308# vboxvideo_drv_113
    395309#
    396 #DLLS += vboxvideo_drv_113
     310DLLS += vboxvideo_drv_113
    397311vboxvideo_drv_113_TEMPLATE = VBOXGUESTR3XORGMOD
    398312vboxvideo_drv_113_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    399313vboxvideo_drv_113_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101300000
    400 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
    401314vboxvideo_drv_113_INCS = \
    402         $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
    403         $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
    404         $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
    405         $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
    406         $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
    407         $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
    408         $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
    409         $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
    410         $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
    411         $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
    412         $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
    413         $(VBOX_PATH_X11_ROOT)/xorg-server-1.13.0 \
    414         $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
    415         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
     315        $(vboxvideo_13_INCS) \
     316        $(VBOX_PATH_X11_ROOT)/xorg-server-1.13.0
    416317vboxvideo_drv_113_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
    417318vboxvideo_drv_113_SOURCES := $(vboxvideo_drv_15_SOURCES)
    … …  
    533434        $(QUIET)$(APPEND) -t "$@" "done"
    534435
    535 #     TESTING += $(vboxvideo_drv_113_0_OUTDIR)/tstvboxvideo113.run
    536 #     OTHERS += $(vboxvideo_drv_113_0_OUTDIR)/tstvboxvideo113.run
    537 #$$(vboxvideo_drv_113_0_OUTDIR)/tstvboxvideo113.run: $$(vboxvideo_drv_113_1_STAGE_TARGET)
    538 #       $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    539 #       $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST)  \
    540 #           $(vboxvideo_drv_113_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined
    541 #       $(QUIET)$(APPEND) -t "$@" "done"
     436     TESTING += $(vboxvideo_drv_113_0_OUTDIR)/tstvboxvideo113.run
     437     OTHERS += $(vboxvideo_drv_113_0_OUTDIR)/tstvboxvideo113.run
     438$$(vboxvideo_drv_113_0_OUTDIR)/tstvboxvideo113.run: $$(vboxvideo_drv_113_1_STAGE_TARGET)
     439        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
     440        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST)  \
     441            $(vboxvideo_drv_113_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined
     442        $(QUIET)$(APPEND) -t "$@" "done"
    542443
    543444    endif # ! VBOX_ONLY_SDK
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