mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
Config.mk: replace dependency to genpath with actual target
genpath is a detail of buildmakevars2file. Replace the dependency to genpath with the actual buildmakevars2file target. This change by itself does not fix any bug. Upcoming changes will add dependencies to $(target), but no rule exist to create $(target). To force a rebuild of the $(1) rule the target now depends on the existing .phony target. This dummy target is already used elsewhere in the code. No change in behaviour is expected by this patch. Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Campbell <ian.campbell@citrix.com>
This commit is contained in:
Olaf Hering authored and Ian Campbell committed
1 parent
c0f5ce5321
commit
19a585606d
4 files changed
+13
-14
No files matched your search
@@ -172,8 +172,7 @@ BUILD_MAKE_VARS := SBINDIR BINDIR LIBEXEC LIBDIR SHAREDIR PRIVATE_BINDIR \
|
||||
|
||||
buildmakevars2file = $(eval $(call buildmakevars2file-closure,$(1)))
|
||||
define buildmakevars2file-closure
|
||||
.PHONY: genpath
|
||||
genpath:
|
||||
$(1): .phony
|
||||
rm -f $(1).tmp; \
|
||||
$(foreach var, $(BUILD_MAKE_VARS), \
|
||||
echo "$(var)=\"$($(var))\"" >>$(1).tmp;) \
|
||||
|
||||
+10
-10
@@ -48,18 +48,18 @@ TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib
|
||||
|
||||
TARGETS=$(STUBDOM_TARGETS)
|
||||
|
||||
.PHONY: all
|
||||
all: build
|
||||
ifeq ($(STUBDOM_SUPPORTED),1)
|
||||
build: genpath $(STUBDOM_BUILD)
|
||||
else
|
||||
build: genpath
|
||||
endif
|
||||
|
||||
STUBDOMPATH="stubdompath.sh"
|
||||
genpath-target = $(call buildmakevars2file,$(STUBDOMPATH))
|
||||
$(eval $(genpath-target))
|
||||
|
||||
.PHONY: all
|
||||
all: build
|
||||
ifeq ($(STUBDOM_SUPPORTED),1)
|
||||
build: $(STUBDOMPATH) $(STUBDOM_BUILD)
|
||||
else
|
||||
build: $(STUBDOMPATH)
|
||||
endif
|
||||
|
||||
##############
|
||||
# Cross-newlib
|
||||
##############
|
||||
@@ -450,9 +450,9 @@ xenstore-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstore libxc xenstore
|
||||
#########
|
||||
|
||||
ifeq ($(STUBDOM_SUPPORTED),1)
|
||||
install: genpath install-readme $(STUBDOM_INSTALL)
|
||||
install: $(STUBDOMPATH) install-readme $(STUBDOM_INSTALL)
|
||||
else
|
||||
install: genpath
|
||||
install: $(STUBDOMPATH)
|
||||
endif
|
||||
|
||||
install-readme:
|
||||
|
||||
@@ -16,7 +16,7 @@ $(eval $(genpath-target))
|
||||
all: build
|
||||
|
||||
.PHONY: build
|
||||
build: genpath
|
||||
build: $(HOTPLUGPATH)
|
||||
|
||||
.PHONY: install
|
||||
install: all install-scripts
|
||||
|
||||
@@ -163,7 +163,7 @@ _%.api-for-check: %.h $(AUTOINCS)
|
||||
>$@.new
|
||||
mv -f $@.new $@
|
||||
|
||||
_paths.h: genpath
|
||||
_paths.h: _paths.h.tmp
|
||||
sed -e "s/\([^=]*\)=\(.*\)/#define \1 \2/g" $@.tmp >$@.2.tmp
|
||||
rm -f $@.tmp
|
||||
$(call move-if-changed,$@.2.tmp,$@)
|
||||
|
||||