Changeset 606 in vbox for trunk/src/VBox/Main/Makefile
- Timestamp:
- Feb 4, 2007 7:19:30 PM (18 years ago)
- svn:sync-xref-src-repo-rev:
- 18235
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/Makefile
r436 r606 32 32 PROGRAMS = VBoxSVC 33 33 ifeq ($(BUILD_TARGET),win) 34 LIBRARIES = VBoxCOM 35 else 36 LIBRARIES.linux = VBoxXPCOM 34 LIBRARIES = VBoxCOM 35 else 36 ifndef VBOX_WITH_XPCOM 37 $(error "VBox: VBOX_WITH_XPCOM isn't defined") 38 endif 39 LIBRARIES = VBoxXPCOM 40 DEFS += VBOX_WITH_XPCOM 41 DEFS += VBOX_WITH_SYS_V_IPC_SESSION_WATCHER 42 DEFS += VBOX_WITH_UNIXY_TAP_NETWORKING 37 43 endif 38 44 #PROGRAMS = tstCFGLdr … … 118 124 $(VBOX_XPCOM_INCS) 119 125 endif 126 ifdef VBOX_WITH_XPCOM 127 VBoxSVC_LIBS += \ 128 $(PATH_BIN)/VBoxDD$(VBOX_SUFF_DLL) \ 129 $(PATH_BIN)/VBoxXML$(VBOX_SUFF_DLL) \ 130 $(TARGET_VBoxXPCOM) 131 VBoxSVC_LIBS += \ 132 $(PATH_LIB)/VBoxXPCOMGlue$(VBOX_SUFF_LIB) \ 133 $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL) 134 VBoxSVC_LIBS.darwin = \ 135 $(LIB_REM) 136 else 120 137 VBoxSVC_LIBS = \ 121 $(LIB_RUNTIME)122 VBoxSVC_LIBS.win = \123 138 $(PATH_LIB)/VBoxDD$(VBOX_SUFF_LIB) \ 124 139 $(PATH_LIB)/VBoxXML.lib \ 125 140 $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB) 126 VBoxSVC_LIBS.linux = \ 127 $(PATH_BIN)/VBoxDD.so \ 128 $(PATH_BIN)/VBoxXML.so \ 129 $(PATH_LIB)/VBoxXPCOM$(VBOX_SUFF_LIB) \ 130 m \ 131 util \ 132 $(LIB_Z) \ 133 $(LIB_PTHREAD) \ 134 $(LIB_UUID) \ 135 $(PATH_BIN)/VBoxXPCOM.so \ 136 $(PATH_LIB)/VBoxXPCOMGlue$(VBOX_SUFF_LIB) 137 VBoxSVC_LIBPATH.linux = \ 138 $(LIBPATH_XPCOM) 141 endif 139 142 VBoxSVC_SOURCES = \ 140 143 Logging.cpp \ … … 177 180 win32/VBoxSVC.rc 178 181 179 VBoxSVC_SOURCES.linux = \ 182 ifdef VBOX_WITH_XPCOM 183 VBoxSVC_SOURCES += \ 180 184 linux/server.cpp 185 endif 181 186 182 187 ifdef VBOX_WITH_USB … … 224 229 VBoxC_LDFLAGS.win = /MANIFEST 225 230 endif 231 ifdef VBOX_WITH_XPCOM 226 232 VBoxC_LIBS = \ 233 $(TARGET_VBoxXPCOM) \ 234 $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL) \ 235 $(PATH_LIB)/VBoxXPCOMGlue$(VBOX_SUFF_LIB) 236 else 237 VBoxC_LIBS = \ 238 $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB) 239 endif 240 VBoxC_LIBS += \ 227 241 $(LIB_VMM) \ 228 $(LIB_REM) \ 229 $(LIB_RUNTIME) 230 VBoxC_LIBS.win = \ 231 $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB) 232 VBoxC_LIBS.linux = \ 233 $(PATH_LIB)/VBoxXPCOM$(VBOX_SUFF_LIB) \ 234 m \ 235 util \ 236 $(LIB_Z) \ 237 $(LIB_PTHREAD) \ 238 $(LIB_UUID) \ 239 $(PATH_BIN)/VBoxXPCOM.so \ 240 $(PATH_LIB)/VBoxXPCOMGlue$(VBOX_SUFF_LIB) 241 VBoxC_LIBPATH.linux = \ 242 $(LIBPATH_XPCOM) 242 $(LIB_REM) 243 243 VBoxC_SOURCES = \ 244 244 Logging.cpp \ … … 266 266 win32/VBoxC.def \ 267 267 win32/VBoxC.rc 268 VBoxC_SOURCES.linux = \ 268 ifdef VBOX_WITH_XPCOM 269 VBoxC_SOURCES += \ 269 270 linux/module.cpp 271 endif 270 272 271 273 ifdef VBOX_WITH_HGCM 272 VBoxC_SOURCES 273 274 275 274 VBoxC_SOURCES += \ 275 hgcm/HGCMObjects.cpp \ 276 hgcm/HGCMThread.cpp \ 277 hgcm/HGCM.cpp 276 278 endif 277 279 278 280 ifdef VBOX_WITH_USB 279 VBoxC_SOURCES 281 VBoxC_SOURCES += \ 280 282 RemoteUSBBackend.cpp 281 283 endif … … 297 299 xml/cfgldr.cpp \ 298 300 xml/cfgldrhlp.cpp 301 ifdef VBOX_WITH_XPCOM 299 302 VBoxXML_LIBS = \ 300 $( LIB_RUNTIME)301 VBoxXML_LIBS.linux = \ 302 $(PATH_LIB)/VBoxXPCOM$(VBOX_SUFF_LIB) 303 $(TARGET_VBoxXPCOM) \ 304 $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL) 305 endif 303 306 304 307 ## @todo (dmik): temporarily embed SettingsConverter.xsl into VBoxXML, … … 325 328 include \ 326 329 $(PATH_TARGET) 330 ifdef VBOX_WITH_XPCOM 327 331 tstCFGLdr_LIBS = \ 332 $(PATH_LIB)/VBoxXPCOM$(VBOX_SUFF_LIB) 333 endif 334 tstCFGLdr_LIBS += \ 328 335 $(LIB_RUNTIME) 329 tstCFGLdr_LIBS.linux = \330 m \331 util \332 $(LIB_Z) \333 $(LIB_PTHREAD) \334 $(LIB_UUID) \335 $(PATH_LIB)/VBoxXPCOM$(VBOX_SUFF_LIB)336 336 337 337 … … 394 394 395 395 VBOX_XML_SCHEMA_COMMON = xml/VirtualBox-settings-common.xsd 396 VBOX_XML_SCHEMA.darwin = xml/VirtualBox-settings-macosx.xsd 396 397 VBOX_XML_SCHEMA.linux = xml/VirtualBox-settings-linux.xsd 397 398 VBOX_XML_SCHEMA.win = xml/VirtualBox-settings-windows.xsd … … 431 432 432 433 # 433 # Creates the symlinks necessary for making XPCOM work. 434 # Creates the symlinks necessary for making XPCOM work. 434 435 # 435 436 xpcom-components_INST = bin/components/ … … 536 537 $(VBOX_LUPDATE) $(VBoxC_SOURCES) $(VBoxC_HEADERS) -ts $(VBoxC_TRANSLATIONS) 537 538 538 if eq ($(BUILD_TARGET),linux)539 ifdef VBOX_WITH_XPCOM 539 540 540 541 testidl: $(IDLFILE) $(IDLTYPELIB)
Note:
See TracChangeset
for help on using the changeset viewer.