VirtualBox

Changeset 12250 in vbox for trunk/src


Ignore:
Timestamp:
Sep 9, 2008 1:34:00 AM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
36248
Message:

HostServices/Makefiles: Eliminated PATH_TARGET usage and pushed them up to root level (sub-makefile wise). Fixed a little mixup in the shared folder testcases.

Location:
trunk/src/VBox/HostServices
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/HostServices/GuestProperties/Makefile.kmk

    r12170 r12250  
    2020#
    2121
    22 ifdef VBOX_SINGLE_MAKEFILE
    2322SUB_DEPTH = ../../../..
    24 else
    25 DEPTH    ?= ../../../..
    26 SUB_DEPTH = ..
    27 endif
    2823include $(KBUILD_PATH)/subheader.kmk
    2924
  • trunk/src/VBox/HostServices/Makefile.kmk

    r12170 r12250  
    2020#
    2121
    22 ifdef VBOX_SINGLE_MAKEFILE
    2322SUB_DEPTH = ../../..
    24 else
    25 DEPTH     = ../../..
    26 SUB_DEPTH = .
    27 endif
    2823include $(KBUILD_PATH)/subheader.kmk
    29 
    30 ifndef VBOX_ONLY_SDK
    3124
    3225# Include sub-makefiles.
     
    4841endif
    4942
    50 endif #!VBOX_ONLY_SDK
    51 
    5243include $(KBUILD_PATH)/subfooter.kmk
    5344
  • trunk/src/VBox/HostServices/SharedClipboard/Makefile.kmk

    r12170 r12250  
    2020#
    2121
    22 ifdef VBOX_SINGLE_MAKEFILE
    2322SUB_DEPTH = ../../../..
    24 else
    25 DEPTH    ?= ../../../..
    26 SUB_DEPTH = ..
    27 endif
    2823include $(KBUILD_PATH)/subheader.kmk
    2924
     
    4540        clipboard-helper.cpp \
    4641        darwin-pasteboard.cpp
    47 if1of ($(KBUILD_TARGET),linux solaris) ## @todo X11
     42if1of ($(KBUILD_TARGET), linux solaris) ## @todo X11
    4843 ifndef VBOX_HEADLESS
    4944  VBoxSharedClipboard_SOURCES += \
     
    6055        $(LIB_RUNTIME) \
    6156        $(LIB_REM)
    62 if1of ($(KBUILD_TARGET),linux solaris)
     57if1of ($(KBUILD_TARGET), linux solaris)
    6358 ifndef VBOX_HEADLESS
    6459  VBoxSharedClipboard_LIBPATH = \
  • trunk/src/VBox/HostServices/SharedFolders/Makefile.kmk

    r12170 r12250  
    2020#
    2121
    22 ifdef VBOX_SINGLE_MAKEFILE
    2322SUB_DEPTH = ../../../..
    24 else
    25 DEPTH    ?= ../../../..
    26 SUB_DEPTH = ..
    27 endif
    2823include $(KBUILD_PATH)/subheader.kmk
    2924
     
    4136        $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_INC) \
    4237        $(VBOX_PATH_SDK)
    43 
    4438
    4539VBoxSharedFolders_LDFLAGS.darwin = \
  • trunk/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk

    r12170 r12250  
    2020#
    2121
    22 ifdef VBOX_SINGLE_MAKEFILE
    2322SUB_DEPTH = ../../../..
    24 else
    25 DEPTH    ?= ../../../..
    26 SUB_DEPTH = ..
    27 endif
    2823include $(KBUILD_PATH)/subheader.kmk
    2924
     25#
     26# Structure size testcase.
     27#
    3028PROGRAMS += tstShflSizes
    31 TESTING  += $(PATH_TARGET)/tstShflSizes.run
     29TESTING  += $(PATH_tstShflSizes)/tstShflSizes.run
     30ifndef VBOX_ONLY_SDK
     31 ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
     32  if1of ($(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH), x86.x86 amd64.amd64 x86.amd64)
     33    OTHERS += $(PATH_tstShflSizes)/tstShflSizes.run
     34  endif
     35 endif
     36endif
    3237tstShflSizes_TEMPLATE = VBOXR3AUTOTST
    3338tstShflSizes_DEFS     = VBOX_WITH_HGCM
    3439tstShflSizes_SOURCES  = tstShflSizes.cpp
     40tstShflSizes_CLEAN    = $(PATH_tstShflCase)/tstShflSizes.run
     41
     42$$(PATH_tstShflSizes)/tstShflSizes.run: $$(INSTARGET_tstShflSizes)
     43        $(INSTARGET_tstShflSizes) quiet
     44        $(QUIET)$(APPEND) -t "$@" "done"
     45
    3546
    3647ifdef VBOX_WITH_TESTCASES
    3748#
    38 # Structure size testcase.
     49# Case conversion testcase.
    3950#
    4051PROGRAMS += tstShflCase
    41 
    4252tstShflCase_TEMPLATE = VBOXR3TSTEXE
    4353tstShflCase_DEFS     = VBOX_WITH_HGCM
    4454tstShflCase_SOURCES  = tstShflCase.cpp
    4555tstShflCase_LIBS     = $(LIB_RUNTIME)
    46 tstShflCase_CLEAN    = $(PATH_TARGET)/tstShflSizes.run
    4756
    4857endif # VBOX_WITH_TESTCASES
    4958
    50 ifndef VBOX_ONLY_SDK
    51  ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
    52   if1of ($(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH), x86.x86 amd64.amd64 x86.amd64)
    53     OTHERS += $(PATH_TARGET)/tstShflSizes.run
    54   endif
    55  endif
    56 endif
    5759
    5860include $(KBUILD_PATH)/subfooter.kmk
    5961
    60 $(PATH_TARGET)/tstShflSizes.run: $$(INSTARGET_tstShflSizes)
    61         $(QUIET)$(RM) -f $@
    62         $(INSTARGET_tstShflSizes) quiet
    63         $(QUIET)$(APPEND) "$@" "done"
    64 
  • trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk

    r12170 r12250  
    2020#
    2121
    22 ifdef VBOX_SINGLE_MAKEFILE
    2322SUB_DEPTH = ../../../..
    24 else
    25 DEPTH    ?= ../../../..
    26 SUB_DEPTH = ..
    27 endif
    2823include $(KBUILD_PATH)/subheader.kmk
    2924
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