Changeset 35368 in vbox for trunk/src/VBox/Frontends/VBoxBFE/Makefile.kmk

Timestamp:

Dec 30, 2010 1:38:23 PM (14 years ago)

Author:

vboxsync

Message:

Main: source re-org.

File:

• trunk/src/VBox/Frontends/VBoxBFE/Makefile.kmk (modified) (3 diffs)

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

@@ -23 +23 @@
 # Files from Main needed for building VBoxBFE
 #
-VBOXBFE_MAIN_CPP = MouseImpl.cpp
-VBOXBFE_MAIN_H   = MouseImpl.h ConsoleEvents.h
+VBOXBFE_MAIN_SRCS = src-client/MouseImpl.cpp
+VBOXBFE_MAIN_HDRS = MouseImpl.h ConsoleEvents.h
 
 #
@@ -69 +69 @@
         VMMDevInterface.cpp \
         DisplayImpl.cpp \
-        $(PATH_VBoxBFE)/MouseImpl.cpp \
         KeyboardImpl.cpp \
         StatusImpl.cpp \
         MachineDebuggerImpl.cpp \
-        VMControl.cpp
+        VMControl.cpp \
+        $(addprefix $(VBoxBFE_0_OUTDIR)/,$(notdir $(VBOXBFE_MAIN_SRCS)))
 
 ifdef VBOX_WITH_HGCM
@@ -166 +166 @@
         $(QUIET)$(VBOX_BIN2C) Ico64x01 $< $@
 
-VBoxBFE_DEPS += $(addprefix $(PATH_VBoxBFE)/,$(VBOXBFE_MAIN_CPP) $(VBOXBFE_MAIN_H))
+# Files we share with Main needs to be copied into the output dir.
+VBoxBFE_INTERMEDIATES += $(addprefix $(VBoxBFE_0_OUTDIR)/,$(VBOXBFE_MAIN_HDRS))
+VBoxBFE_CLEAN         += $(addprefix $(VBoxBFE_0_OUTDIR)/, $(VBOXBFE_MAIN_HDRS) $(VBOXBFE_MAIN_SRCS))
 
-# Pattern rules for copying needed files from Main
-$(addprefix $$(PATH_VBoxBFE)/,$(VBOXBFE_MAIN_CPP)): \
-                $$(PATH_VBoxBFE)/% : $(PATH_ROOT)/src/VBox/Main/% | $$(dir $$@)
+define def_copy_main_file
+$$(VBoxBFE_0_OUTDIR)/$(notdir $(file)): $(PATH_ROOT)/src/VBox/Main/$(file) | $$(dir $$@)
         $(call MSG_INST_FILE,$<,$@)
-        $(QUIET)$(CP_EXT) $< $@
+        $(QUIET)$(CP_EXT) -f $< $@
+endef
+$(foreach file,$(addprefix include/,$(VBOXBFE_MAIN_HDRS)), $(evalval def_copy_main_file))
+$(foreach file,$(VBOXBFE_MAIN_SRCS), $(evalval def_copy_main_file))
 
-$(addprefix $$(PATH_VBoxBFE)/,$(VBOXBFE_MAIN_H)): \
-                $$(PATH_VBoxBFE)/% : $(PATH_ROOT)/src/VBox/Main/include/% | $$(dir $$@)
-        $(call MSG_INST_FILE,$<,$@)
-        $(QUIET)$(CP_EXT) $< $@
-
-OTHER_CLEAN += \
-        $(addprefix $(PATH_VBoxBFE)/,$(VBOXBFE_MAIN_CPP)) \
-        $(addprefix $(PATH_VBoxBFE)/,$(VBOXBFE_MAIN_H))