Changeset 11912 in vbox for trunk

Timestamp:

Sep 1, 2008 11:30:42 AM (17 years ago)

Author:

vboxsync

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

35776

Message:

Main/Makefile: Variable renaming (namespace).

File:

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

trunk/src/VBox/Main/Makefile.kmk

@@ -29 +29 @@
 # Include sub-makefile(s).
 ifdef VBOX_WITH_WEBSERVICES
-include $(PATH_SUB_CURRENT)/webservice/Makefile.kmk
+ include $(PATH_SUB_CURRENT)/webservice/Makefile.kmk
 endif
 include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
 
-# targets++
+#
+# Targets and globals (bit of a mess...)
+#
 ifndef VBOX_ONLY_SDK
  LIBRARIES       += VBoxCOM
@@ -84 +86 @@
 #PROGRAMS        += tstCFGLdr
 
-IDLFILE.MSCOM         = $(VBOX_PATH_SDK)/bindings/mscom/idl/VirtualBox.idl
-IDLFILE.XPCOM         = $(VBOX_PATH_SDK)/bindings/xpcom/idl/VirtualBox_XPCOM.idl
-
-IDLTYPELIB.XPCOM      = $(PATH_BIN)/components/VirtualBox_XPCOM.xpt
-IDLHEADER.XPCOM       = $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
+VBOX_IDL_FILE.MSCOM    = $(VBOX_PATH_SDK)/bindings/mscom/idl/VirtualBox.idl
+VBOX_IDL_FILE.XPCOM    = $(VBOX_PATH_SDK)/bindings/xpcom/idl/VirtualBox_XPCOM.idl
+
+VBOX_IDL_TYPELIB.XPCOM = $(PATH_BIN)/components/VirtualBox_XPCOM.xpt
+VBOX_IDL_HEADER.XPCOM  = $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
 
 ifdef VBOX_ONLY_SDK
-  NEED_MSCOM = 1
-  NEED_XPCOM = 1
+ VBOX_NEED_MSCOM = 1
+ VBOX_NEED_XPCOM = 1
 endif
 
 ifeq ($(KBUILD_TARGET),win)
  INSTALLS       += VBoxMain-com-inst
- NEED_MSCOM = 1
+ VBOX_NEED_MSCOM = 1
 else
- NEED_XPCOM = 1
-endif
-
-ifdef NEED_MSCOM
+ VBOX_NEED_XPCOM = 1
+endif
+
+ifdef VBOX_NEED_MSCOM
  OTHERS         += \
