Changeset 49116 in vbox for trunk/src/libs

Timestamp:

Oct 15, 2013 12:50:23 PM (12 years ago)

Author:

vboxsync

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

89961

Message:

*.kmk: Some template cleanup, adding VBoxR3Tool for dev tools (bin/tools/).

Location:

trunk/src/libs

Files:

• kStuff/Makefile.kmk (modified) (1 diff)
• xpcom18a4/Config.kmk (modified) (2 diffs)

trunk/src/libs/kStuff/Makefile.kmk

@@ -86 +86 @@
 
 LIBRARIES += VBox-kStuffStaticBldProg
-VBox-kStuffStaticBldProg_TEMPLATE = VBOXBLDPROG
+VBox-kStuffStaticBldProg_TEMPLATE = VBoxBldProg
 VBox-kStuffStaticBldProg_EXTENDS = VBox-kStuff
 

trunk/src/libs/xpcom18a4/Config.kmk

@@ -189 +189 @@
 #
 TEMPLATE_XPCOMBLDPROG                     = XPCOM Build programs executables
-TEMPLATE_XPCOMBLDPROG_EXTENDS             = VBOXBLDPROG
+TEMPLATE_XPCOMBLDPROG_EXTENDS             = VBoxBldProg
 ## @todo Verify that this doesn't blow up because of template inheriance ordering. (we're assuming XPCOMEXE is expanded when this is being used.)
 TEMPLATE_XPCOMBLDPROG_DEFS                = \
-        $(TEMPLATE_VBOXBLDPROG_DEFS) \
+        $(TEMPLATE_VBoxBldProg_DEFS) \
         $(filter-out VBOX_USE_IPRT_IN_XPCOM, $(TEMPLATE_XPCOMEXE_DEFS))
-TEMPLATE_XPCOMBLDPROG_DEFS.$(KBUILD_HOST) = $(TEMPLATE_VBOXBLDPROG_DEFS.$(KBUILD_HOST)) $(TEMPLATE_XPCOMEXE_DEFS.$(KBUILD_HOST))
-TEMPLATE_XPCOMBLDPROG_DEFS.x86            = $(TEMPLATE_VBOXBLDPROG_DEFS.x86)            $(TEMPLATE_XPCOMEXE_DEFS.x86)
-TEMPLATE_XPCOMBLDPROG_DEFS.amd64          = $(TEMPLATE_VBOXBLDPROG_DEFS.amd64)          $(TEMPLATE_XPCOMEXE_DEFS.amd64)
+TEMPLATE_XPCOMBLDPROG_DEFS.$(KBUILD_HOST) = $(TEMPLATE_VBoxBldProg_DEFS.$(KBUILD_HOST)) $(TEMPLATE_XPCOMEXE_DEFS.$(KBUILD_HOST))
+TEMPLATE_XPCOMBLDPROG_DEFS.x86            = $(TEMPLATE_VBoxBldProg_DEFS.x86)            $(TEMPLATE_XPCOMEXE_DEFS.x86)
+TEMPLATE_XPCOMBLDPROG_DEFS.amd64          = $(TEMPLATE_VBoxBldProg_DEFS.amd64)          $(TEMPLATE_XPCOMEXE_DEFS.amd64)
 TEMPLATE_XPCOMBLDPROG_INCS                = \
         $(VBOX_PATH_SDK)/bindings/xpcom/include \
@@ -204 +204 @@
         $(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd
 TEMPLATE_XPCOMBLDPROG_CFLAGS             = $(filter-out -pedantic -Wshadow, $(TEMPLATE_VBOX_BLDPROG_CFLAGS)) $(VBOX_GCC_Wno-int-to-pointer-cast) $(VBOX_GCC_Wno-pointer-to-int-cast) -Wno-format
-TEMPLATE_XPCOMBLDPROG_CXXFLAGS.darwin    = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.darwin)     -fpascal-strings -fshort-wchar -fno-common -fno-rtti
-TEMPLATE_XPCOMBLDPROG_CXXFLAGS.solaris   = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.solaris)    -fno-omit-frame-pointer # for now anyway.
-TEMPLATE_XPCOMBLDPROG_LDFLAGS.darwin     = $(TEMPLATE_VBOXBLDPROG_LDFLAGS.darwin)      -fpascal-strings -fshort-wchar -fno-rtti -fno-exceptions
+TEMPLATE_XPCOMBLDPROG_CXXFLAGS.darwin    = $(TEMPLATE_VBoxBldProg_CXXFLAGS.darwin)     -fpascal-strings -fshort-wchar -fno-common -fno-rtti
+TEMPLATE_XPCOMBLDPROG_CXXFLAGS.solaris   = $(TEMPLATE_VBoxBldProg_CXXFLAGS.solaris)    -fno-omit-frame-pointer # for now anyway.
+TEMPLATE_XPCOMBLDPROG_LDFLAGS.darwin     = $(TEMPLATE_VBoxBldProg_LDFLAGS.darwin)      -fpascal-strings -fshort-wchar -fno-rtti -fno-exceptions
 TEMPLATE_XPCOMBLDPROG_ORDERDEPS          = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $($(hdrinst)_1_TARGET))