Changeset 39895 in vbox for trunk/src

Timestamp:

Jan 27, 2012 9:58:56 AM (13 years ago)

Author:

vboxsync

Message:

Main/cbinding: more fixes, decrease necessary manual work

Location:

trunk/src/VBox/Main/cbinding

Files:

• Makefile.kmk (modified) (5 diffs)
• VBoxXPCOMC.cpp (modified) (1 diff)

trunk/src/VBox/Main/cbinding/Makefile.kmk

@@ -51 +51 @@
         VBoxCAPI_v4_0.h \
         VBoxCAPI_v4_1.h \
-        $(XpComCHeaders_0_OUTDIR)/VBoxCAPI_v$(VBOX_API_VERSION).h
+        $(XpComCHeaders_0_OUTDIR)/VBoxCAPI.h=>VBoxCAPI_v$(VBOX_API_VERSION).h
 
 $$(XpComCHeaders_0_OUTDIR)/VBoxXPCOMCGlue.h: \
@@ -62 +62 @@
                 <  $< >  $@
 
-$$(XpComCHeaders_0_OUTDIR)/VBoxCAPI_v$(VBOX_API_VERSION).h: \
+$$(XpComCHeaders_0_OUTDIR)/VBoxCAPI.h: \
                 $(PATH_SUB_CURRENT)/xpcidl.xsl \
                 $(VBOX_XIDL_FILE) \
@@ -81 +81 @@
  VBoxXPCOMC_SOURCES = \
         VBoxXPCOMC.cpp
+ VBoxXPCOMC_INCS = \
+        $(XpComCHeaders_0_OUTDIR)
  VBoxXPCOMC_INTERMEDIATES = \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include/VBoxCAPI_v$(VBOX_API_VERSION).h
+        $(XpComCHeaders_0_OUTDIR)/VBoxCAPI.h
  endif
 
@@ -93 +95 @@
  VBoxXPCOMCGlue_SOURCES = \
         VBoxXPCOMCGlue.c
- VBoxXPCOMCGlue_DEPS = \
-        $(VBOX_PATH_SDK)/bindings/xpcom/cbinding/VBoxXPCOMCGlue.h
  VBoxXPCOMCGlue_INCS = \
         $(VBOX_PATH_SDK)/bindings/xpcom/cbinding
  VBoxXPCOMCGlue_INTERMEDIATES = \
+        $(VBOX_PATH_SDK)/bindings/xpcom/cbinding/VBoxXPCOMCGlue.h \
         $(VBOX_PATH_SDK)/bindings/xpcom/include/VBoxCAPI_v$(VBOX_API_VERSION).h
 
@@ -111 +112 @@
         $(VBOX_PATH_SDK)/bindings/xpcom/cbinding
   tstXPCOMCGlue_INTERMEDIATES = \
+        $(VBOX_PATH_SDK)/bindings/xpcom/cbinding/VBoxXPCOMCGlue.h \
         $(VBOX_PATH_SDK)/bindings/xpcom/include/VBoxCAPI_v$(VBOX_API_VERSION).h
   tstXPCOMCGlue_SOURCES = \
         tstXPCOMCGlue.c
-  tstXPCOMCGlue_DEPS = \
-        $(VBOX_PATH_SDK)/bindings/xpcom/cbinding/VBoxXPCOMCGlue.h
   tstXPCOMCGlue_LIBS = \
         $(VBoxXPCOMCGlue_1_TARGET)

trunk/src/VBox/Main/cbinding/VBoxXPCOMC.cpp

@@ -25 +25 @@
 #include <VBox/log.h>
 
-#include "VBoxCAPI_v3_2.h"
+#include "VBoxCAPI.h"
 #include "VBox/com/com.h"
 #include "VBox/version.h"