-        $(IDLFILE.MSCOM) \
+        $(VBOX_IDL_FILE.MSCOM) \
         $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h \
         $(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox.tlb \
         $(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox_i.c
  OTHER_CLEAN    += \
-        $(IDLFILE.MSCOM) \
+        $(VBOX_IDL_FILE.MSCOM) \
         $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h \
         $(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox.tlb \
@@ -120 +122 @@
 endif
 
-ifdef NEED_XPCOM
- OTHERS         += $(IDLFILE.XPCOM) $(IDLTYPELIB.XPCOM) $(IDLHEADER.XPCOM)
+ifdef VBOX_NEED_XPCOM
+ OTHERS         += $(VBOX_IDL_FILE.XPCOM) $(VBOX_IDL_TYPELIB.XPCOM) $(VBOX_IDL_HEADER.XPCOM)
  OTHER_CLEAN    += \
-    $(IDLFILE.XPCOM) \
-    $(IDLHEADER.XPCOM) \
-    $(IDLTYPELIB.XPCOM)
-
- VBOX_MAIN_PREREQS += $(IDLTYPELIB.XPCOM) $(IDLHEADER.XPCOM)
+    $(VBOX_IDL_FILE.XPCOM) \
+    $(VBOX_IDL_HEADER.XPCOM) \
+    $(VBOX_IDL_TYPELIB.XPCOM)
+
+ VBOX_MAIN_PREREQS += $(VBOX_IDL_TYPELIB.XPCOM) $(VBOX_IDL_HEADER.XPCOM)
  BLDDIRS += $(VBOX_PATH_SDK)/bindings/xpcom/idl
 endif # xpcom
@@ -338 +340 @@
         $(APPEND) $@ _NSGetModule
 endif
-VBoxSVCM_INTERMEDIATES += $(IDLHEADER.XPCOM)
+VBoxSVCM_INTERMEDIATES += $(VBOX_IDL_HEADER.XPCOM)
 
 endif # VBOX_WITH_XPCOM
@@ -571 +573 @@
 #
 
-XIDLFILE = $(VBOX_PATH_MAIN_SRC)/idl/VirtualBox.xidl
+VBOX_XIDL_FILE = $(VBOX_PATH_MAIN_SRC)/idl/VirtualBox.xidl
 
 ## @todo this hack ain't cutting it any longer. (the file name is abspath'ed since ages now.)
-xpcom/helpers.cpp: $(IDLTYPELIB.XPCOM)
-
-$(IDLFILE.XPCOM): $(VBOX_PATH_MAIN_SRC)/idl/xpidl.xsl $(XIDLFILE) | $(call DIRDEP,$(dir $(IDLFILE.XPCOM)))
+xpcom/helpers.cpp: $(VBOX_IDL_TYPELIB.XPCOM)
+
+$(VBOX_IDL_FILE.XPCOM): $(VBOX_PATH_MAIN_SRC)/idl/xpidl.xsl $(VBOX_XIDL_FILE) | $(call DIRDEP,$(dir $(VBOX_IDL_FILE.XPCOM)))
         $(call MSG_TOOL,xsltproc,VBoxSVC,$<,$@)
         $(QUIET)$(VBOX_XSLTPROC) -o $@ $^
 
-$(IDLTYPELIB.XPCOM): $(IDLFILE.XPCOM) | $(call DIRDEP,$(dir $(IDLTYPELIB.XPCOM))) $(VBOX_XPIDL)
+$(VBOX_IDL_TYPELIB.XPCOM): $(VBOX_IDL_FILE.XPCOM) | $(call DIRDEP,$(dir $(VBOX_IDL_TYPELIB.XPCOM))) $(VBOX_XPIDL)
         $(call MSG_TOOL,xpidl,VBoxSVC,$<,$@)
         $(QUIET)$(VBOX_XPIDL) -m typelib -I $(VBOX_PATH_XPCOM_IDL) -e $@ $<
@@ -586 +588 @@
 ## @todo ^^^^^^^^^^^^ fix horrible hack
 
-$(IDLHEADER.XPCOM): $(IDLFILE.XPCOM) | $(call DIRDEP,$(dir $(IDLHEADER.XPCOM))) $(VBOX_XPIDL)
+$(VBOX_IDL_HEADER.XPCOM): $(VBOX_IDL_FILE.XPCOM) | $(call DIRDEP,$(dir $(VBOX_IDL_HEADER.XPCOM))) $(VBOX_XPIDL)
         $(call MSG_TOOL,xpidl,VBoxSVC,$<,$@)
         $(QUIET)$(VBOX_XPIDL) -m header  -I $(VBOX_PATH_XPCOM_IDL) -e $@ $<
 
 
-MAIN_IDL ?= $(EXEC_X86_WIN32) $(call VBOX_FN_MAKE_WIN_PATH,$(firstword $(wildcard \
+VBOX_MAIN_IDL ?= $(EXEC_X86_WIN32) $(call VBOX_FN_MAKE_WIN_PATH,$(firstword $(wildcard \
         $(PATH_SDK_WINPSDK_BIN)/Midl.Exe\
         $(PATH_SDK_WINPSDK)/Bin/Midl.Exe\
@@ -601 +603 @@
 endif
 
-$(IDLFILE.MSCOM): $(VBOX_PATH_MAIN_SRC)/idl/midl.xsl $(XIDLFILE)
+$(VBOX_IDL_FILE.MSCOM): $(VBOX_PATH_MAIN_SRC)/idl/midl.xsl $(VBOX_XIDL_FILE)
         $(call MSG_TOOL,xsltproc,VBoxSVC,$<,$@)
         $(QUIET)$(MKDIR) -p $(VBOX_PATH_SDK)/bindings/mscom/idl
         $(QUIET)$(VBOX_XSLTPROC) -o $@ $^
 
-$(PATH_TARGET)/VBoxSVC.rgs: $(VBOX_PATH_MAIN_SRC)/win/VirtualBox_rgs.xsl $(XIDLFILE)
+$(PATH_TARGET)/VBoxSVC.rgs: $(VBOX_PATH_MAIN_SRC)/win/VirtualBox_rgs.xsl $(VBOX_XIDL_FILE)
         $(VBOX_XSLTPROC) --stringparam Module VBoxSVC -o $@ $^
 
-$(PATH_TARGET)/VBoxC.rgs: $(VBOX_PATH_MAIN_SRC)/win/VirtualBox_rgs.xsl $(XIDLFILE)
+$(PATH_TARGET)/VBoxC.rgs: $(VBOX_PATH_MAIN_SRC)/win/VirtualBox_rgs.xsl $(VBOX_XIDL_FILE)
         $(VBOX_XSLTPROC) --stringparam Module VBoxC -o $@ $^
 
@@ -622 +624 @@
 + $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h \
 + $(PATH_VBoxCOM)/VirtualBox.tlb \
-+ $(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox.tlb: $(IDLFILE.MSCOM) | $(call DIRDEP,$(PATH_VBoxCOM))
-        $(MAIN_IDL) $(IDL_DEFS) \
++ $(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox.tlb: $(VBOX_IDL_FILE.MSCOM) | $(call DIRDEP,$(PATH_VBoxCOM))
+        $(VBOX_MAIN_IDL) $(IDL_DEFS) \
                 /out $(call VBOX_FN_MAKE_WIN_PATH,$(PATH_VBoxCOM)) \
                 /cpp_cmd $(subst $(EXEC_X86_WIN32),,$(call VBOX_FN_MAKE_WIN_PATH,$(TOOL_$(VBOX_VCC_TOOL)_CC))) \
@@ -659 +661 @@
 ifdef VBOX_WITH_XPCOM
 
-testidl: $(IDLFILE.XPCOM) $(IDLTYPELIB.XPCOM)
-testidlhdr: $(IDLHEADER.XPCOM)
+testidl: $(VBOX_IDL_FILE.XPCOM) $(VBOX_IDL_TYPELIB.XPCOM)
+testidlhdr: $(VBOX_IDL_HEADER.XPCOM)
 
 else
 
-testidl: $(IDLFILE.MSCOM) $(PATH_VBoxCOM)/VirtualBox_i.c
+testidl: $(VBOX_IDL_FILE.MSCOM) $(PATH_VBoxCOM)/VirtualBox_i.c
 
 endif
@@ -672 +674 @@
 
 # Hot fix when dependencies goes bad again...
-#.NOTPARALLEL: $(TARGET_VBoxC) $(TARGET_VBoxSVC) $(TARGET_VBoxCOM) $(IDLHEADER) $(IDLFILE) $(PATH_VBoxCOM)/VirtualBox_i.c
-
+#.NOTPARALLEL: $(TARGET_VBoxC) $(TARGET_VBoxSVC) $(TARGET_VBoxCOM) $(VBOX_IDL_HEADER) $(IDLFILE) $(PATH_VBoxCOM)/VirtualBox_i.c
+