Changeset 1493 in vbox for trunk/src/libs

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/libs/xpcom18a4/Makefile.kmk (modified) (4 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -225 +225 @@
 PROGRAMS += VBoxXPCOMIPCD
 
-OTHERS = \
-        $(PATH_BIN)/VBoxXPCOMBase.xpt
-
+ifeq ($(BUILD_TARGET),linux)
+ XPCOM_TYPELIB = $(PATH_BIN)/VBoxXPCOMBase.xpt
+else
+ XPCOM_TYPELIB = $(PATH_BIN)/components/VBoxXPCOMBase.xpt
+endif
+OTHERS = $(XPCOM_TYPELIB)
 OTHER_CLEAN = \
         $(PATH_TARGET)/VBox-xpcom-nspr/_pr_bld.h \
         $(PATH_TARGET)/VBox-xpcom-nspr/_pl_bld.h \
-        $(PATH_BIN)/VBoxXPCOMBase.xpt
+        $(XPCOM_TYPELIB)
 
 
@@ -1016 +1019 @@
 # DCONNECT client shared object
 VBoxXPCOMIPCC_TEMPLATE = XPCOMIPC
+ifneq ($(BUILD_TARGET),linux)
+VBoxXPCOMIPCC_INST = $(INST_BIN)components/
+endif
 VBoxXPCOMIPCC_DEFS = HAVE_DEPENDENT_LIBS
 VBoxXPCOMIPCC_SOURCES = \
@@ -1023 +1029 @@
         ipc/ipcd/client/src/ipcConnectionUnix.cpp \
         ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp
-VBoxXPCOMIPCC_LDFLAGS.darwin = -install_name @executable_path/VBoxXPCOMIPCC.dylib
+VBoxXPCOMIPCC_LDFLAGS.darwin = -install_name @executable_path/components/VBoxXPCOMIPCC.dylib
 VBoxXPCOMIPCC_LIBS = \
         $(TARGET_VBox-xpcom-ipcutils) \
@@ -1294 +1300 @@
 
 # combined typelib library
-$(PATH_BIN)/VBoxXPCOMBase.xpt: $(XPTFILES) | $(TARGET_xp_link)
+$(XPCOM_TYPELIB): $(XPTFILES) | $(TARGET_xp_link)
         $(call MSG_L1,Linking $@)
         $(QUIET)$(TARGET_xpt_link) $@ $^