Changeset 12199 in vbox for trunk/src/libs

Timestamp:

Sep 8, 2008 3:04:59 AM (16 years ago)

Author:

vboxsync

Message:

Makefiles: Pushing xpcom up to root level in the sub-makefile sense. Rewrote xpt generation and some header creations to avoid putting stuff in PATH_TARGET (obj/).

File:

• trunk/src/libs/xpcom18a4/Makefile.kmk (modified) (13 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -20 +20 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../..
-else
-SUB_DEPTH = .
-DEPTH     = ../../..
-endif
 include $(KBUILD_PATH)/subheader.kmk
 
@@ -42 +37 @@
 #
 VBOX_PATH_XPCOM_SRC := $(PATH_SUB_CURRENT)
+
+BLDDIRS += $(PATH_TARGET)/VBox-xpcom-xpt-files/
 
 
@@ -110 +107 @@
  TEMPLATE_XPCOM_DEFS              += MOZ_PRESERVE_PIC
 endif
-TEMPLATE_XPCOM_INCS                = $(PATH_TARGET) \
-                                     xpcom/build \
+TEMPLATE_XPCOM_INCS                = xpcom/build \
                                      xpcom/ds \
                                      xpcom/io \
@@ -160 +156 @@
 TEMPLATE_XPCOMEXE_EXTENDS          = XPCOM
 ## @todo undo -fPIC.
-TEMPLATE_XPCOMEXE_INCS             = $(PATH_TARGET) \
-                                     ipc/ipcd/shared/src \
+TEMPLATE_XPCOMEXE_INCS             = ipc/ipcd/shared/src \
                                      $(VBOX_PATH_SDK)/bindings/xpcom/include \
                                      $(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub \
@@ -309 +304 @@
 endif # !VBOX_ONLY_SDK
 
-
-OTHER_CLEAN += \
-        $(PATH_TARGET)/VBox-xpcom-nspr/_pr_bld.h \
-        $(PATH_TARGET)/VBox-xpcom-nspr/_pl_bld.h
 
 
@@ -705 +696 @@
 VBox-xpcom-nspr_INCS = \
         nsprpub/pr/include/private \
-        $(PATH_TARGET)/VBox-xpcom-nspr
+        $(PATH_VBox-xpcom-nspr)
 
 VBox-xpcom-nspr_SOURCES  = \
@@ -853 +844 @@
 VBox-xpcom-nspr_SOURCES.solaris.amd64 = nsprpub/pr/src/md/unix/os_SunOS_x86_64.s
 
-
+# generate build stamps
 nsprpub/pr/src/prvrsion.c_DEPS = $(PATH_VBox-xpcom-nspr)/_pr_bld.h
 nsprpub/lib/ds/plvrsion.c_DEPS = $(PATH_VBox-xpcom-nspr)/_pl_bld.h
+VBox-xpcom-nspr_CLEAN += \
+        $(PATH_VBox-xpcom-nspr)/_pr_bld.h \
+        $(PATH_VBox-xpcom-nspr)/_pl_bld.h
+
+$$(PATH_VBox-xpcom-nspr)/_pr_bld.h: | $$(PATH_VBox-xpcom-nspr)/
+        $(call MSG_GENERATE,,$@)
+        $(QUIET)$(APPEND) -t $@ '#define _BUILD_STRING "$(date +%Y-%m-%d %T)"'
+
+$$(PATH_VBox-xpcom-nspr)/_pl_bld.h: | $$(PATH_VBox-xpcom-nspr)/
+        $(call MSG_GENERATE,,$@)
+        $(QUIET)$(APPEND) -t $@ '#define _BUILD_STRING "$(date +%Y-%m-%d %T)"' 
 
 
@@ -1548 +1550 @@
         $(addprefix $(VBOX_PATH_SDK)/bindings/xpcom/include,$(notdir $(subst .idl,.xpt,$(XPCOM_IDLFILES)))) \
         $(addprefix $(VBOX_PATH_SDK)/bindings/xpcom/idl/,$(notdir $(XPCOM_IDLFILES))) \
-        $(addprefix $(PATH_TARGET)/,$(notdir $(subst .idl,.xpt,$(XPCOM_IDLFILES))))
+        $(addprefix $(PATH_TARGET)/VBox-xpcom-xpt-files/,$(notdir $(subst .idl,.xpt,$(XPCOM_IDLFILES))))
 
 
@@ -1555 +1557 @@
 #
 INSTALLS += VBoxXPCOMBase-xpt-inst
-VBOX_XPTFILES = $(addprefix $(PATH_TARGET)/, \
+VBOX_XPTFILES = $(addprefix $(PATH_TARGET)/VBox-xpcom-xpt-files/, \
         nsIConsoleListener.xpt \
         nsIConsoleMessage.xpt \
@@ -1640 +1642 @@
 VBoxXPCOMBase-xpt-inst_MODE = 0644
 VBoxXPCOMBase-xpt-inst_SOURCES = \
-        $(PATH_TARGET)/VBoxXPCOMBase.xpt
+        $(PATH_TARGET)/VBox-xpcom-xpt-files/VBoxXPCOMBase.xpt
 VBoxXPCOMBase-xpt-inst_CLEAN = \
         $(VBOX_XPTFILES) \
-        $(PATH_TARGET)/VBoxXPCOMBase.xpt
+        $(PATH_TARGET)/VBox-xpcom-xpt-files/VBoxXPCOMBase.xpt
 
 # combined typelib library
-$(PATH_TARGET)/VBoxXPCOMBase.xpt: $(VBOX_XPTFILES) | $$(TARGET_xpt_link)
+$(PATH_TARGET)/VBox-xpcom-xpt-files/VBoxXPCOMBase.xpt: $(VBOX_XPTFILES) | $$(TARGET_xpt_link) $(PATH_TARGET)/VBox-xpcom-xpt-files/
         $(call MSG_LINK,XPCOM_TYPELIB,$@)
         $(QUIET)$(MKDIR) -p -- $(PATH_BIN)/components
@@ -1657 +1659 @@
 
 
-
-# generate build stamps
-$(PATH_VBox-xpcom-nspr)/_pr_bld.h:
-        $(call MSG_GENERATE,,$@)
-        $(QUIET)echo '#define _BUILD_STRING "$(shell date "+%Y-%m-%d %T")"' > $@
-
-$(PATH_VBox-xpcom-nspr)/_pl_bld.h:
-        $(call MSG_GENERATE,,$@)
-        $(QUIET)echo '#define _BUILD_STRING "$(shell date "+%Y-%m-%d %T")"' > $@
 
 #
@@ -1683 +1676 @@
 define def_IDL
 $(VBOX_PATH_SDK)/bindings/xpcom/include/$(notdir $(subst .idl,.h,$(idl))) \
-+ $(PATH_TARGET)/$(notdir $(subst .idl,.xpt,$(idl))): \
++ $(PATH_TARGET)/VBox-xpcom-xpt-files/$(notdir $(subst .idl,.xpt,$(idl))): \
                 $(VBOX_PATH_XPCOM_SRC)/$(idl) \
-                | $$$$(TARGET_xpidl)
+                | $$$$(TARGET_xpidl) \
+                $(PATH_TARGET)/VBox-xpcom-xpt-files/
         $$(call MSG_TOOL,xpidl,XPCOM,$$<,$$@)
         $$(QUIET)$(MKDIR) -p $(VBOX_PATH_SDK)/bindings/xpcom/include $(VBOX_PATH_SDK)/bindings/xpcom/idl
         $$(QUIET)$$(TARGET_xpidl) -m header $(XPIDL_INCS) -e $$@ $$<
-        $$(QUIET)$$(TARGET_xpidl) -m typelib $(XPIDL_INCS) -e $(addprefix $(PATH_TARGET)/,$(notdir $(subst .idl,.xpt,$(idl)))) $$<
+        $$(QUIET)$$(TARGET_xpidl) -m typelib $(XPIDL_INCS) -e $(addprefix $(PATH_TARGET)/VBox-xpcom-xpt-files/,$(notdir $(subst .idl,.xpt,$(idl)))) $$<
         $$(QUIET)$(CP) $$< $$(VBOX_PATH_SDK)/bindings/xpcom/idl
 endef
@@ -1704 +1698 @@
 $(VBOX_XPIDL): $$(PATH_VBox-xpcom-string)/idl_ts
 
-# Manual dependency...
-xpcom/string/src/nsAString.cpp: $(PATH_VBox-xpcom-string)/idl_ts