VirtualBox

Changeset 38082 in vbox for trunk/src/VBox/Runtime


Ignore:
Timestamp:
Jul 20, 2011 2:26:24 PM (14 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
73029
Message:

*.kmk: Installation/staging adjustments (kBuild 0.2.0 preps).

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

Legend:

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

    r38037 r38082  
    12621262VBoxRT_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = $(RuntimeR3_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
    12631263VBoxRT_LIBS                    = \
    1264         $(PATH_LIB)/VBox-liblzf$(VBOX_SUFF_LIB) \
     1264        $(PATH_STAGE_LIB)/VBox-liblzf$(VBOX_SUFF_LIB) \
    12651265        $(SDK_VBOX_ZLIB_LIBS)
    12661266if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
    12671267VBoxRT_LIBS                   += \
    1268         $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB)
     1268        $(PATH_STAGE_LIB)/SUPR3$(VBOX_SUFF_LIB)
    12691269endif
    12701270ifdef IPRT_WITH_KSTUFF
    12711271 VBoxRT_LIBS                  += \
    1272         $(PATH_LIB)/VBox-kStuff$(VBOX_SUFF_LIB)
     1272        $(PATH_STAGE_LIB)/VBox-kStuff$(VBOX_SUFF_LIB)
    12731273endif
    12741274ifndef SDK_VBOX_LIBXML2_LIBS
    12751275 VBoxRT_LIBS                 += \
    1276         $(PATH_LIB)/VBox-libxml2$(VBOX_SUFF_LIB)
     1276        $(PATH_STAGE_LIB)/VBox-libxml2$(VBOX_SUFF_LIB)
    12771277endif
    12781278ifndef SDK_VBOX_OPENSSL_LIBS
    12791279 VBoxRT_LIBS                 += \
    1280         $(PATH_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) \
    1281         $(PATH_LIB)/VBox-libssl$(VBOX_SUFF_LIB)
     1280        $(PATH_STAGE_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) \
     1281        $(PATH_STAGE_LIB)/VBox-libssl$(VBOX_SUFF_LIB)
    12821282endif
    12831283ifdef IPRT_WITH_LZO
     
    13071307VBoxRT_LDFLAGS.l4              = \
    13081308        -Wl,-whole-archive \
    1309         $(PATH_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB) \
     1309        $(PATH_STAGE_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB) \
    13101310        -Wl,-no-whole-archive
    13111311ifeq ($(KBUILD_TARGET),l4)
     
    13151315endif
    13161316VBoxRT_LIBS.l4                 = \
    1317         $(PATH_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB)
     1317        $(PATH_STAGE_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB)
    13181318
    13191319if1of ($(DLLS), VBoxRT)
     
    13391339VBoxRTDummy_TEMPLATE = VBOXR3
    13401340VBoxRTDummy_NOINST = true
    1341 VBoxRTDummy_LIBS = $(PATH_BIN)/VBoxRT.so
    1342 VBoxRTDummy_CLEAN= $(PATH_BIN)/VBoxRT.so
    1343 BLDDIRS += $(PATH_BIN)
    1344 
    1345 $(PATH_BIN)/VBoxRT.so: $$(VBoxRT_1_TARGET) | $$(dir $$@)
     1341VBoxRTDummy_LIBS = $(PATH_STAGE_BIN)/VBoxRT.so
     1342VBoxRTDummy_CLEAN= $(PATH_STAGE_BIN)/VBoxRT.so
     1343BLDDIRS += $(PATH_STAGE_BIN)
     1344
     1345$(PATH_STAGE_BIN)/VBoxRT.so: $$(VBoxRT_1_TARGET) | $$(dir $$@)
    13461346        $(INSTALL) $< $@
    13471347        chcon -t texrel_shlib_t $@ || true
  • trunk/src/VBox/Runtime/testcase/Makefile.kmk

    r37720 r38082  
    279279tstLdr-2_DEFS = IN_DIS
    280280tstLdr-2_LIBS = \
    281         $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB)
     281        $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB)
    282282
    283283ifdef VBOX_WITH_RAW_MODE
     
    291291 endif
    292292 tstLdrObj_LIBS = \
    293         $(PATH_LIB)/DisasmRC$(VBOX_SUFF_LIB) \
    294         $(PATH_LIB)/RuntimeRC$(VBOX_SUFF_LIB)
     293        $(PATH_STAGE_LIB)/DisasmRC$(VBOX_SUFF_LIB) \
     294        $(PATH_STAGE_LIB)/RuntimeRC$(VBOX_SUFF_LIB)
    295295 ifeq ($(VBOX_LDR_FMT32),pe)
    296296 tstLdrObj_LIBS += \
    297         $(PATH_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB)
     297        $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB)
    298298 endif # PE
    299299 ifeq ($(VBOX_LDR_FMT32),elf)
     
    302302 ifeq ($(VBOX_LDR_FMT32),lx)
    303303 tstLdrObj_LIBS += \
    304         $(PATH_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB)
     304        $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB)
    305305 endif
    306306endif # VBOX_WITH_RAW_MODE
     
    309309tstLdr-3_DEFS = IN_DIS
    310310tstLdr-3_LIBS = \
    311         $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB)
     311        $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB)
    312312
    313313tstLdr-4Imp_TEMPLATE = VBoxR0
     
    330330endif
    331331tstLdrObjR0_LIBS = \
    332         $(PATH_LIB)/DisasmR0$(VBOX_SUFF_LIB) \
    333         $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
     332        $(PATH_STAGE_LIB)/DisasmR0$(VBOX_SUFF_LIB) \
     333        $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
    334334ifeq ($(VBOX_LDR_FMT),pe)
    335335 tstLdrObjR0_LIBS += \
    336         $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB) \
     336        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) \
    337337        $(TARGET_tstLdr-4Imp)
    338338endif
     
    342342ifeq ($(VBOX_LDR_FMT),lx)
    343343 tstLdrObjR0_LIBS += \
    344         $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB) \
     344        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) \
    345345        $(TARGET_tstLdr-4Imp)
    346346endif
     
    349349tstLdr-4_DEFS = IN_DIS
    350350tstLdr-4_LIBS = \
    351         $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB)
     351        $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB)
    352352
    353353tstLdrLoad_SOURCES = tstLdrLoad.cpp
     
    528528tstRTR0MemUserKernel_SYSSUFF = .r0
    529529tstRTR0MemUserKernel_SOURCES = tstRTR0MemUserKernel.cpp
    530 tstRTR0MemUserKernel_LIBS = $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
     530tstRTR0MemUserKernel_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
    531531if1of ($(VBOX_LDR_FMT), pe lx)
    532  tstRTR0MemUserKernel_LIBS += $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB)
     532 tstRTR0MemUserKernel_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
    533533endif
    534534tstRTR0MemUserKernelDriver_TEMPLATE = VBOXR3TSTEXE
     
    541541tstRTR0SemMutex_SYSSUFF = .r0
    542542tstRTR0SemMutex_SOURCES = tstRTR0SemMutex.cpp
    543 tstRTR0SemMutex_LIBS = $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
     543tstRTR0SemMutex_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
    544544if1of ($(VBOX_LDR_FMT), pe lx)
    545  tstRTR0SemMutex_LIBS += $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB)
     545 tstRTR0SemMutex_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
    546546endif
    547547tstRTR0SemMutexDriver_TEMPLATE = VBOXR3TSTEXE
     
    554554tstRTR0Timer_SYSSUFF = .r0
    555555tstRTR0Timer_SOURCES = tstRTR0Timer.cpp
    556 tstRTR0Timer_LIBS = $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
     556tstRTR0Timer_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
    557557if1of ($(VBOX_LDR_FMT), pe lx)
    558  tstRTR0Timer_LIBS += $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB)
     558 tstRTR0Timer_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
    559559endif
    560560tstRTR0TimerDriver_TEMPLATE = VBOXR3TSTEXE
     
    567567tstR0ThreadPreemption_SYSSUFF = .r0
    568568tstR0ThreadPreemption_SOURCES = tstR0ThreadPreemption.cpp
    569 tstR0ThreadPreemption_LIBS = $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
     569tstR0ThreadPreemption_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
    570570if1of ($(VBOX_LDR_FMT), pe lx)
    571  tstR0ThreadPreemption_LIBS += $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB)
     571 tstR0ThreadPreemption_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
    572572endif
    573573tstR0ThreadPreemptionDriver_TEMPLATE = VBOXR3TSTEXE
Note: See TracChangeset for help on using the changeset viewer.

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