Changeset 37880 in vbox for trunk/src/VBox/Installer

Timestamp:

Jul 12, 2011 9:12:30 AM (14 years ago)

Author:

vboxsync

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

72779

Message:

Installer/linux/Makefile.kmk: Don't glob twice (prerequisites are expanded when reading the makefile) and name the variable sensibly (there is no 'local' variables on the Makefile level yet, only in defines and such).

File:

• trunk/src/VBox/Installer/linux/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -379 +379 @@
 # to the module source directories.
 #
-local arch_deps = \
-                $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/, $(VBOX_LNX_ARCH_FILES)) \
-                $(VBOX_LNX_INST_DEP_ON_MAKEFILE) \
-                $(VBOX_VERSION_STAMP) \
-                $(wildcard $(PATH_BIN)/src/*) \
-                $(wildcard $(PATH_BIN)/src/*/*) \
-                $(wildcard $(PATH_BIN)/src/*/*/*) \
-                $(wildcard $(PATH_BIN)/src/*/*/*/*)
+VBoxLnxInstArchDeps := \
+        $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/, $(VBOX_LNX_ARCH_FILES)) \
+        $(VBOX_LNX_INST_DEP_ON_MAKEFILE) \
+        $(VBOX_VERSION_STAMP) \
+        $(wildcard $(PATH_BIN)/src/*) \
+        $(wildcard $(PATH_BIN)/src/*/*) \
+        $(wildcard $(PATH_BIN)/src/*/*/*) \
+        $(wildcard $(PATH_BIN)/src/*/*/*/*)
 
 
@@ -392 +392 @@
 # .tar.bz2 for converting into .run
 #
-$(VBOX_LNX_INST_STAGE_DIR)/VirtualBox.tar.bz2: \
-                $(arch_deps)
+$(VBOX_LNX_INST_STAGE_DIR)/VirtualBox.tar.bz2: $(VBoxLnxInstArchDeps)
         $(call MSG_L1,Packing $@)
         $(QUIET)$(RM) -f -- $@ $(patsubst %.bz2,%,$@)
@@ -408 +407 @@
 # .tar.bz2 for distribution with the files under VirtualBox-<ver>/.
 #
-$(PATH_BIN)/VirtualBox.tar.bz2: \
-                $(arch_deps)
+$(PATH_BIN)/VirtualBox.tar.bz2: $(VBoxLnxInstArchDeps)
         $(call MSG_L1,Packing $@)
         $(QUIET)$(RM) -f -- $(VBOX_LNX_INST_OUT_DIR)/VirtualBox-$(VBOX_VERSION_STRING) $@ $(patsubst %.bz2,%,$@)