Changeset 11641 in vbox for trunk/src/libs

Timestamp:

Aug 26, 2008 7:36:18 AM (16 years ago)

Author:

vboxsync

Message:

removed helper dll completly

File:

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

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -266 +266 @@
         VBoxXPCOM \
         VBoxXPCOMIPCC
-
-
-ifdef VBOX_WITH_PYTHON
-       DLLS += VBoxHelper
-endif
 
 # we put it here, as template it uses depends on VBoxRT,
@@ -1294 +1289 @@
 
 #
-# Helper for initialization of XPCOM
-#
-## @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...
-## update: Since r35225 this is no longer necessary, VBoxRT is already available when VBoxPython is linked. Do all the initialization from there!
-VBoxHlp_DEFS =
-VBoxHlp_SOURCES = \
-        xpcom/helper/helper.cpp
-
-
-#
 # Python<->XPCOM bridge.
 #
@@ -1339 +1324 @@
 # Python Client Module - the C++/XPCOM bits.
 VBoxPython_TEMPLATE = XPCOM
-VBoxPython_DEFS = _IMPL_NS_COM _IMPL_NS_BASE EXPORT_XPTI_API EXPORT_XPT_API VBOX_PYXPCOM
+VBoxPython_DEFS = _IMPL_NS_COM _IMPL_NS_BASE EXPORT_XPTI_API EXPORT_XPT_API \
+                  VBOX_PYXPCOM VBOX_WITH_XPCOM
 VBoxPython_INCS = \
         python/src \
@@ -1368 +1354 @@
 VBoxPython_LIBS = \
         $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL) \
+        $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB)   \
         $(VBOX_LIB_PYTHON)