vbox的更動 12446 路徑 trunk/src/VBox/Additions/freebsd/Makefile.kmk

時間撮記:

2008-9-14 下午11:32:31 (16 年 以前)

作者:

vboxsync

訊息:

Additions/Makefiles: Pushed them up to root (sub-makefile wise). Some cleanups, opengl omitted.

檔案:

• trunk/src/VBox/Additions/freebsd/Makefile.kmk (修改) (3 筆差異)

trunk/src/VBox/Additions/freebsd/Makefile.kmk

@@ -20 +20 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../..
-else
-SUB_DEPTH = ..
-DEPTH    ?= ../../../..
-endif
 include $(KBUILD_PATH)/subheader.kmk
 
@@ -32 +27 @@
 endif
 
+# Include sub-makefiles.
 include $(PATH_SUB_CURRENT)/vboxvfs/Makefile.kmk
 
-PKGFILENAME    := VBoxFreeBSDAdditions.tbz
-PKGINFO_ARCH    = $(shell uname -p)
+# Globals
+VBOX_FBSD_ADD_INS_OUT_DIR := $(PATH_TARGET)/Additions/FreeBSD/Installer
+BLDDIRS                   += $(VBOX_FBSD_ADD_INS_OUT_DIR)
+
+VBOX_FBSD_ADD_PKG_FILENAME := VBoxFreeBSDAdditions.tbz
+VBOX_FBSD_ADD_PKGINFO_ARCH    = $(shell uname -p)
 VBOX_PATH_FREEBSD_ADDITION_INSTALLER := $(PATH_SUB_CURRENT)/Installer
 VBOX_PATH_X11_ADDITION_INSTALLER := $(PATH_ROOT)/src/VBox/Additions/x11/installer
-FREEBSDINSTDIR := $(PATH_TARGET)/install
 
 ifeq ($(KBUILD_TYPE),debug)
- BIN_COPY         := $(CP) -f
- BIN_COPY_SYMBOLS := $(CP) -f
+ VBOX_FBSD_ADD_BIN_COPY         := $(CP) -f
+ VBOX_FBSD_ADD_BIN_COPY_SYMBOLS := $(CP) -f
 else
- BIN_COPY         := objcopy -S -R .comment
- BIN_COPY_SYMBOLS := objcopy -g -R .comment
+ VBOX_FBSD_ADD_BIN_COPY         := objcopy -S -R .comment
+ VBOX_FBSD_ADD_BIN_COPY_SYMBOLS := objcopy -g -R .comment
 endif
 
-PACKING     += $(PATH_BIN)/additions/$(PKGFILENAME)
+# Targets.
+PACKING     += $(PATH_BIN)/additions/$(VBOX_FBSD_ADD_PKG_FILENAME)
 OTHER_CLEAN += $(PACKING)
 
@@ -73 +73 @@
         $(call MSG_L1,Installing guest additions)
         @# Clear out the existing package files if needed
-        $(QUIET)rm -rf $(FREEBSDINSTDIR)
-        $(QUIET)$(MKDIR) -p $(FREEBSDINSTDIR)
-        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_FREEBSD_ADDITION_INSTALLER)/vboxguest.sh                     $(FREEBSDINSTDIR)/vboxguest.sh
-        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient                    $(FREEBSDINSTDIR)/1099.vboxclient
-        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl                         $(FREEBSDINSTDIR)/x11config.pl
-        $(QUIET)$(CP) -f $(PATH_BIN)/additions/vboxguest.ko                                                 $(FREEBSDINSTDIR)/vboxguest.ko
-        $(QUIET)$(if $(VBOX_DO_STRIP),strip $(FREEBSDINSTDIR)/vboxguest.ko,)
-        $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/VBoxClient                                                $(FREEBSDINSTDIR)/VBoxClient
-        $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/VBoxService                                               $(FREEBSDINSTDIR)/VBoxService
-        $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/VBoxControl                                               $(FREEBSDINSTDIR)/VBoxControl
-        $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_13.so                                       $(FREEBSDINSTDIR)/vboxvideo_drv_13.so
-        $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_14.so                                       $(FREEBSDINSTDIR)/vboxvideo_drv_14.so
-        $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_70.so                                       $(FREEBSDINSTDIR)/vboxvideo_drv_70.so
-        $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_71.so                                       $(FREEBSDINSTDIR)/vboxvideo_drv_71.so
-        $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_14.so                                       $(FREEBSDINSTDIR)/vboxmouse_drv_14.so
-        $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_70.so                                       $(FREEBSDINSTDIR)/vboxmouse_drv_70.so
-        $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_71.so                                       $(FREEBSDINSTDIR)/vboxmouse_drv_71.so
+        $(QUIET)$(RM) -Rf -- $(VBOX_FBSD_ADD_INS_OUT_DIR)
+        $(QUIET)$(MKDIR) -p $(VBOX_FBSD_ADD_INS_OUT_DIR)
+        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_FREEBSD_ADDITION_INSTALLER)/vboxguest.sh         $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxguest.sh
+        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient        $(VBOX_FBSD_ADD_INS_OUT_DIR)/1099.vboxclient
+        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl             $(VBOX_FBSD_ADD_INS_OUT_DIR)/x11config.pl
+        $(QUIET)$(CP) -f $(PATH_BIN)/additions/vboxguest.ko                                     $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxguest.ko
+        $(QUIET)$(if $(VBOX_DO_STRIP),strip $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxguest.ko,)
+        $(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/VBoxClient                      $(VBOX_FBSD_ADD_INS_OUT_DIR)/VBoxClient
+        $(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/VBoxService                     $(VBOX_FBSD_ADD_INS_OUT_DIR)/VBoxService
+        $(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/VBoxControl                     $(VBOX_FBSD_ADD_INS_OUT_DIR)/VBoxControl
+        $(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_13.so             $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxvideo_drv_13.so
+        $(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_14.so             $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxvideo_drv_14.so
+        $(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_70.so             $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxvideo_drv_70.so
+        $(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_71.so             $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxvideo_drv_71.so
+        $(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_14.so             $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxmouse_drv_14.so
+        $(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_70.so             $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxmouse_drv_70.so
+        $(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_71.so             $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxmouse_drv_71.so
         $(call MSG_L1,Creating install package: $@)
-        $(QUIET)$(VBOX_MAKESELF) $(FREEBSDINSTDIR) $@ \
+        $(QUIET)$(VBOX_MAKESELF) $(VBOX_FBSD_ADD_INS_OUT_DIR) $@ \
                 "VirtualBox $(VBOX_VERSION_STRING) Guest Additions for FreeBSD installation" /bin/sh ./install.sh " 1> /dev/null 2> /dev/null"