Changeset 12257 in vbox for trunk/src

Timestamp:

Sep 9, 2008 2:23:58 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

36256

Message:

VirtualBox4/Makefile: fixes, sub-makefile.

File:

• trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk (modified) (5 diffs)

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

@@ -20 +20 @@
 #
 
-DEPTH = ../../../..
-include $(KBUILD_PATH)/header.kmk
+SUB_DEPTH = ../../../..
+include $(KBUILD_PATH)/subheader.kmk
 
 #
@@ -219 +219 @@
 endif
 
-if 0 ## @todo not finished yet.
+if "$(USER)" == "bird"
 ifdef VBOX_WITH_DEBUGGER_GUI ## @todo make this dynamically loadable and ship with release builds too.
  ifeq ($(KBUILD_TARGET),win)
@@ -461 +461 @@
 # Generate the COM wrappers.
 #
-VirtualBox4_BLDDIRS       += $(PATH_VirtualBox4)/include/
+VirtualBox4_BLDDIRS       += $(PATH_VirtualBox4)/include
 VirtualBox4_INTERMEDIATES += $(PATH_VirtualBox4)/include/COMWrappers.h
 VirtualBox4_CLEAN         += $(PATH_VirtualBox4)/include/COMWrappers.h
@@ -467 +467 @@
 $$(PATH_VirtualBox4)/include/COMWrappers.h: \
                 $(PATH_ROOT)/src/VBox/Main/idl/VirtualBox.xidl \
-                $(PATH_SUB_CURRENT)/include/COMWrappers.xsl \
+                $(VBOX_VIRTUALBOX4_SRC)/include/COMWrappers.xsl \
                 | $$(dir $$@)
         $(call MSG_GENERATE,VirtualBox4,$<,$@)
-        $(QUIET)$(VBOX_XSLTPROC) -o $@ $(VBOX_WRAPPERS_TEMPLATE4) $<
+        $(QUIET)$(VBOX_XSLTPROC) -o $@ $(VBOX_VIRTUALBOX4_SRC)/include/COMWrappers.xsl $<
 
 # alias for generating the COM Wrappers file.
@@ -580 +580 @@
 # Commit the magic.
 # (note: before custom rules that make usage of generated variables!).
-include $(KBUILD_PATH)/footer.kmk
+include $(KBUILD_PATH)/subfooter.kmk