Changeset 11612 in vbox for trunk/src/libs/xpcom18a4/Makefile.kmk
- Timestamp:
- Aug 25, 2008 1:52:37 PM (16 years ago)
- File:
-
- 1 edited
-
trunk/src/libs/xpcom18a4/Makefile.kmk (modified) (18 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/libs/xpcom18a4/Makefile.kmk
r11604 r11612 123 123 ipc/ipcd/extensions/dconnect/src \ 124 124 ipc/ipcd/extensions/transmngr/common \ 125 $(VBOX_PATH_SDK)/include \ 126 $(VBOX_PATH_SDK)/include/xpcom \ 127 $(VBOX_PATH_SDK)/include/xpcom/nsprpub \ 128 $(VBOX_PATH_SDK)/include/xpcom/string \ 129 $(VBOX_PATH_SDK)/include/xpcom/xpcom \ 130 $(VBOX_PATH_SDK)/include/xpcom/ipcd \ 125 $(VBOX_PATH_SDK)/bindings/xpcom/include \ 126 $(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub \ 127 $(VBOX_PATH_SDK)/bindings/xpcom/include/string \ 128 $(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \ 129 $(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd \ 131 130 . 132 131 TEMPLATE_XPCOM_INCS.darwin = $(VBOX_PATH_MACOSX_SDK)/Developer/Headers/FlatCarbon … … 161 160 TEMPLATE_XPCOMEXE_INCS = $(PATH_TARGET) \ 162 161 ipc/ipcd/shared/src \ 163 $(VBOX_PATH_SDK)/include \ 164 $(VBOX_PATH_SDK)/include/xpcom \ 165 $(VBOX_PATH_SDK)/include/xpcom/nsprpub \ 166 $(VBOX_PATH_SDK)/include/xpcom/string \ 167 $(VBOX_PATH_SDK)/include/xpcom/xpcom \ 168 $(VBOX_PATH_SDK)/include/xpcom/ipcd \ 162 $(VBOX_PATH_SDK)/bindings/xpcom/include \ 163 $(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub \ 164 $(VBOX_PATH_SDK)/bindings/xpcom/include/string \ 165 $(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \ 166 $(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd \ 169 167 . 170 168 TEMPLATE_XPCOMEXE_LIBS = \ … … 208 206 TEMPLATE_XPCOMBLDPROG_CFLAGS.freebsd = -pthread 209 207 TEMPLATE_XPCOMBLDPROG_CFLAGS.linux = -pthread 210 TEMPLATE_XPCOMBLDPROG_INCS = $(VBOX_PATH_SDK)/include \ 211 $(VBOX_PATH_SDK)/include/xpcom \ 212 $(VBOX_PATH_SDK)/include/xpcom/nsprpub \ 213 $(VBOX_PATH_SDK)/include/xpcom/string \ 214 $(VBOX_PATH_SDK)/include/xpcom/xpcom \ 215 $(VBOX_PATH_SDK)/include/xpcom/ipcd 208 TEMPLATE_XPCOMBLDPROG_INCS = $(VBOX_PATH_SDK)/bindings/xpcom/include \ 209 $(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub \ 210 $(VBOX_PATH_SDK)/bindings/xpcom/include/string \ 211 $(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \ 212 $(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd 216 213 TEMPLATE_XPCOMBLDPROG_INCS.$(KBUILD_TARGET) = $(TEMPLATE_XPCOMEXE_INCS.$(KBUILD_TARGET)) 217 214 TEMPLATE_XPCOMBLDPROG_INCS.$(KBUILD_TARGET_ARCH) = $(TEMPLATE_XPCOMEXE_INCS.$(KBUILD_TARGET_ARCH)) … … 269 266 VBoxXPCOM \ 270 267 VBoxXPCOMIPCC \ 271 $(if $(VBOX_OSE),,VBox -xpcom-helper)268 $(if $(VBOX_OSE),,VBoxHelper) 272 269 273 270 # we put it here, as template it uses depends on VBoxRT, … … 275 272 # r=bird: This doesn't work, it won't be built this way. The way to fix it is to make the order change in src/Makefile.kmk (or was it src/lib/Makefile.kmk) that puts src/VBox/Runtime before src/lib/xpcom18a4 standard for all builds. 276 273 OTHERS += \ 277 $(TARGET_VBox -xpcom-helper)274 $(TARGET_VBoxHlp) 278 275 279 276 … … 329 326 # obsoleted files in the $(INST_SDK) directory. 330 327 # 331 NSPRPUB-HEADERS_INST = $(INST_SDK) include/xpcom/nsprpub/328 NSPRPUB-HEADERS_INST = $(INST_SDK)/bindings/xpcom/include/nsprpub/ 332 329 NSPRPUB-HEADERS_IFFLAGS = -m 644 333 330 NSPRPUB-HEADERS_SOURCES = \ … … 382 379 nsprpub/pr/include/md/_vbox.cfg=>prcpucfg.h \ 383 380 384 NSPRPUB-MD-HEADERS_INST = $(INST_SDK) include/xpcom/nsprpub/md381 NSPRPUB-MD-HEADERS_INST = $(INST_SDK)/bindings/xpcom/include/nsprpub/md 385 382 NSPRPUB-MD-HEADERS_IFFLAGS = -m 644 386 383 NSPRPUB-MD-HEADERS_SOURCES = \ … … 411 408 nsprpub/pr/include/md/_l4v2.cfg 412 409 413 NSPRPUB-OBS-HEADERS_INST = $(INST_SDK) include/xpcom/nsprpub/obsolete410 NSPRPUB-OBS-HEADERS_INST = $(INST_SDK)/bindings/xpcom/include/nsprpub/obsolete 414 411 NSPRPUB-OBS-HEADERS_IFFLAGS = -m 644 415 412 NSPRPUB-OBS-HEADERS_SOURCES = \ … … 419 416 nsprpub/pr/include/obsolete/prsem.h 420 417 421 NSPRPUB-PRIV-HEADERS_INST = $(INST_SDK) include/xpcom/nsprpub/private418 NSPRPUB-PRIV-HEADERS_INST = $(INST_SDK)/bindings/xpcom/include/nsprpub/private 422 419 NSPRPUB-PRIV-HEADERS_IFFLAGS = -m 644 423 420 NSPRPUB-PRIV-HEADERS_SOURCES = \ … … 426 423 nsprpub/pr/include/private/prpriv.h 427 424 428 STRING-HEADERS_INST = $(INST_SDK) include/xpcom/string425 STRING-HEADERS_INST = $(INST_SDK)/bindings/xpcom/include/string 429 426 STRING-HEADERS_IFFLAGS = -m 644 430 427 STRING-HEADERS_SOURCES = \ … … 460 457 xpcom/string/public/string-template-undef.h 461 458 462 XPCOM-HEADERS_INST = $(INST_SDK) include/xpcom/xpcom459 XPCOM-HEADERS_INST = $(INST_SDK)/bindings/xpcom/include/xpcom 463 460 XPCOM-HEADERS_IFFLAGS = -m 644 464 461 XPCOM-HEADERS_SOURCES = \ … … 579 576 xpcom-config.h 580 577 581 IPCD-HEADERS_INST = $(INST_SDK) include/xpcom/ipcd578 IPCD-HEADERS_INST = $(INST_SDK)/bindings/xpcom/include/ipcd 582 579 IPCD-HEADERS_IFFLAGS = -m 644 583 580 IPCD-HEADERS_SOURCES = \ … … 1295 1292 # Helper for initialization of XPCOM 1296 1293 # 1297 VBox-xpcom-helper_TEMPLATE = VBOXMAINCLIENTDLL1298 1294 ## @todo why isn't this targetd called VBoxHlp and what is it good for anyway? it's not in any of the lists so it won't be processed or anything... 1299 1295 ## update: Since r35225 this is no longer necessary, VBoxRT is already available when VBoxPython is linked. Do all the initialization from there! 1300 VBox-xpcom-helper_NAME = VBoxHlp 1301 VBox-xpcom-helper_DEFS = 1302 VBox-xpcom-helper_SOURCES = \ 1296 VBoxHlp_DEFS = 1297 VBoxHlp_SOURCES = \ 1303 1298 xpcom/helper/helper.cpp 1304 1299 … … 1378 1373 1379 1374 # Python Client Module - the Python bits. 1380 VBoxPython-inst-py-xpcom_INST = $(INST_SDK) /bindings/com/python/xpcom/1375 VBoxPython-inst-py-xpcom_INST = $(INST_SDK)bindings/xpcom/python/xpcom/ 1381 1376 VBoxPython-inst-py-xpcom_SOURCES = \ 1382 1377 python/vboxxpcom.py \ … … 1397 1392 1398 1393 # Python Client Module - a sample script. 1399 VBoxPython-inst-sample_INST = $(INST_SDK)/bindings/ com/python/sample/1394 VBoxPython-inst-sample_INST = $(INST_SDK)/bindings/xpcom/python/sample/ 1400 1395 VBoxPython-inst-sample_SOURCES = \ 1401 1396 python/sample/vboxshell.py … … 1558 1553 OTHER_CLEAN += \ 1559 1554 $(PATH_VBox-xpcom-string)/idl_ts \ 1560 $(addprefix $(VBOX_PATH_SDK)/ include/,$(notdir $(subst .idl,.h,$(XPCOM_IDLFILES)))) \1561 $(addprefix $(VBOX_PATH_SDK)/ include/,$(notdir $(subst .idl,.xpt,$(XPCOM_IDLFILES)))) \1562 $(addprefix $(VBOX_PATH_SDK)/ idl/,$(notdir $(XPCOM_IDLFILES))) \1555 $(addprefix $(VBOX_PATH_SDK)/bindings/xpcom/include,$(notdir $(subst .idl,.h,$(XPCOM_IDLFILES)))) \ 1556 $(addprefix $(VBOX_PATH_SDK)/bindings/xpcom/include,$(notdir $(subst .idl,.xpt,$(XPCOM_IDLFILES)))) \ 1557 $(addprefix $(VBOX_PATH_SDK)/bindings/xpcom/idl/,$(notdir $(XPCOM_IDLFILES))) \ 1563 1558 $(addprefix $(PATH_TARGET)/,$(notdir $(subst .idl,.xpt,$(XPCOM_IDLFILES)))) 1564 1559 … … 1683 1678 -I $(VBOX_PATH_XPCOM_SRC)/xpcom/reflect/xptinfo/public/ 1684 1679 define def_IDL 1685 $(VBOX_PATH_SDK)/ include/$(notdir $(subst .idl,.h,$(idl))) \1680 $(VBOX_PATH_SDK)/bindings/xpcom/include/$(notdir $(subst .idl,.h,$(idl))) \ 1686 1681 + $(PATH_TARGET)/$(notdir $(subst .idl,.xpt,$(idl))): \ 1687 1682 $(VBOX_PATH_XPCOM_SRC)/$(idl) \ 1688 1683 | $$$$(TARGET_xpidl) 1689 1684 $$(call MSG_TOOL,xpidl,XPCOM,$$<,$$@) 1690 $$(QUIET)$(MKDIR) -p $(VBOX_PATH_SDK)/ include $(VBOX_PATH_SDK)/idl1685 $$(QUIET)$(MKDIR) -p $(VBOX_PATH_SDK)/bindings/xpcom/include $(VBOX_PATH_SDK)/bindings/xpcom/idl 1691 1686 $$(QUIET)$$(TARGET_xpidl) -m header $(XPIDL_INCS) -e $$@ $$< 1692 1687 $$(QUIET)$$(TARGET_xpidl) -m typelib $(XPIDL_INCS) -e $(addprefix $(PATH_TARGET)/,$(notdir $(subst .idl,.xpt,$(idl)))) $$< 1693 $$(QUIET)$(CP) $$< $$(VBOX_PATH_SDK)/ idl1688 $$(QUIET)$(CP) $$< $$(VBOX_PATH_SDK)/bindings/xpcom/idl 1694 1689 endef 1695 1690 … … 1697 1692 1698 1693 # dummy target. 1699 $(PATH_VBox-xpcom-string)/idl_ts: $(addprefix $(VBOX_PATH_SDK)/ include/,$(notdir $(subst .idl,.h,$(XPCOM_IDLFILES))))1694 $(PATH_VBox-xpcom-string)/idl_ts: $(addprefix $(VBOX_PATH_SDK)/bindings/xpcom/include/,$(notdir $(subst .idl,.h,$(XPCOM_IDLFILES)))) 1700 1695 $(call MSG_L1,IDL processing completed.) 1701 1696 $(QUIET)$(MKDIR) -p $(dir $@)
Note:
See TracChangeset
for help on using the changeset viewer.
