Changeset 14571 in vbox for trunk/src

Timestamp:

Nov 25, 2008 1:30:03 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: Fixed the testwrappres target.

Location:

trunk/src/VBox/Frontends

Files:

• VirtualBox/Makefile.kmk (modified) (2 diffs)
• VirtualBox4/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -409 +409 @@
 # Generate COM Wrappers
 #
+VirtualBox_COM_WRAPPERS   = $(PATH_VirtualBox)/include/COMWrappers.h
+
 VirtualBox_BLDDIRS       += $(PATH_VirtualBox)/include
-VirtualBox_CLEAN         += $(PATH_VirtualBox)/include/COMWrappers.h
-VirtualBox_INTERMEDIATES += $(PATH_VirtualBox)/include/COMWrappers.h
-
-$$(PATH_VirtualBox)/include/COMWrappers.h: \
+VirtualBox_CLEAN         += $(VirtualBox_COM_WRAPPERS)
+VirtualBox_INTERMEDIATES += $(VirtualBox_COM_WRAPPERS)
+
+$$(VirtualBox_COM_WRAPPERS): \
                 $(PATH_ROOT)/src/VBox/Main/idl/VirtualBox.xidl \
                 $(VBOX_PATH_VIRTUALBOX3_SRC)/include/COMWrappers.xsl \
@@ -421 +423 @@
 
 # alias for generating the COM Wrappers file.
-testwrappers:: $(PATH_VirtualBox)/include/COMWrappers.h
+testwrappers:: $$(VirtualBox_COM_WRAPPERS)
 
 

trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk

@@ -426 +426 @@
 # Generate the COM wrappers.
 #
+VirtualBox4_COM_WRAPPERS   = $(PATH_VirtualBox4)/include/COMWrappers.h
+
 VirtualBox4_BLDDIRS       += $(PATH_VirtualBox4)/include
-VirtualBox4_INTERMEDIATES += $(PATH_VirtualBox4)/include/COMWrappers.h
-VirtualBox4_CLEAN         += $(PATH_VirtualBox4)/include/COMWrappers.h
-
-$$(PATH_VirtualBox4)/include/COMWrappers.h: \
+VirtualBox4_INTERMEDIATES += $(VirtualBox4_COM_WRAPPERS)
+VirtualBox4_CLEAN         += $(VirtualBox4_COM_WRAPPERS)
+
+$$(VirtualBox4_COM_WRAPPERS): \
                 $(PATH_ROOT)/src/VBox/Main/idl/VirtualBox.xidl \
                 $(VBOX_VIRTUALBOX4_SRC)/include/COMWrappers.xsl \
@@ -436 +438 @@
         $(call MSG_GENERATE,VirtualBox4,$<,$@)
         $(QUIET)$(VBOX_XSLTPROC) -o $@ $(VBOX_VIRTUALBOX4_SRC)/include/COMWrappers.xsl $<
+
+# alias for generating the COM Wrappers file.
+testwrappers:: $$(VirtualBox4_COM_WRAPPERS)
+
 
 #
@@ -464 +470 @@
                 $<
 
-# alias for generating the COM Wrappers file.
-testwrappers:: $(VBOX_WRAPPERS_FILE4)
-
 
 ifeq ($(KBUILD_TARGET),win)