Changeset 35440 in vbox
- Timestamp:
- Jan 9, 2011 11:43:10 PM (14 years ago)
- Location:
- trunk/src
- Files:
-
- 7 edited
-
VBox/Debugger/Makefile.kmk (modified) (1 diff)
-
VBox/Devices/Graphics/BIOS/Makefile.kmk (modified) (1 diff)
-
VBox/HostDrivers/VBoxUSB/Makefile.kmk (modified) (1 diff)
-
VBox/Installer/darwin/Makefile.kmk (modified) (2 diffs)
-
VBox/Main/webservice/Makefile.kmk (modified) (1 diff)
-
libs/xpcom18a4/Config.kmk (modified) (3 diffs)
-
libs/xpcom18a4/Makefile.kmk (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Debugger/Makefile.kmk
r31846 r35440 79 79 testcase/tstDBGCStubs.cpp 80 80 tstDBGCParser_LIBS = \ 81 $( TARGET_Debugger) \81 $(Debugger_1_TARGET) \ 82 82 $(LIB_RUNTIME) 83 83 -
trunk/src/VBox/Devices/Graphics/BIOS/Makefile.kmk
r35380 r35440 70 70 71 71 # 1. create vbetables.h 72 $$(VgaBiosBin_0_OUTDIR)/vbetables.h: $(MAKEFILE_CURRENT) $$( TARGET_vbetables-gen) | $$(dir $$@)73 $(QUIET)$(REDIRECT) -wo $@ -- $( TARGET_vbetables-gen)72 $$(VgaBiosBin_0_OUTDIR)/vbetables.h: $(MAKEFILE_CURRENT) $$(vbetables-gen_1_TARGET) | $$(dir $$@) 73 $(QUIET)$(REDIRECT) -wo $@ -- $(vbetables-gen_1_TARGET) 74 74 75 75 # 2. precompile -
trunk/src/VBox/HostDrivers/VBoxUSB/Makefile.kmk
r31911 r35440 60 60 testcase/tstUSBFilter.cpp 61 61 tstUSBFilter_LIBS = \ 62 $( TARGET_USBLib)62 $(USBLib_1_TARGET) 63 63 endif 64 64 -
trunk/src/VBox/Installer/darwin/Makefile.kmk
r34737 r35440 189 189 $(VBOX_PATH_PACK_TMP)/Packages/VirtualBoxCLI.pkg \ 190 190 $(VBOX_PATH_PACK_TMP)/Packages/VirtualBox.pkg \ 191 $$( TARGET_RegistrationPane) \191 $$(RegistrationPane_1_TARGET) \ 192 192 $(if $(VBOX_OSE), , \ 193 193 $(VBOX_PATH_DI_SRC)/InstallerPlugins/RegistrationPane/Info.plist \ … … 293 293 $(MKDIR) -p $@/Contents/Plugins/RegistrationPane.bundle/Contents/MacOS/ 294 294 $(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/InstallerPlugins/RegistrationPane/Info.plist $@/Contents/Plugins/RegistrationPane.bundle/Contents/ 295 $(INSTALL) -m 0644 $( TARGET_RegistrationPane) $@/Contents/Plugins/RegistrationPane.bundle/Contents/MacOS/295 $(INSTALL) -m 0644 $(RegistrationPane_1_TARGET) $@/Contents/Plugins/RegistrationPane.bundle/Contents/MacOS/ 296 296 $(MKDIR) -p $@/Contents/Plugins/RegistrationPane.bundle/Contents/Resources/English.lproj/RegistrationPane.nib 297 297 $(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/InstallerPlugins/RegistrationPane/Resources/English.lproj/InfoPlist.strings $@/Contents/Plugins/RegistrationPane.bundle/Contents/Resources/English.lproj/ -
trunk/src/VBox/Main/webservice/Makefile.kmk
r34618 r35440 644 644 + $(VBOXWEB_OUT_DIR)/soapC-19.cpp \ 645 645 + $(VBOXWEB_OUT_DIR)/soapC-20.cpp \ 646 : $(VBOXWEB_OUT_DIR)/soapC.cpp $$( TARGET_split-soapC) | $$(dir $$@)646 : $(VBOXWEB_OUT_DIR)/soapC.cpp $$(split-soapC_1_TARGET) | $$(dir $$@) 647 647 $(RM) -f $(wildcard $(VBOXWEB_OUT_DIR)/soapC-?.cpp $(VBOXWEB_OUT_DIR)/soapC-??.cpp) 648 $( TARGET_split-soapC) $(VBOXWEB_OUT_DIR)/soapC.cpp $(VBOXWEB_OUT_DIR) 20648 $(split-soapC_1_TARGET) $(VBOXWEB_OUT_DIR)/soapC.cpp $(VBOXWEB_OUT_DIR) 20 649 649 endif # !VBOX_WITHOUT_SPLIT_SOAPC 650 650 -
trunk/src/libs/xpcom18a4/Config.kmk
r31259 r35440 131 131 TEMPLATE_XPCOM_LIBS.l4 = $(VBOX_GCC_LIBGCC) 132 132 TEMPLATE_XPCOM_LIBS.solaris = sendfile 133 TEMPLATE_XPCOM_ORDERDEPS = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $( TARGET_$(hdrinst))) \133 TEMPLATE_XPCOM_ORDERDEPS = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $($(hdrinst)_1_TARGET)) \ 134 134 $(PATH_TARGET)/VBox-xpcom-idl-timestamp 135 135 ifeq ($(KBUILD_TARGET),os2) … … 162 162 . 163 163 TEMPLATE_XPCOMEXE_LIBS = \ 164 $( TARGET_VBox-xpcom-ipcshared) \165 $( TARGET_VBoxXPCOM) \164 $(VBox-xpcom-ipcshared_1_TARGET) \ 165 $(VBoxXPCOM_1_TARGET) \ 166 166 $(TEMPLATE_XPCOM_LIBS) 167 167 TEMPLATE_XPCOMEXE_LIBS.freebsd = $(LIB_PTHREAD) … … 211 211 TEMPLATE_XPCOMBLDPROG_CXXFLAGS.solaris = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.solaris) -fno-omit-frame-pointer # for now anyway. 212 212 TEMPLATE_XPCOMBLDPROG_LDFLAGS.darwin = $(TEMPLATE_VBOXBLDPROG_LDFLAGS.darwin) -fpascal-strings -fshort-wchar -fno-rtti -fno-exceptions 213 TEMPLATE_XPCOMBLDPROG_ORDERDEPS = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $( TARGET_$(hdrinst)))213 TEMPLATE_XPCOMBLDPROG_ORDERDEPS = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $($(hdrinst)_1_TARGET)) 214 214 215 215 -
trunk/src/libs/xpcom18a4/Makefile.kmk
r35380 r35440 459 459 # install necessary DLLs to the same place where xpidl goes 460 460 INSTALLS += xpidl-DLLS 461 xpidl_ORDERDEPS = $( TARGET_xpidl-DLLS)461 xpidl_ORDERDEPS = $(xpidl-DLLS_1_TARGET) 462 462 xpidl-DLLS_INST = $(xpidl_INST) 463 463 # static libraries of these may be provided instead, … … 947 947 xpcom/glue/standalone/nsGREDirServiceProvider.cpp 948 948 VBoxXPCOMGlue_SOURCES += \ 949 $( TARGET_VBox-xpcom-string)949 $(VBox-xpcom-string_1_TARGET) 950 950 #VBoxXPCOMGlue_INST = lib/ $(INST_SDK)lib/ 951 951 … … 973 973 vboxdeps.cpp 974 974 VBoxXPCOM_LIBS = \ 975 $( TARGET_VBox-xpcom-typelib) \976 $( TARGET_VBox-xpcom-string) \977 $( TARGET_VBox-xpcom-base) \978 $( TARGET_VBox-xpcom-ds) \979 $( TARGET_VBox-xpcom-io) \980 $( TARGET_VBox-xpcom-components) \981 $( TARGET_VBox-xpcom-threads) \982 $( TARGET_VBox-xpcom-xptinfo) \983 $( TARGET_VBox-xpcom-xptcall) \984 $( TARGET_VBox-xpcom-proxy) \985 $( TARGET_VBox-xpcom-nspr) \986 $( TARGET_VBoxXPCOMGlue_s)975 $(VBox-xpcom-typelib_1_TARGET) \ 976 $(VBox-xpcom-string_1_TARGET) \ 977 $(VBox-xpcom-base_1_TARGET) \ 978 $(VBox-xpcom-ds_1_TARGET) \ 979 $(VBox-xpcom-io_1_TARGET) \ 980 $(VBox-xpcom-components_1_TARGET) \ 981 $(VBox-xpcom-threads_1_TARGET) \ 982 $(VBox-xpcom-xptinfo_1_TARGET) \ 983 $(VBox-xpcom-xptcall_1_TARGET) \ 984 $(VBox-xpcom-proxy_1_TARGET) \ 985 $(VBox-xpcom-nspr_1_TARGET) \ 986 $(VBoxXPCOMGlue_s_1_TARGET) 987 987 VBoxXPCOM_LIBS.linux = \ 988 988 pthread dl … … 990 990 ifeq ($(filter-out freebsd l4 linux netbsd openbsd,$(KBUILD_TARGET)),) # gnu ld. 991 991 VBoxXPCOM_LDFLAGS = -Wl,--whole-archive \ 992 $( TARGET_VBox-xpcom-typelib) \993 $( TARGET_VBox-xpcom-string) \994 $( TARGET_VBox-xpcom-base) \995 $( TARGET_VBox-xpcom-ds) \996 $( TARGET_VBox-xpcom-io) \997 $( TARGET_VBox-xpcom-components) \998 $( TARGET_VBox-xpcom-threads) \999 $( TARGET_VBox-xpcom-xptinfo) \1000 $( TARGET_VBox-xpcom-xptcall) \1001 $( TARGET_VBox-xpcom-proxy) \1002 $( TARGET_VBox-xpcom-nspr) \1003 $( TARGET_VBoxXPCOMGlue_s) \992 $(VBox-xpcom-typelib_1_TARGET) \ 993 $(VBox-xpcom-string_1_TARGET) \ 994 $(VBox-xpcom-base_1_TARGET) \ 995 $(VBox-xpcom-ds_1_TARGET) \ 996 $(VBox-xpcom-io_1_TARGET) \ 997 $(VBox-xpcom-components_1_TARGET) \ 998 $(VBox-xpcom-threads_1_TARGET) \ 999 $(VBox-xpcom-xptinfo_1_TARGET) \ 1000 $(VBox-xpcom-xptcall_1_TARGET) \ 1001 $(VBox-xpcom-proxy_1_TARGET) \ 1002 $(VBox-xpcom-nspr_1_TARGET) \ 1003 $(VBoxXPCOMGlue_s_1_TARGET) \ 1004 1004 -Wl,--no-whole-archive 1005 1005 endif 1006 1006 1007 1007 VBoxXPCOM_LDFLAGS.solaris += -Wl,-z,allextract \ 1008 $( TARGET_VBox-xpcom-typelib) \1009 $( TARGET_VBox-xpcom-string) \1010 $( TARGET_VBox-xpcom-base) \1011 $( TARGET_VBox-xpcom-ds) \1012 $( TARGET_VBox-xpcom-io) \1013 $( TARGET_VBox-xpcom-components) \1014 $( TARGET_VBox-xpcom-threads) \1015 $( TARGET_VBox-xpcom-xptinfo) \1016 $( TARGET_VBox-xpcom-xptcall) \1017 $( TARGET_VBox-xpcom-proxy) \1018 $( TARGET_VBox-xpcom-nspr) \1019 $( TARGET_VBoxXPCOMGlue_s) \1008 $(VBox-xpcom-typelib_1_TARGET) \ 1009 $(VBox-xpcom-string_1_TARGET) \ 1010 $(VBox-xpcom-base_1_TARGET) \ 1011 $(VBox-xpcom-ds_1_TARGET) \ 1012 $(VBox-xpcom-io_1_TARGET) \ 1013 $(VBox-xpcom-components_1_TARGET) \ 1014 $(VBox-xpcom-threads_1_TARGET) \ 1015 $(VBox-xpcom-xptinfo_1_TARGET) \ 1016 $(VBox-xpcom-xptcall_1_TARGET) \ 1017 $(VBox-xpcom-proxy_1_TARGET) \ 1018 $(VBox-xpcom-nspr_1_TARGET) \ 1019 $(VBoxXPCOMGlue_s_1_TARGET) \ 1020 1020 -Wl,-z,defaultextract 1021 1021 … … 1042 1042 endif 1043 1043 1044 TEMPLATE_XPCOMIPC_LIBS = $( TARGET_VBoxXPCOM) $(TEMPLATE_XPCOM_LIBS)1044 TEMPLATE_XPCOMIPC_LIBS = $(VBoxXPCOM_1_TARGET) $(TEMPLATE_XPCOM_LIBS) 1045 1045 1046 1046 TEMPLATE_XPCOMIPCEXE = XPCOM IPC executables … … 1107 1107 VBoxXPCOMIPCC_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/components/VBoxXPCOMIPCC.dylib 1108 1108 VBoxXPCOMIPCC_LIBS = \ 1109 $( TARGET_VBox-xpcom-ipcutils) \1110 $( TARGET_VBox-xpcom-ipcshared) \1111 $( TARGET_VBox-xpcom-ipcdlock) \1112 $( TARGET_VBox-xpcom-ipctransmgr) \1113 $( TARGET_VBox-xpcom-ipctmgrcom)1109 $(VBox-xpcom-ipcutils_1_TARGET) \ 1110 $(VBox-xpcom-ipcshared_1_TARGET) \ 1111 $(VBox-xpcom-ipcdlock_1_TARGET) \ 1112 $(VBox-xpcom-ipctransmgr_1_TARGET) \ 1113 $(VBox-xpcom-ipctmgrcom_1_TARGET) 1114 1114 # EF 1115 1115 #VBoxXPCOMIPCC_LIBS += $(LIB_RUNTIME) … … 1310 1310 1311 1311 # combined typelib library 1312 $(PATH_TARGET)/VBox-xpcom-xpt-files/VBoxXPCOMBase.xpt: $$(VBOX_XPTFILES) | $$( TARGET_xpt_link) $(PATH_TARGET)/VBox-xpcom-xpt-files/1312 $(PATH_TARGET)/VBox-xpcom-xpt-files/VBoxXPCOMBase.xpt: $$(VBOX_XPTFILES) | $$(xpt_link_1_TARGET) $(PATH_TARGET)/VBox-xpcom-xpt-files/ 1313 1313 $(call MSG_LINK,XPCOM_TYPELIB,$@) 1314 1314 $(QUIET)$(MKDIR) -p -- $(PATH_BIN)/components 1315 $(QUIET)$( TARGET_xpt_link) $@ $^1315 $(QUIET)$(xpt_link_1_TARGET) $@ $^ 1316 1316 1317 1317 … … 1333 1333 + $(PATH_TARGET)/VBox-xpcom-xpt-files/$(notdir $(subst .idl,.xpt,$(idl))): \ 1334 1334 $(VBOX_PATH_XPCOM_SRC)/$(idl) \ 1335 | $$$$( TARGET_xpidl) \1335 | $$$$(xpidl_1_TARGET) \ 1336 1336 $(PATH_TARGET)/VBox-xpcom-xpt-files/ 1337 1337 $$(call MSG_TOOL,xpidl,XPCOM,$$<,$$@) 1338 1338 $$(QUIET)$(MKDIR) -p $(VBOX_PATH_SDK)/bindings/xpcom/include $(VBOX_PATH_SDK)/bindings/xpcom/idl 1339 $$(QUIET)$$( TARGET_xpidl) -m header $(XPIDL_INCS) -e $$@ $$<1340 $$(QUIET)$$( TARGET_xpidl) -m typelib $(XPIDL_INCS) -e $(addprefix $(PATH_TARGET)/VBox-xpcom-xpt-files/,$(notdir $(subst .idl,.xpt,$(idl)))) $$<1339 $$(QUIET)$$(xpidl_1_TARGET) -m header $(XPIDL_INCS) -e $$@ $$< 1340 $$(QUIET)$$(xpidl_1_TARGET) -m typelib $(XPIDL_INCS) -e $(addprefix $(PATH_TARGET)/VBox-xpcom-xpt-files/,$(notdir $(subst .idl,.xpt,$(idl)))) $$< 1341 1341 $$(QUIET)$(CP) $$< $$(VBOX_PATH_SDK)/bindings/xpcom/idl 1342 1342 endef
Note:
See TracChangeset
for help on using the changeset viewer.
