Changeset 12446 in vbox
- Timestamp:
- Sep 14, 2008 11:32:31 PM (16 years ago)
- Location:
- trunk/src/VBox/Additions
- Files:
-
- 36 edited
-
Makefile.kmk (modified) (3 diffs)
-
WINNT/Graphics/Display/Makefile.kmk (modified) (1 diff)
-
WINNT/Graphics/Display/Mirror/Makefile.kmk (modified) (2 diffs)
-
WINNT/Graphics/Makefile.kmk (modified) (1 diff)
-
WINNT/Graphics/Miniport/Makefile.kmk (modified) (1 diff)
-
WINNT/Graphics/Miniport/Mirror/Makefile.kmk (modified) (2 diffs)
-
WINNT/Graphics/OpenGL/Makefile.kmk (modified) (1 diff)
-
WINNT/Graphics/OpenGL/test/Makefile.kmk (modified) (1 diff)
-
WINNT/Makefile.kmk (modified) (1 diff)
-
WINNT/MouseFilter/Makefile.kmk (modified) (1 diff)
-
WINNT/VBoxGINA/Makefile.kmk (modified) (1 diff)
-
WINNT/VBoxGuest/Makefile.kmk (modified) (2 diffs)
-
WINNT/VBoxHook/Makefile.kmk (modified) (1 diff)
-
WINNT/VBoxHook/testcase/Makefile.kmk (modified) (1 diff)
-
WINNT/VBoxService/Makefile.kmk (modified) (2 diffs)
-
WINNT/VBoxTray/Makefile.kmk (modified) (2 diffs)
-
WINNT/VBoxTray/testcase/Makefile.kmk (modified) (1 diff)
-
WINNT/i8042prt/Makefile.kmk (modified) (3 diffs)
-
common/Makefile.kmk (modified) (2 diffs)
-
common/VBoxControl/Makefile.kmk (modified) (1 diff)
-
common/VBoxGuest/Makefile.kmk (modified) (6 diffs)
-
common/VBoxGuestLib/Makefile.kmk (modified) (2 diffs)
-
common/VBoxService/Makefile.kmk (modified) (2 diffs)
-
freebsd/Makefile.kmk (modified) (3 diffs)
-
freebsd/vboxvfs/Makefile.kmk (modified) (3 diffs)
-
linux/Makefile.kmk (modified) (4 diffs)
-
linux/daemon/Makefile.kmk (modified) (1 diff)
-
linux/module/Makefile.kmk (modified) (1 diff)
-
linux/sharedfolders/Makefile.kmk (modified) (1 diff)
-
os2/VBoxSF/Makefile.kmk (modified) (3 diffs)
-
solaris/Makefile.kmk (modified) (1 diff)
-
solaris/SharedFolders/Makefile.kmk (modified) (2 diffs)
-
x11/Makefile.kmk (modified) (1 diff)
-
x11/xclient/Makefile.kmk (modified) (2 diffs)
-
x11/xgraphics/Makefile.kmk (modified) (1 diff)
-
x11/xmouse/Makefile.kmk (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/Makefile.kmk
r12337 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../.. 24 else25 SUB_DEPTH = .26 DEPTH = ../../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 … … 111 106 32Bit/OS2/VBoxService.exe=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxService.exe \ 112 107 32Bit/OS2/gengradd.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/gengradd.dll \ 113 32Bit/OS2/libc063.dll= ./os2/Bin/libc063.dll \114 32Bit/OS2/readme.txt= ./os2/Bin/readme.txt \108 32Bit/OS2/libc063.dll=$(VBOX_PATH_ADDITIONS_SRC)/os2/Bin/libc063.dll \ 109 32Bit/OS2/readme.txt=$(VBOX_PATH_ADDITIONS_SRC)/os2/Bin/readme.txt \ 115 110 32Bit/OS2/vboxmouse.sys=$(VBOX_PATH_ADDITIONS.os2.x86)/vboxmouse.sys 116 111 else ifdef VBOX_WITH_OS2_ADDITIONS_BIN 117 112 GUESTADDITIONS_FILESPEC.os2.x86 = \ 118 32Bit/OS2/VBoxGuest.sys= ./os2/Bin/VBoxGuest.sys \119 32Bit/OS2/VBoxService.exe= ./os2/Bin/VBoxService.exe \120 32Bit/OS2/gengradd.dll= ./os2/Bin/gengradd.dll \121 32Bit/OS2/libc063.dll= ./os2/Bin/libc063.dll \122 32Bit/OS2/readme.txt= ./os2/Bin/readme.txt \123 32Bit/OS2/vboxmouse.sys= ./os2/Bin/vboxmouse.sys113 32Bit/OS2/VBoxGuest.sys=$(VBOX_PATH_ADDITIONS_SRC)/os2/Bin/VBoxGuest.sys \ 114 32Bit/OS2/VBoxService.exe=$(VBOX_PATH_ADDITIONS_SRC)/os2/Bin/VBoxService.exe \ 115 32Bit/OS2/gengradd.dll=$(VBOX_PATH_ADDITIONS_SRC)/os2/Bin/gengradd.dll \ 116 32Bit/OS2/libc063.dll=$(VBOX_PATH_ADDITIONS_SRC)/os2/Bin/libc063.dll \ 117 32Bit/OS2/readme.txt=$(VBOX_PATH_ADDITIONS_SRC)/os2/Bin/readme.txt \ 118 32Bit/OS2/vboxmouse.sys=$(VBOX_PATH_ADDITIONS_SRC)/os2/Bin/vboxmouse.sys 124 119 endif 125 120 … … 263 258 endif 264 259 265 -
trunk/src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../../.. 24 else25 SUB_DEPTH = ../../..26 DEPTH ?= ../../../../../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 -
trunk/src/VBox/Additions/WINNT/Graphics/Display/Mirror/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../../../.. 24 else25 SUB_DEPTH = ../../../..26 DEPTH ?= ../../../../../../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 … … 46 41 $(PATH_LIB)/additions/RuntimeW32GuestR0$(VBOXW32GUEST_SUFF_LIB) 47 42 48 49 43 include $(KBUILD_PATH)/subfooter.kmk 50 44 -
trunk/src/VBox/Additions/WINNT/Graphics/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../.. 24 else25 DEPTH ?= ../../../../..26 SUB_DEPTH = ../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 -
trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../../.. 24 else25 SUB_DEPTH = ../../..26 DEPTH ?= ../../../../../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 -
trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Mirror/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../../../.. 24 else25 SUB_DEPTH = ../../../..26 DEPTH ?= ../../../../../../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 … … 43 38 $(VBOX_LIB_IPRT_GUEST_R0) 44 39 45 $(error Fix inf editing and d irver signing)40 $(error Fix inf editing and driver signing) 46 41 47 42 include $(KBUILD_PATH)/subfooter.kmk -
trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../../.. 24 else25 SUB_DEPTH = ../../..26 DEPTH ?= ../../../../../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 -
trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/test/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../../../.. 24 else25 SUB_DEPTH = ../../../..26 DEPTH ?= ../../../../../../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 -
trunk/src/VBox/Additions/WINNT/Makefile.kmk
r12170 r12446 19 19 # 20 20 21 ifdef VBOX_SINGLE_MAKEFILE22 21 SUB_DEPTH = ../../../.. 23 else24 SUB_DEPTH = ..25 DEPTH ?= ../../../..26 endif27 22 include $(KBUILD_PATH)/subheader.kmk 28 23 -
trunk/src/VBox/Additions/WINNT/MouseFilter/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../.. 24 else25 DEPTH ?= ../../../../..26 SUB_DEPTH = ../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 -
trunk/src/VBox/Additions/WINNT/VBoxGINA/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../.. 24 else25 DEPTH ?= ../../../../..26 SUB_DEPTH = ../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 -
trunk/src/VBox/Additions/WINNT/VBoxGuest/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../.. 24 else25 DEPTH ?= ../../../../..26 SUB_DEPTH = ../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 … … 57 52 # 58 53 SYSMODS.x86 += VBoxGuestNT 54 $(warning Try out VBoxGuestNT_EXTENDS again!) 55 ## @todo check this out!!! 59 56 ifeq (kBuild,0.1.4) # This doesn't work because of the VBoxGuest_NOINST stuff above. ## @todo kBuild: change the NOINST test from ifdef to ifneq ($(strip $($(target)_NOINST)),) 60 57 VBoxGuestNT_EXTENDS = VBoxGuest -
trunk/src/VBox/Additions/WINNT/VBoxHook/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../.. 24 else25 DEPTH ?= ../../../../..26 SUB_DEPTH = ../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 -
trunk/src/VBox/Additions/WINNT/VBoxHook/testcase/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../../.. 24 else25 SUB_DEPTH = ../../..26 DEPTH ?= ../../../../../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 -
trunk/src/VBox/Additions/WINNT/VBoxService/Makefile.kmk
r12170 r12446 11 11 # 12 12 13 ifdef VBOX_SINGLE_MAKEFILE14 13 SUB_DEPTH = ../../../../.. 15 else16 DEPTH ?= ../../../../..17 SUB_DEPTH = ../..18 endif19 14 include $(KBUILD_PATH)/subheader.kmk 20 15 … … 55 50 VBoxService.cpp_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV) 56 51 VBoxService.cpp_DEPS = $(VBOX_SVN_REV_KMK) 52 53 # The icon is configurable. 57 54 VBoxService.rc_INCS = $(PATH_VBoxService) 58 55 VBoxService.rc_DEPS = $(PATH_VBoxService)/VBoxService-icon.rc 59 56 VBoxService.rc_CLEAN = $(PATH_VBoxService)/VBoxService-icon.rc 60 57 58 # Icon include file. 59 $$(PATH_VBoxService)/VBoxService-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $$(VBoxService_PATH)/Makefile.kmk | $$(dir $$@) 60 $(RM) -f $@ 61 $(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"' 62 61 63 include $(KBUILD_PATH)/subfooter.kmk 62 64 63 # Icon include file.64 $(PATH_VBoxService)/VBoxService-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $(VBoxService_PATH)/Makefile.kmk | $$(call DIRDEP,$$(@D))65 $(RM) -f $@66 $(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"' -
trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../.. 24 else25 DEPTH ?= ../../../../..26 SUB_DEPTH = ../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 … … 59 54 VBoxTray.rc_CLEAN = $(PATH_VBoxTray)/VBoxTray-icon.rc 60 55 61 include $(KBUILD_PATH)/subfooter.kmk62 63 56 # Icon include file. 64 $ (PATH_VBoxTray)/VBoxTray-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $(VBoxTray_PATH)/Makefile.kmk | $$(call DIRDEP,$$(@D))57 $$(PATH_VBoxTray)/VBoxTray-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $$(VBoxTray_PATH)/Makefile.kmk | $$(dir $$@) 65 58 $(RM) -f $@ 66 59 $(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"' 67 60 61 include $(KBUILD_PATH)/subfooter.kmk 62 -
trunk/src/VBox/Additions/WINNT/VBoxTray/testcase/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../../.. 24 else25 SUB_DEPTH = ../../..26 DEPTH ?= ../../../../../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 -
trunk/src/VBox/Additions/WINNT/i8042prt/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../.. 24 else25 DEPTH ?= ../../../../..26 SUB_DEPTH = ../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 … … 60 55 $(PATH_VBoxMouseNT)/MSG00001.bin 61 56 62 63 include $(KBUILD_PATH)/subfooter.kmk 64 65 $(PATH_VBoxMouseNT)/i8042log.rc: $(VBoxMouseNT_PATH)/i8042log.mc | $(call DIRDEP,$(PATH_VBoxMouseNT)) 57 $$(PATH_VBoxMouseNT)/i8042log.rc: $(PATH_SUB_CURRENT)/i8042log.mc | $$(dir $$@) 66 58 $(call MSG_COMPILE,VBoxMouseNT,$<,$@,RC) 67 59 $(QUIET)$(WIN32_MC) \ … … 71 63 $(subst /,\\,$<) 72 64 65 66 include $(KBUILD_PATH)/subfooter.kmk 67 -
trunk/src/VBox/Additions/common/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../.. 24 else25 DEPTH ?= ../../../..26 SUB_DEPTH = ..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 … … 32 27 include $(PATH_SUB_CURRENT)/VBoxControl/Makefile.kmk 33 28 if1of ($(KBUILD_TARGET), freebsd os2 solaris) 34 include $(PATH_SUB_CURRENT)/VBoxGuest/Makefile.kmk35 include $(PATH_SUB_CURRENT)/VBoxService/Makefile.kmk29 include $(PATH_SUB_CURRENT)/VBoxGuest/Makefile.kmk 30 include $(PATH_SUB_CURRENT)/VBoxService/Makefile.kmk 36 31 endif 37 32 -
trunk/src/VBox/Additions/common/VBoxControl/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../.. 24 else25 SUB_DEPTH = ../..26 DEPTH ?= ../../../../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 -
trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk
r11895 r12446 20 20 # 21 21 22 DEPTH ?= ../../../../.. 23 SUB_DEPTH = ../.. 22 SUB_DEPTH = ../../../../.. 24 23 include $(KBUILD_PATH)/subheader.kmk 25 24 … … 36 35 VBoxGuest_TEMPLATE = VBOXGUESTR0 37 36 VBoxGuest_DEFS = VBGL_VBOXGUEST VBOX_WITH_HGCM 38 VBoxGuest_INCS := $(PATH_SUB_CURRENT)37 VBoxGuest_INCS = . 39 38 ifneq ($(KBUILD_TARGET),os2) 40 39 VBoxGuest_SOURCES = \ … … 63 62 VBoxGuestLibOs2Hack_NOINST = 1 64 63 VBoxGuestLibOs2Hack_DEFS = $(VBoxGuest_DEFS) 65 VBoxGuestLibOs2Hack_INCS := \ 66 $(PATH_SUB_CURRENT) \ 67 $(PATH_TARGET) \ 64 VBoxGuestLibOs2Hack_INCS = \ 65 . \ 68 66 $(PATH_ROOT)/src/VBox/Runtime/include # for the os2ddk 69 67 VBoxGuestLibOs2Hack_SOURCES = \ … … 80 78 vboxguest_TEMPLATE = VBOXGUESTR0 81 79 vboxguest_DEFS = VBGL_VBOXGUEST VBOX_WITH_HGCM 82 vboxguest_INCS := \83 $(PATH_SUB_CURRENT)80 vboxguest_INCS = \ 81 . 84 82 vboxguest_INCS.freebsd = \ 85 $(PATH_ TARGET)83 $(PATH_vboxguest) 86 84 vboxguest_SOURCES = \ 87 85 VBoxGuest-$(KBUILD_TARGET).c \ … … 91 89 $(VBOX_LIB_IPRT_GUEST_R0) 92 90 vboxguest_DEPS.freebsd = \ 93 $(PATH_ TARGET)/pci_if.h \94 $(PATH_ TARGET)/bus_if.h \95 $(PATH_ TARGET)/device_if.h91 $(PATH_vboxguest)/pci_if.h \ 92 $(PATH_vboxguest)/bus_if.h \ 93 $(PATH_vboxguest)/device_if.h 96 94 vboxguest_CLEAN.freebsd = $(vboxguest_DEPS.freebsd) 97 95 … … 104 102 # 105 103 VBOX_AWK := /usr/bin/awk 106 $ (PATH_TARGET)/bus_if.h: $(VBOX_FREEBSD_SRC)/kern/bus_if.m104 $$(PATH_vboxguest)/bus_if.h: $(VBOX_FREEBSD_SRC)/kern/bus_if.m 107 105 $(call MSG_TOOL,awk,VBoxGuest,$<,$@) 108 $(QUIET)$(CP) -f $(VBOX_FREEBSD_SRC)/kern/bus_if.m $(PATH_ TARGET)/bus_if.m109 $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(PATH_ TARGET)/bus_if.m -h -p110 $(QUIET)$(RM) $(PATH_ TARGET)/bus_if.m106 $(QUIET)$(CP) -f $(VBOX_FREEBSD_SRC)/kern/bus_if.m $(PATH_vboxguest)/bus_if.m 107 $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(PATH_vboxguest)/bus_if.m -h -p 108 $(QUIET)$(RM) $(PATH_vboxguest)/bus_if.m 111 109 112 $ (PATH_TARGET)/device_if.h: $(VBOX_FREEBSD_SRC)/kern/device_if.m110 $$(PATH_vboxguest)/device_if.h: $(VBOX_FREEBSD_SRC)/kern/device_if.m 113 111 $(call MSG_TOOL,awk,VBoxGuest,$<,$@) 114 $(QUIET)$(CP) -f $(VBOX_FREEBSD_SRC)/kern/device_if.m $(PATH_ TARGET)/device_if.m115 $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(PATH_ TARGET)/device_if.m -h -p116 $(QUIET)$(RM) $(PATH_ TARGET)/device_if.m112 $(QUIET)$(CP) -f $(VBOX_FREEBSD_SRC)/kern/device_if.m $(PATH_vboxguest)/device_if.m 113 $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(PATH_vboxguest)/device_if.m -h -p 114 $(QUIET)$(RM) $(PATH_vboxguest)/device_if.m 117 115 118 $ (PATH_TARGET)/pci_if.h: $(VBOX_FREEBSD_SRC)/dev/pci/pci_if.m116 $$(PATH_vboxguest)/pci_if.h: $(VBOX_FREEBSD_SRC)/dev/pci/pci_if.m 119 117 $(call MSG_TOOL,awk,VBoxGuest,$<,$@) 120 $(QUIET)$(CP) -f $(VBOX_FREEBSD_SRC)/dev/pci/pci_if.m $(PATH_ TARGET)/pci_if.m121 $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(PATH_ TARGET)/pci_if.m -h -p122 $(QUIET)$(RM) $(PATH_ TARGET)/pci_if.m118 $(QUIET)$(CP) -f $(VBOX_FREEBSD_SRC)/dev/pci/pci_if.m $(PATH_vboxguest)/pci_if.m 119 $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(PATH_vboxguest)/pci_if.m -h -p 120 $(QUIET)$(RM) $(PATH_vboxguest)/pci_if.m 123 121 124 122 endif -
trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../.. 24 else25 DEPTH ?= ../../../../..26 SUB_DEPTH = ../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 … … 103 98 VBoxGuestR3LibGR.cpp \ 104 99 $(if $(VBOX_WITH_GUEST_PROPS),VBoxGuestR3LibGuestProp.cpp,) \ 105 VBoxGuestR3LibMisc.cpp 100 VBoxGuestR3LibMisc.cpp 106 101 endif 107 102 -
trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../.. 24 else25 DEPTH ?= ../../../../..26 SUB_DEPTH = ../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 30 ifeq ($(KBUILD_HOST),os2) 31 ifdef VBOX_WITH_OS2_ADDITIONS 32 PROGRAMS += VBoxService 33 endif 34 else 25 if "$(KBUILD_HOST)" != "os2" || defined(VBOX_WITH_OS2_ADDITIONS) 35 26 PROGRAMS += VBoxService 36 27 endif … … 56 47 VBoxService_LIBPATH.freebsd = \ 57 48 /usr/local/lib 49 58 50 include $(KBUILD_PATH)/subfooter.kmk 59 51 -
trunk/src/VBox/Additions/freebsd/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../.. 24 else25 SUB_DEPTH = ..26 DEPTH ?= ../../../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 … … 32 27 endif 33 28 29 # Include sub-makefiles. 34 30 include $(PATH_SUB_CURRENT)/vboxvfs/Makefile.kmk 35 31 36 PKGFILENAME := VBoxFreeBSDAdditions.tbz 37 PKGINFO_ARCH = $(shell uname -p) 32 # Globals 33 VBOX_FBSD_ADD_INS_OUT_DIR := $(PATH_TARGET)/Additions/FreeBSD/Installer 34 BLDDIRS += $(VBOX_FBSD_ADD_INS_OUT_DIR) 35 36 VBOX_FBSD_ADD_PKG_FILENAME := VBoxFreeBSDAdditions.tbz 37 VBOX_FBSD_ADD_PKGINFO_ARCH = $(shell uname -p) 38 38 VBOX_PATH_FREEBSD_ADDITION_INSTALLER := $(PATH_SUB_CURRENT)/Installer 39 39 VBOX_PATH_X11_ADDITION_INSTALLER := $(PATH_ROOT)/src/VBox/Additions/x11/installer 40 FREEBSDINSTDIR := $(PATH_TARGET)/install41 40 42 41 ifeq ($(KBUILD_TYPE),debug) 43 BIN_COPY := $(CP) -f44 BIN_COPY_SYMBOLS := $(CP) -f42 VBOX_FBSD_ADD_BIN_COPY := $(CP) -f 43 VBOX_FBSD_ADD_BIN_COPY_SYMBOLS := $(CP) -f 45 44 else 46 BIN_COPY := objcopy -S -R .comment47 BIN_COPY_SYMBOLS := objcopy -g -R .comment45 VBOX_FBSD_ADD_BIN_COPY := objcopy -S -R .comment 46 VBOX_FBSD_ADD_BIN_COPY_SYMBOLS := objcopy -g -R .comment 48 47 endif 49 48 50 PACKING += $(PATH_BIN)/additions/$(PKGFILENAME) 49 # Targets. 50 PACKING += $(PATH_BIN)/additions/$(VBOX_FBSD_ADD_PKG_FILENAME) 51 51 OTHER_CLEAN += $(PACKING) 52 52 … … 73 73 $(call MSG_L1,Installing guest additions) 74 74 @# Clear out the existing package files if needed 75 $(QUIET) rm -rf $(FREEBSDINSTDIR)76 $(QUIET)$(MKDIR) -p $( FREEBSDINSTDIR)77 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_FREEBSD_ADDITION_INSTALLER)/vboxguest.sh $(FREEBSDINSTDIR)/vboxguest.sh78 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient $(FREEBSDINSTDIR)/1099.vboxclient79 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl $(FREEBSDINSTDIR)/x11config.pl80 $(QUIET)$(CP) -f $(PATH_BIN)/additions/vboxguest.ko $(FREEBSDINSTDIR)/vboxguest.ko81 $(QUIET)$(if $(VBOX_DO_STRIP),strip $( FREEBSDINSTDIR)/vboxguest.ko,)82 $(QUIET)$( BIN_COPY) $(PATH_BIN)/additions/VBoxClient $(FREEBSDINSTDIR)/VBoxClient83 $(QUIET)$( BIN_COPY) $(PATH_BIN)/additions/VBoxService $(FREEBSDINSTDIR)/VBoxService84 $(QUIET)$( BIN_COPY) $(PATH_BIN)/additions/VBoxControl $(FREEBSDINSTDIR)/VBoxControl85 $(QUIET)$( BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_13.so $(FREEBSDINSTDIR)/vboxvideo_drv_13.so86 $(QUIET)$( BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_14.so $(FREEBSDINSTDIR)/vboxvideo_drv_14.so87 $(QUIET)$( BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_70.so $(FREEBSDINSTDIR)/vboxvideo_drv_70.so88 $(QUIET)$( BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_71.so $(FREEBSDINSTDIR)/vboxvideo_drv_71.so89 $(QUIET)$( BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_14.so $(FREEBSDINSTDIR)/vboxmouse_drv_14.so90 $(QUIET)$( BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_70.so $(FREEBSDINSTDIR)/vboxmouse_drv_70.so91 $(QUIET)$( BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_71.so $(FREEBSDINSTDIR)/vboxmouse_drv_71.so75 $(QUIET)$(RM) -Rf -- $(VBOX_FBSD_ADD_INS_OUT_DIR) 76 $(QUIET)$(MKDIR) -p $(VBOX_FBSD_ADD_INS_OUT_DIR) 77 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_FREEBSD_ADDITION_INSTALLER)/vboxguest.sh $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxguest.sh 78 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient $(VBOX_FBSD_ADD_INS_OUT_DIR)/1099.vboxclient 79 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl $(VBOX_FBSD_ADD_INS_OUT_DIR)/x11config.pl 80 $(QUIET)$(CP) -f $(PATH_BIN)/additions/vboxguest.ko $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxguest.ko 81 $(QUIET)$(if $(VBOX_DO_STRIP),strip $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxguest.ko,) 82 $(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/VBoxClient $(VBOX_FBSD_ADD_INS_OUT_DIR)/VBoxClient 83 $(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/VBoxService $(VBOX_FBSD_ADD_INS_OUT_DIR)/VBoxService 84 $(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/VBoxControl $(VBOX_FBSD_ADD_INS_OUT_DIR)/VBoxControl 85 $(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_13.so $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxvideo_drv_13.so 86 $(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_14.so $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxvideo_drv_14.so 87 $(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_70.so $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxvideo_drv_70.so 88 $(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_71.so $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxvideo_drv_71.so 89 $(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_14.so $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxmouse_drv_14.so 90 $(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_70.so $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxmouse_drv_70.so 91 $(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_71.so $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxmouse_drv_71.so 92 92 $(call MSG_L1,Creating install package: $@) 93 $(QUIET)$(VBOX_MAKESELF) $( FREEBSDINSTDIR) $@ \93 $(QUIET)$(VBOX_MAKESELF) $(VBOX_FBSD_ADD_INS_OUT_DIR) $@ \ 94 94 "VirtualBox $(VBOX_VERSION_STRING) Guest Additions for FreeBSD installation" /bin/sh ./install.sh " 1> /dev/null 2> /dev/null" 95 95 -
trunk/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../.. 24 else25 DEPTH ?= ../../../../..26 SUB_DEPTH = ../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 … … 38 33 vboxvfs_TEMPLATE = VBOXGUESTR0 39 34 vboxvfs_DEFS = VBOX_WITH_HGCM 40 vboxvfs_INCS := \41 $(PATH_SUB_CURRENT)\42 $(PATH_ TARGET)35 vboxvfs_INCS = \ 36 . \ 37 $(PATH_vboxfs) 43 38 vboxvfs_SOURCES = \ 44 39 vboxvfs_vfsops.c \ … … 48 43 $(VBOX_LIB_IPRT_GUEST_R0) 49 44 vboxvfs_DEPS = \ 50 $ (PATH_TARGET)/vnode_if.h \51 $ (PATH_TARGET)/vnode_if_newproto.h \52 $ (PATH_TARGET)/vnode_if_typedef.h45 $$(PATH_vboxvfs)/vnode_if.h \ 46 $$(PATH_vboxvfs)/vnode_if_newproto.h \ 47 $$(PATH_vboxvfs)/vnode_if_typedef.h 53 48 vboxvfs_CLEAN += $(vboxvfs_DEPS) 54 49 55 50 VBOX_AWK := /usr/bin/awk 56 51 57 $ (PATH_TARGET)/vnode_if.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src52 $$(PATH_vboxvfs)/vnode_if.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src 58 53 $(call MSG_TOOL,awk,VBoxGuest,$<,$@) 59 54 $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/vnode_if.awk $(VBOX_FREEBSD_SRC)/kern/vnode_if.src -h 60 $(QUIET)$(MV) $(PATH_ SUB_CURRENT)/vnode_if.h $(PATH_TARGET)/vnode_if.h55 $(QUIET)$(MV) $(PATH_vboxvfs)/vnode_if.h $(PATH_vboxvfs)/vnode_if.h 61 56 62 $ (PATH_TARGET)/vnode_if_newproto.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src57 $$(PATH_vboxvfs)/vnode_if_newproto.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src 63 58 $(call MSG_TOOL,awk,VBoxGuest,$<,$@) 64 59 $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/vnode_if.awk $(VBOX_FREEBSD_SRC)/kern/vnode_if.src -p 65 $(QUIET)$(MV) $(PATH_ SUB_CURRENT)/vnode_if_newproto.h $(PATH_TARGET)/vnode_if_newproto.h60 $(QUIET)$(MV) $(PATH_vboxvfs)/vnode_if_newproto.h $(PATH_vboxvfs)/vnode_if_newproto.h 66 61 67 $ (PATH_TARGET)/vnode_if_typedef.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src62 $$(PATH_vboxvfs)/vnode_if_typedef.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src 68 63 $(call MSG_TOOL,awk,VBoxGuest,$<,$@) 69 64 $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/vnode_if.awk $(VBOX_FREEBSD_SRC)/kern/vnode_if.src -q 70 $(QUIET)$(MV) $(PATH_ SUB_CURRENT)/vnode_if_typedef.h $(PATH_TARGET)/vnode_if_typedef.h65 $(QUIET)$(MV) $(PATH_vboxvfs)/vnode_if_typedef.h $(PATH_vboxvfs)/vnode_if_typedef.h 71 66 72 67 include $(KBUILD_PATH)/subfooter.kmk -
trunk/src/VBox/Additions/linux/Makefile.kmk
r12333 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../.. 24 else25 SUB_DEPTH = ..26 DEPTH ?= ../../../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 25 # 26 # Include sub-makefiles. 27 # 30 28 include $(PATH_SUB_CURRENT)/module/Makefile.kmk 31 29 include $(PATH_SUB_CURRENT)/daemon/Makefile.kmk 32 30 include $(PATH_SUB_CURRENT)/sharedfolders/Makefile.kmk 33 31 32 # 33 # Targets 34 # 34 35 ifndef VBOX_OSE 35 36 PACKING += $(PATH_BIN)/additions/VBoxLinuxAdditions.run … … 39 40 endif 40 41 42 # 43 # Globals 44 # 45 VBOX_LNX_ADD_INS_OUT_DIR := $(PATH_TARGET)/Additions/Installer/linux 46 BLDDIRS += $(VBOX_LNX_ADD_INS_OUT_DIR) 41 47 VBOX_PATH_LINUX_ADDITION_INSTALLER := $(PATH_SUB_CURRENT)/installer 42 48 VBOX_PATH_X11_ADDITION_INSTALLER := $(PATH_ROOT)/src/VBox/Additions/x11/installer 43 49 50 ifeq ($(KBUILD_TYPE),debug) 51 VBOX_LNX_ADD_BIN_COPY = $(CP) -f 52 VBOX_LNX_ADD_BIN_COPY_SYMBOLS = $(CP) -f 53 else 54 VBOX_LNX_ADD_BIN_COPY = objcopy -S -R .comment 55 VBOX_LNX_ADD_BIN_COPY_SYMBOLS = objcopy -g -R .comment 56 endif 57 44 58 include $(KBUILD_PATH)/subfooter.kmk 45 59 46 ifeq ($(KBUILD_TYPE),debug)47 BIN_COPY = $(CP) -f48 BIN_COPY_SYMBOLS = $(CP) -f49 else50 BIN_COPY = objcopy -S -R .comment51 BIN_COPY_SYMBOLS = objcopy -g -R .comment52 endif53 60 54 61 # … … 99 106 $(VBOX_VERSION_STAMP) 100 107 $(call MSG_L1,Creating $@) 101 $(QUIET)$(MKDIR) -p $( PATH_TARGET)/install108 $(QUIET)$(MKDIR) -p $(VBOX_LNX_ADD_INS_OUT_DIR) 102 109 # Remove target directory first, otherwise the behaviour of cp will not be 103 110 # what we want if it already exists. See the cp manual page for more details. 104 $(QUIET) rm -rf $(PATH_TARGET)/install/module105 $(QUIET)cp -af $(PATH_BIN)/additions/src $( PATH_TARGET)/install/module106 $(QUIET)$(MKDIR) -p $( PATH_TARGET)/install/module/test107 $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/Makefile.test $( PATH_TARGET)/install/module/test/Makefile108 $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/test.c $( PATH_TARGET)/install/module/test/109 $(QUIET)$( BIN_COPY) $(PATH_BIN)/additions/vboxadd-timesync $(PATH_TARGET)/install/vboxadd-timesync110 $(QUIET)$( BIN_COPY) $(PATH_BIN)/additions/VBoxClient $(PATH_TARGET)/install/VBoxClient111 $(QUIET)$( BIN_COPY) $(PATH_BIN)/additions/VBoxControl $(PATH_TARGET)/install/VBoxControl111 $(QUIET)$(RM) -Rf -- $(VBOX_LNX_ADD_INS_OUT_DIR)/module 112 $(QUIET)cp -af $(PATH_BIN)/additions/src $(VBOX_LNX_ADD_INS_OUT_DIR)/module 113 $(QUIET)$(MKDIR) -p $(VBOX_LNX_ADD_INS_OUT_DIR)/module/test 114 $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/Makefile.test $(VBOX_LNX_ADD_INS_OUT_DIR)/module/test/Makefile 115 $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/test.c $(VBOX_LNX_ADD_INS_OUT_DIR)/module/test/ 116 $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxadd-timesync $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxadd-timesync 117 $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/VBoxClient $(VBOX_LNX_ADD_INS_OUT_DIR)/VBoxClient 118 $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/VBoxControl $(VBOX_LNX_ADD_INS_OUT_DIR)/VBoxControl 112 119 $(QUIET)$(SED) \ 113 120 -e "s;_VERSION_;$(VBOX_VERSION_STRING);g" \ … … 116 123 -e "s;_BUILDTYPE_;$(KBUILD_TYPE);g" \ 117 124 -e "s;_ARCH_;$(KBUILD_TARGET_ARCH);g" \ 118 < $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/install.sh > $(PATH_TARGET)/install/install_.sh 119 $(QUIET)$(INSTALL) -m 0755 $(PATH_TARGET)/install/install_.sh $(PATH_TARGET)/install/install.sh 120 $(QUIET)$(RM) $(PATH_TARGET)/install/install_.sh 121 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/VBoxRandR.sh $(PATH_TARGET)/install 122 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxadd-timesync.sh $(PATH_TARGET)/install 123 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient $(PATH_TARGET)/install 124 $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxclient.desktop $(PATH_TARGET)/install 125 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxadd.sh $(PATH_TARGET)/install 126 $(QUIET)$(INSTALL) -m 0755 $(PATH_ROOT)/src/VBox/Installer/linux/routines.sh $(PATH_TARGET)/install 127 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxvideo.ids $(PATH_TARGET)/install 128 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl $(PATH_TARGET)/install 129 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config15.pl $(PATH_TARGET)/install 130 $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/90-vboxguest.fdi $(PATH_TARGET)/install 131 $(QUIET)$(BIN_COPY_SYMBOLS) $(PATH_BIN)/additions/vboxmouse_drv.o $(PATH_TARGET)/install/vboxmouse_drv.o 132 $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_70.so $(PATH_TARGET)/install/vboxmouse_drv_70.so 133 $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_71.so $(PATH_TARGET)/install/vboxmouse_drv_71.so 134 $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_14.so $(PATH_TARGET)/install/vboxmouse_drv_14.so 135 $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_15.so $(PATH_TARGET)/install/vboxmouse_drv_15.so 136 $(QUIET)$(BIN_COPY_SYMBOLS) $(PATH_BIN)/additions/vboxvideo_drv.o $(PATH_TARGET)/install/vboxvideo_drv.o 137 $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_70.so $(PATH_TARGET)/install/vboxvideo_drv_70.so 138 $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_71.so $(PATH_TARGET)/install/vboxvideo_drv_71.so 139 $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_13.so $(PATH_TARGET)/install/vboxvideo_drv_13.so 140 $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_14.so $(PATH_TARGET)/install/vboxvideo_drv_14.so 141 $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_15.so $(PATH_TARGET)/install/vboxvideo_drv_15.so 142 $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/mountvboxsf $(PATH_TARGET)/install/mount.vboxsf 143 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxvfs.sh $(PATH_TARGET)/install 125 --output $(VBOX_LNX_ADD_INS_OUT_DIR)/install_.sh \ 126 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/install.sh 127 $(QUIET)$(INSTALL) -m 0755 $(VBOX_LNX_ADD_INS_OUT_DIR)/install_.sh $(VBOX_LNX_ADD_INS_OUT_DIR)/install.sh 128 $(QUIET)$(RM) $(VBOX_LNX_ADD_INS_OUT_DIR)/install_.sh 129 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/VBoxRandR.sh $(VBOX_LNX_ADD_INS_OUT_DIR) 130 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxadd-timesync.sh $(VBOX_LNX_ADD_INS_OUT_DIR) 131 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient $(VBOX_LNX_ADD_INS_OUT_DIR) 132 $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxclient.desktop $(VBOX_LNX_ADD_INS_OUT_DIR) 133 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxadd.sh $(VBOX_LNX_ADD_INS_OUT_DIR) 134 $(QUIET)$(INSTALL) -m 0755 $(PATH_ROOT)/src/VBox/Installer/linux/routines.sh $(VBOX_LNX_ADD_INS_OUT_DIR) 135 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxvideo.ids $(VBOX_LNX_ADD_INS_OUT_DIR) 136 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl $(VBOX_LNX_ADD_INS_OUT_DIR) 137 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config15.pl $(VBOX_LNX_ADD_INS_OUT_DIR) 138 $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/90-vboxguest.fdi $(VBOX_LNX_ADD_INS_OUT_DIR) 139 $(QUIET)$(VBOX_LNX_ADD_BIN_COPY_SYMBOLS) $(PATH_BIN)/additions/vboxmouse_drv.o $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv.o 140 $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_70.so $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv_70.so 141 $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_71.so $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv_71.so 142 $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_14.so $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv_14.so 143 $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_15.so $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv_15.so 144 $(QUIET)$(VBOX_LNX_ADD_BIN_COPY_SYMBOLS) $(PATH_BIN)/additions/vboxvideo_drv.o $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv.o 145 $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_70.so $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv_70.so 146 $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_71.so $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv_71.so 147 $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_13.so $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv_13.so 148 $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_14.so $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv_14.so 149 $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_15.so $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv_15.so 150 $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/mountvboxsf $(VBOX_LNX_ADD_INS_OUT_DIR)/mount.vboxsf 151 $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxvfs.sh $(VBOX_LNX_ADD_INS_OUT_DIR) 144 152 ifdef VBOX_SELINUX_CMPLD 145 $(QUIET)$(INSTALL) -m 0755 $(VBOX_SELINUX_CMPLD) $(PATH_TARGET)/install153 $(QUIET)$(INSTALL) -m 0755 $(VBOX_SELINUX_CMPLD) $(VBOX_LNX_ADD_INS_OUT_DIR) 146 154 endif 147 $(QUIET)$(VBOX_MAKESELF) $( PATH_TARGET)/install$@ \155 $(QUIET)$(VBOX_MAKESELF) $(VBOX_LNX_ADD_INS_OUT_DIR) $@ \ 148 156 "VirtualBox $(VBOX_VERSION_STRING) Guest Additions for Linux installation" /bin/sh ./install.sh "> /dev/null" 149 157 -
trunk/src/VBox/Additions/linux/daemon/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../.. 24 else25 DEPTH ?= ../../../../..26 SUB_DEPTH = ../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 -
trunk/src/VBox/Additions/linux/module/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../.. 24 else25 DEPTH ?= ../../../../..26 SUB_DEPTH = ../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 -
trunk/src/VBox/Additions/linux/sharedfolders/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../.. 24 else25 DEPTH ?= ../../../../..26 SUB_DEPTH = ../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 -
trunk/src/VBox/Additions/os2/VBoxSF/Makefile.kmk
r11820 r12446 4 4 # 5 5 6 DEPTH = ../../../../..7 include $(KBUILD_PATH)/ header.kmk6 SUB_DEPTH = ../../../../.. 7 include $(KBUILD_PATH)/subheader.kmk 8 8 9 9 #?DLLS += VBoxSF … … 14 14 VBoxSF_DEFS = VBOX_WITH_HGCM 15 15 VBoxSF_INCS := \ 16 $(PATH_SUB_CURRENT)\16 . \ 17 17 $(PATH_ROOT)/src/VBox/Runtime/include 18 18 VBoxSF_LDFLAGS := $(addprefix -Zlinker , \ … … 33 33 end 34 34 35 include $(KBUILD_PATH)/ footer.kmk35 include $(KBUILD_PATH)/subfooter.kmk 36 36 -
trunk/src/VBox/Additions/solaris/Makefile.kmk
r12309 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../.. 24 else25 SUB_DEPTH = ..26 DEPTH ?= ../../../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 -
trunk/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../.. 24 else25 DEPTH ?= ../../../../..26 SUB_DEPTH = ../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 … … 39 34 vboxvfs_DEFS = VBOX_WITH_HGCM 40 35 vboxvfs_INCS := \ 41 $(PATH_SUB_CURRENT) \ 42 $(PATH_TARGET) 36 . 43 37 vboxvfs_SOURCES = \ 44 38 vboxvfs_vfsops.c \ -
trunk/src/VBox/Additions/x11/Makefile.kmk
r12170 r12446 19 19 # 20 20 21 ifdef VBOX_SINGLE_MAKEFILE22 21 SUB_DEPTH = ../../../.. 23 else24 SUB_DEPTH = ..25 DEPTH ?= ../../../..26 endif27 22 include $(KBUILD_PATH)/subheader.kmk 28 23 -
trunk/src/VBox/Additions/x11/xclient/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../.. 24 else25 DEPTH ?= ../../../../..26 SUB_DEPTH = ../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 … … 75 70 # Actually, this is darn annoying and will *NOT* be tolerated for any new code! 76 71 # 77 VBoxClient_LIBPATH += $(PATH_ TARGET)/VBoxClient78 VBoxClient_ORDERDEPS = $(PATH_ TARGET)/VBoxClient/libstdc++.a79 VBoxClient_CLEAN = $(PATH_ TARGET)/VBoxClient/libstdc++.a80 $ (PATH_TARGET)/VBoxClient/libstdc++.a:72 VBoxClient_LIBPATH += $(PATH_VBoxClient) 73 VBoxClient_ORDERDEPS = $(PATH_VBoxClient)/libstdc++.a 74 VBoxClient_CLEAN = $(PATH_VBoxClient)/libstdc++.a 75 $$(PATH_VBoxClient)/libstdc++.a: 81 76 $(call MSG_L1,Forcing static libstdc++) 82 77 $(QUIET)$(MKDIR) -p $(@D) -
trunk/src/VBox/Additions/x11/xgraphics/Makefile.kmk
r12170 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../.. 24 else25 DEPTH ?= ../../../../..26 SUB_DEPTH = ../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24 -
trunk/src/VBox/Additions/x11/xmouse/Makefile.kmk
r12282 r12446 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../../../../.. 24 else25 DEPTH ?= ../../../../..26 SUB_DEPTH = ../..27 endif28 23 include $(KBUILD_PATH)/subheader.kmk 29 24
Note:
See TracChangeset
for help on using the changeset viewer.
