Changeset 1493 in vbox for trunk/src/VBox/Main/Makefile

Timestamp:

Mar 15, 2007 12:38:32 AM (18 years ago)

Author:

vboxsync

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

19557

Message:

Made VBoxSVCM link on darwin and put the component/ files directly into the directory instead of the symlinking.

File:

• trunk/src/VBox/Main/Makefile (modified) (6 diffs)

trunk/src/VBox/Main/Makefile

@@ -61 +61 @@
  INSTALLS        = xpcom-components
  IDLFILE         = $(VBOX_PATH_SDK)/idl/VirtualBox_XPCOM.idl
- IDLTYPELIB      = $(PATH_BIN)/VirtualBox_XPCOM.xpt
+ ifeq ($(BUILD_TARGET),linux)
+  IDLTYPELIB     = $(PATH_BIN)/VirtualBox_XPCOM.xpt
+ else
+  IDLTYPELIB     = $(PATH_BIN)/components/VirtualBox_XPCOM.xpt
+ endif
  IDLHEADER       = $(VBOX_PATH_SDK)/include/VirtualBox_XPCOM.h
  OTHERS          = $(IDLTYPELIB)
@@ -204 +208 @@
 
 VBoxSVCM_TEMPLATE               = VBOXMAIN
+ifneq ($(BUILD_TARGET),linux)
+VBoxSVCM_INST                   = $(INST_BIN)components/
+endif
 VBoxSVCM_DEFS                   = IN_RING3 IN_CFGLDR_R3
 VBoxSVCM_INCS                   = \
@@ -211 +218 @@
 VBoxSVCM_SOURCES                = \
         linux/server_module.cpp
+VBoxSVCM_LIBS                   = \
+        $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
+VBoxSVCM_LDFLAGS.darwin         = -install_name @executable_path/components/VBoxSVCM.dylib
 
 endif # VBOX_WITH_XPCOM
@@ -218 +228 @@
 #
 VBoxC_TEMPLATE = VBOXMAIN
+ifneq ($(BUILD_TARGET),linux)
+VBoxC_INST = $(INST_BIN)components/
+endif
 VBoxC_DEFS = IN_RING3 IN_CFGLDR_R3
 VBoxC_DEFS += VBOX_COM_INPROC
@@ -244 +257 @@
         $(PATH_VBoxC) \
         $(PATH_VBoxCOM)
-VBoxC_LDFLAGS.darwin = -install_name @executable_path/VBoxC.dylib
+VBoxC_LDFLAGS.darwin = -install_name @executable_path/components/VBoxC.dylib
 ifdef VBOX_USE_VCC80
 VBoxC_LDFLAGS.win = /MANIFEST
@@ -451 +464 @@
 # Creates the symlinks necessary for making XPCOM work.
 #
+## @todo Figure out why Linux really needs this, darwin doesn't...
 xpcom-components_INST = $(INST_BIN)components/
+ifeq ($(BUILD_TARGET),linux) 
 xpcom-components_SYMLINKS = \
+        VirtualBox_XPCOM.xpt=>../VirtualBox_XPCOM.xpt \
+        VBoxXPCOMBase.xpt=>../VBoxXPCOMBase.xpt \
         VBoxC$(SUFF_DLL)=>../VBoxC$(SUFF_DLL) \
         VBoxSVCM$(SUFF_DLL)=>../VBoxSVCM$(SUFF_DLL) \
-        VBoxXPCOMIPCC$(SUFF_DLL)=>../VBoxXPCOMIPCC$(SUFF_DLL) \
-        VirtualBox_XPCOM.xpt=>../VirtualBox_XPCOM.xpt \
-        VBoxXPCOMBase.xpt=>../VBoxXPCOMBase.xpt
+        VBoxXPCOMIPCC$(SUFF_DLL)=>../VBoxXPCOMIPCC$(SUFF_DLL)
+endif