Changeset 12962 in vbox for trunk/src/VBox/Installer/linux

Timestamp:

Oct 2, 2008 10:10:55 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

37394

Message:

Installer/linux: VBoxDbg3 -> VBoxDbg; some cleanup.

File:

• trunk/src/VBox/Installer/linux/Makefile.kmk (modified) (10 diffs)

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -109 +109 @@
         $(if $(VBOX_WITH_VBOXSDL),VBoxSDL $(if $(VBOX_WITH_HARDENING),VBoxSDL.so),) \
         VBoxSettings.so \
+        VBoxSharedClipboard.so \
+        VBoxSharedFolders.so \
+        $(if $(VBOX_WITH_GUEST_PROPS),VBoxGuestPropSvc.so) \
         VBoxSVC \
         VBoxDDU.so \
@@ -118 +121 @@
         components/VBoxC.so \
         components/VBoxSVCM.so \
-        components/VBoxXPCOMIPCC.so
+        components/VBoxXPCOMIPCC.so \
+        $(if $(VBOX_OSE),,VRDPAuth.so)
+
 
 # Do not remove relocation information of these binaries
@@ -129 +134 @@
         VMMR0.r0
 ifeq ($(KBUILD_TARGET_ARCH),amd64)
-VBOX_LNX_STRIP_OBJ += \
+ VBOX_LNX_STRIP_OBJ += \
         VBoxREM2.rel
 endif
@@ -136 +141 @@
 VBOX_LNX_NO_STRIP = \
         $(if $(VBOX_OSE),,LICENSE) \
-        $(if $(VBOX_WITH_QT4GUI),\
-          $(if $(VBOX_OSE),,License-$(VBOX_LICENSE_VER).html)) \
         components/VBoxXPCOMBase.xpt \
         components/VirtualBox_XPCOM.xpt \
@@ -144 +147 @@
         VBox.png \
         VBoxAddIF.sh \
-        $(if $(VBOX_WITH_QT4GUI),VirtualBox.desktop,) \
         src
 
@@ -153 +155 @@
         VBoxKeyboard.so \
         VirtualBox \
-        $(if $(VBOX_WITH_HARDENING),VirtualBox.so)
+        $(if $(VBOX_WITH_HARDENING),VirtualBox.so) \
+        $(if $(VBOX_WITH_DEBUGGER_GUI),VBoxDbg.so)
  VBOX_LNX_NO_STRIP += \
+        VirtualBox.desktop \
+        $(if $(VBOX_OSE),,License-$(VBOX_LICENSE_VER).html) \
         $(if $(VBOX_WITH_QT4_SUN),$(notdir $(wildcard $(PATH_BIN)/libVBox*)),) \
         $(foreach f,$(VBOX_APPROVED_GUI_LANGUAGES),nls/VirtualBox_$(f).qm nls/qt_$(f).qm)
@@ -165 +170 @@
 endif
 
-# Shared Folders
-VBOX_LNX_STRIP_BIN += \
-        VBoxSharedFolders.so \
-        $(if $(VBOX_OSE),,VRDPAuth.so)
-
-# Shared Clipboard
-VBOX_LNX_STRIP_BIN += \
-        VBoxSharedClipboard.so \
-        $(if $(VBOX_WITH_DEBUGGER_GUI),VBoxDbg3.so,)
-
-# Shared Info Services
-VBOX_LNX_STRIP_BIN += \
-        $(if $(VBOX_WITH_GUEST_PROPS),VBoxGuestPropSvc.so)
-
+
+# Documentation
 ifdef VBOX_WITH_DOCS_PACKING
  VBOX_LNX_NO_STRIP += \
@@ -191 +184 @@
  endif
 endif
+
+# VRDP
 ifdef VBOX_WITH_VRDP
  VBOX_LNX_STRIP_BIN += \
@@ -205 +200 @@
  endif
 endif
+
+# Headless
 ifdef VBOX_WITH_HEADLESS
  VBOX_LNX_STRIP_BIN += \
@@ -210 +207 @@
         $(if $(VBOX_WITH_HARDENING),VBoxHeadless.so)
 endif
+
+# Webservices
 ifdef VBOX_WITH_WEBSERVICES
  VBOX_LNX_STRIP_BIN += \