Changeset 14003 in vbox

Timestamp:

Nov 10, 2008 12:24:53 PM (16 years ago)

Author:

vboxsync

Message:

VBOX_XPIDL_ENV instead of lastword mess.

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)
• src/libs/xpcom18a4/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -1270 +1270 @@
  # if updating, also update xpidl_INST var in src/libs/xpcom18a4/Makefile.kmk
  VBOX_XPIDL          ?= $(PATH_BIN)/xpidl$(HOSTSUFF_EXE)
+ ifeq ($(KBUILD_TARGET),os2)
+  VBOX_XPIDL_ENV      = BEGINLIBPATH="$(dir $(VBOX_XPIDL));$$BEGINLIBPATH"$(SP)
+ endif
  VBOX_PATH_XPCOM_IDL ?= $(VBOX_PATH_SDK)/bindings/xpcom/idl
  VBOX_XPCOM_INCS     ?=                                 \
@@ -1285 +1288 @@
  endif
 endif
-
-ifeq ($(KBUILD_TARGET),os2)
- # search DLLs in the EXE directory first
- VBOX_XPIDL    := BEGINLIBPATH="$(dir $(VBOX_XPIDL));$$BEGINLIBPATH" $(VBOX_XPIDL)
-endif
-#$(error $(VBOX_XPIDL))
 
 # The X11 LIBPATH. (The amd64 hack is for RHEL4.)

trunk/src/VBox/Main/Makefile.kmk

@@ -606 +606 @@
         $(QUIET)$(VBOX_XSLTPROC) -o $@ $< $(VBOX_XIDL_FILE)
 
-$(VBOX_IDL_TYPELIB.XPCOM): $(VBOX_IDL_FILE.XPCOM) |  $$(dir $$@) $(lastword $(VBOX_XPIDL))
+$(VBOX_IDL_TYPELIB.XPCOM): $(VBOX_IDL_FILE.XPCOM) |  $$(dir $$@) $(VBOX_XPIDL)
         $(call MSG_TOOL,xpidl,VBoxSVC,$<,$@)
-        $(QUIET)$(VBOX_XPIDL) -m typelib -I $(VBOX_PATH_XPCOM_IDL) -e $@ $<
+        $(QUIET)$(VBOX_XPIDL_ENV)$(VBOX_XPIDL) -m typelib -I $(VBOX_PATH_XPCOM_IDL) -e $@ $<
         chmod 0644 $@
 ## @todo ^^^^^^^^^^^^ fix horrible hack
 
-$(VBOX_IDL_HEADER.XPCOM): $(VBOX_IDL_FILE.XPCOM) | $$(dir $$@) $(lastword $(VBOX_XPIDL))
+$(VBOX_IDL_HEADER.XPCOM): $(VBOX_IDL_FILE.XPCOM) | $$(dir $$@) $(VBOX_XPIDL)
         $(call MSG_TOOL,xpidl,VBoxSVC,$<,$@)
-        $(QUIET)$(VBOX_XPIDL) -m header  -I $(VBOX_PATH_XPCOM_IDL) -e $@ $<
+        $(QUIET)$(VBOX_XPIDL_ENV)$(VBOX_XPIDL) -m header  -I $(VBOX_PATH_XPCOM_IDL) -e $@ $<
 
 

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -1748 +1748 @@
 # INSTARGET_xpidl which is the one in bin/.
 #
-$(lastword $(VBOX_XPIDL)): $$(PATH_VBox-xpcom-string)/idl_ts
+$(VBOX_XPIDL): $$(PATH_VBox-xpcom-string)/idl_ts