VBox

Timestamp:

Jun 12, 2008 12:41:39 AM (17 years ago)

Author:

vboxsync

Message:

Removed the last remains of the linux additions cross compilation in the l4 build.

Location:

trunk/src/VBox/Additions

Files:

trunk/src/VBox/Additions/Makefile.kmk

-              r9639
+              r9642
 ## @file
 # Top-level makefile for the VirtualBox Guest Additions.
+#
-# Cross building of the additions is generally done by remote building
-# by means of smbfs, cifs, VBOX_ONLY_ADDITIONS=1 and setting KBUILD_TARGET
-# to the desired target.
+#
-# Limited support for cross building the windows additions using wine
-# is provided. There are a couple of issues with the approach (lack of
-# signing, no VC++ 8 support, ++) that makes it unsuitable for releases.
+#
-# Building the linux additions as part of the l4 build is ok because
-# l4 is built on a linux platform. This is why we have to check if
-# KBUILD_TARGET is l4 or linux in some places, though most of the magic
-# is done in the templates (Config.kmk).
+#
 …
 include $(KBUILD_PATH)/subheader.kmk
+#
+# Cross building of the additions is generally done by remote building
+# by means of smbfs, cifs, VBOX_ONLY_ADDITIONS=1 and setting KBUILD_TARGET
+# and KBUILD_TARGET_ARCH to the desired target and architecture.
+#
+# Limited support for cross building the windows additions using wine
+# is provided. There are a couple of issues with the approach (lack of
+# signing, no VC++ 8 support, ++) that makes it unsuitable for releases.
+#
+#
 # Note! VBOX_WITH_ADDITIONS is checked for by our parent makefile.

-              r9252
+              r9642
 include $(KBUILD_PATH)/subheader.kmk
+# This can only be built on a real Linux system.
+if1of ($(KBUILD_TARGET),linux l4)
+ include $(PATH_SUB_CURRENT)/module/Makefile.kmk
+ include $(PATH_SUB_CURRENT)/daemon/Makefile.kmk
+ include $(PATH_SUB_CURRENT)/sharedfolders/Makefile.kmk
+endif
+include $(PATH_SUB_CURRENT)/module/Makefile.kmk
+include $(PATH_SUB_CURRENT)/daemon/Makefile.kmk
+include $(PATH_SUB_CURRENT)/sharedfolders/Makefile.kmk
 ifndef VBOX_OSE
 …
 VBOX_PATH_LINUX_ADDITION_INSTALLER := $(PATH_SUB_CURRENT)/installer
 VBOX_PATH_X11_ADDITION_INSTALLER := $(PATH_ROOT)/src/VBox/Additions/x11/installer
+VBOX_PATH_X11_ADDITION_INSTALLER   := $(PATH_ROOT)/src/VBox/Additions/x11/installer
 include $(KBUILD_PATH)/subfooter.kmk

r8760	r9642
24	24
25	25	# Include sub-makefiles.
26		if1of ($(KBUILD_TARGET), freebsd l~~4 linux~~ solaris)
	26	if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
27	27	include $(PATH_SUB_CURRENT)/xclient/Makefile.kmk
28	28	include $(PATH_SUB_CURRENT)/xgraphics/Makefile.kmk

-              r9540
+              r9642
 # vboxvideo_drv
+#
 if1of ($(KBUILD_TARGET),linux l4)
+if1of ($(KBUILD_TARGET), linux)
  SYSMODS += vboxvideo_drv
  vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
 …
         vboxvideo_68.c \
         vboxutils_68.c
 endif   # target linux, l4
+endif   # target linux
 …
 DLLS += vboxvideo_drv_70
 vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
 if1of ($(KBUILD_TARGET), l4 linux)
+if1of ($(KBUILD_TARGET), linux)
  vboxvideo_drv_70_CFLAGS += \
         -Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros) # template?

r9540	r9642
28	28	# vboxmouse_drv
29	29	#
30		if1of ($(KBUILD_TARGET),~~linux l4~~)
	30	if1of ($(KBUILD_TARGET), linux)
31	31	SYSMODS += vboxmouse_drv
32	32	vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD

Note: See TracChangeset for help on using the changeset viewer.