Use the apply-build-vars make macro to replace the @xxx@ markers in most *.in files only at build time.
As some of the markers are local to tools/configure, introduce config/Tools-paths.mk.in and add the related make variables to it. Add Tools-paths to the PATH_FILES make variable in order to include the definitions for replacing them in the *.in files. Add the generated files to the distclean target. Signed-off-by: Juergen Gross <[email protected]> --- V2: - don't rename source files V3: - add Tools-paths to PATH_FILES only in tools/Rules.mk (Jan Beulich) - rename IN_FILES to IN_TARGETS (Jan Beulich) - add only one file to IN_TARGETS per line (Andrew Cooper) - add build target depending on generated files (Andrew Cooper) - use $(RM) instead of rm -f (Andrew Cooper) --- .gitignore | 1 + config/Tools-paths.mk.in | 10 ++++++++++ tools/Rules.mk | 4 ++++ tools/configure | 21 ++------------------- tools/configure.ac | 19 +------------------ tools/hotplug/FreeBSD/Makefile | 13 +++++++++++-- tools/hotplug/Linux/Makefile | 21 +++++++++++++++++++-- tools/hotplug/NetBSD/Makefile | 13 +++++++++++-- tools/hotplug/common/Makefile | 10 +++++++++- tools/ocaml/libs/xs/Makefile | 9 +++++++++ tools/ocaml/xenstored/Makefile | 10 +++++++++- 11 files changed, 86 insertions(+), 45 deletions(-) create mode 100644 config/Tools-paths.mk.in diff --git a/.gitignore b/.gitignore index d83427aba8..57d54f676f 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,7 @@ config.status config.cache config/Toplevel.mk config/Paths.mk +config/Tools-paths.mk dist/* extras/ diff --git a/config/Tools-paths.mk.in b/config/Tools-paths.mk.in new file mode 100644 index 0000000000..ac6298e761 --- /dev/null +++ b/config/Tools-paths.mk.in @@ -0,0 +1,10 @@ +-include $(XEN_ROOT)/config/Paths.mk + +XENSTORED := @XENSTORED@ +XENSTORED_KVA := @XENSTORED_KVA@ +XENSTORED_PORT := @XENSTORED_PORT@ +XEN_RUN_STORED := @XEN_RUN_STORED@ + +LINUX_BACKEND_MODULES := @LINUX_BACKEND_MODULES@ + +qemu_xen_path := @qemu_xen_path@ diff --git a/tools/Rules.mk b/tools/Rules.mk index 725c3c32e9..c3afc836ba 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -11,6 +11,10 @@ XEN_FULLVERSION=$(shell env \ XEN_VENDORVERSION=$(XEN_VENDORVERSION) \ $(SHELL) $(XEN_ROOT)/version.sh --full $(XEN_ROOT)/xen/Makefile) +PATH_FILES += Tools-paths + +-include $(XEN_ROOT)/config/Tools-paths.mk + export _INSTALL := $(INSTALL) INSTALL = $(XEN_ROOT)/tools/cross-install diff --git a/tools/configure b/tools/configure index 3111f5688c..479c7c9a3c 100755 --- a/tools/configure +++ b/tools/configure @@ -2742,7 +2742,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_files="$ac_config_files ../config/Tools.mk hotplug/common/hotplugpath.sh hotplug/FreeBSD/rc.d/xencommons hotplug/FreeBSD/rc.d/xendriverdomain hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/sysconfig.xendomains hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons hotplug/Linux/init.d/xendomains hotplug/Linux/init.d/xendriverdomain hotplug/Linux/launch-xenstore hotplug/Linux/vif-setup hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons hotplug/NetBSD/rc.d/xendriverdomain ocaml/libs/xs/paths.ml ocaml/xenstored/paths.ml ocaml/xenstored/oxenstored.conf" +ac_config_files="$ac_config_files ../config/Tools.mk ../config/Tools-paths.mk" ac_config_headers="$ac_config_headers config.h" @@ -11268,24 +11268,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "../config/Tools.mk") CONFIG_FILES="$CONFIG_FILES ../config/Tools.mk" ;; - "hotplug/common/hotplugpath.sh") CONFIG_FILES="$CONFIG_FILES hotplug/common/hotplugpath.sh" ;; - "hotplug/FreeBSD/rc.d/xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/FreeBSD/rc.d/xencommons" ;; - "hotplug/FreeBSD/rc.d/xendriverdomain") CONFIG_FILES="$CONFIG_FILES hotplug/FreeBSD/rc.d/xendriverdomain" ;; - "hotplug/Linux/init.d/sysconfig.xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/sysconfig.xencommons" ;; - "hotplug/Linux/init.d/sysconfig.xendomains") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/sysconfig.xendomains" ;; - "hotplug/Linux/init.d/xen-watchdog") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/xen-watchdog" ;; - "hotplug/Linux/init.d/xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/xencommons" ;; - "hotplug/Linux/init.d/xendomains") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/xendomains" ;; - "hotplug/Linux/init.d/xendriverdomain") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/xendriverdomain" ;; - "hotplug/Linux/launch-xenstore") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/launch-xenstore" ;; - "hotplug/Linux/vif-setup") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/vif-setup" ;; - "hotplug/Linux/xen-hotplug-common.sh") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/xen-hotplug-common.sh" ;; - "hotplug/Linux/xendomains") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/xendomains" ;; - "hotplug/NetBSD/rc.d/xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/NetBSD/rc.d/xencommons" ;; - "hotplug/NetBSD/rc.d/xendriverdomain") CONFIG_FILES="$CONFIG_FILES hotplug/NetBSD/rc.d/xendriverdomain" ;; - "ocaml/libs/xs/paths.ml") CONFIG_FILES="$CONFIG_FILES ocaml/libs/xs/paths.ml" ;; - "ocaml/xenstored/paths.ml") CONFIG_FILES="$CONFIG_FILES ocaml/xenstored/paths.ml" ;; - "ocaml/xenstored/oxenstored.conf") CONFIG_FILES="$CONFIG_FILES ocaml/xenstored/oxenstored.conf" ;; + "../config/Tools-paths.mk") CONFIG_FILES="$CONFIG_FILES ../config/Tools-paths.mk" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "hotplug/Linux/systemd/proc-xen.mount") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/proc-xen.mount" ;; "hotplug/Linux/systemd/xen-init-dom0.service") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/xen-init-dom0.service" ;; diff --git a/tools/configure.ac b/tools/configure.ac index 285b4ea128..ecd45e782e 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -7,24 +7,7 @@ AC_INIT([Xen Hypervisor Tools], m4_esyscmd([../version.sh ../xen/Makefile]), AC_CONFIG_SRCDIR([libs/light/libxl.c]) AC_CONFIG_FILES([ ../config/Tools.mk -hotplug/common/hotplugpath.sh -hotplug/FreeBSD/rc.d/xencommons -hotplug/FreeBSD/rc.d/xendriverdomain -hotplug/Linux/init.d/sysconfig.xencommons -hotplug/Linux/init.d/sysconfig.xendomains -hotplug/Linux/init.d/xen-watchdog -hotplug/Linux/init.d/xencommons -hotplug/Linux/init.d/xendomains -hotplug/Linux/init.d/xendriverdomain -hotplug/Linux/launch-xenstore -hotplug/Linux/vif-setup -hotplug/Linux/xen-hotplug-common.sh -hotplug/Linux/xendomains -hotplug/NetBSD/rc.d/xencommons -hotplug/NetBSD/rc.d/xendriverdomain -ocaml/libs/xs/paths.ml -ocaml/xenstored/paths.ml -ocaml/xenstored/oxenstored.conf +../config/Tools-paths.mk ]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([../]) diff --git a/tools/hotplug/FreeBSD/Makefile b/tools/hotplug/FreeBSD/Makefile index a6552c9884..a7c1c461ef 100644 --- a/tools/hotplug/FreeBSD/Makefile +++ b/tools/hotplug/FreeBSD/Makefile @@ -8,9 +8,17 @@ XEN_SCRIPT_DATA := XEN_RCD_PROG := rc.d/xencommons rc.d/xendriverdomain +IN_TARGETS := rc.d/xencommons +IN_TARGETS += rc.d/xendriverdomain + .PHONY: all all: +$(foreach file,$(IN_TARGETS),$(eval $(call apply-build-vars,$(file)))) + +.PHONY: build +build: $(IN_TARGETS) + .PHONY: install install: install-scripts install-rcd @@ -18,7 +26,7 @@ install: install-scripts install-rcd uninstall: uninstall-script uninstall-rcd .PHONY: install-scripts -install-scripts: +install-scripts: build $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR) set -e; for i in $(XEN_SCRIPTS); \ do \ @@ -35,7 +43,7 @@ uninstall-scripts: rm -f $(addprefix $(DESTDIR)$(XEN_SCRIPT_DIR)/, $(XEN_SCRIPT_DATA)) .PHONY: install-rcd -install-rcd: +install-rcd: build $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) set -e; for i in $(XEN_RCD_PROG); \ do \ @@ -51,3 +59,4 @@ clean: .PHONY: distclean distclean: clean + $(RM) $(IN_TARGETS) diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index 9a7b3a3515..b60e39e1cd 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -26,9 +26,25 @@ XEN_SCRIPT_DATA := xen-script-common.sh locking.sh logging.sh XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh XEN_SCRIPT_DATA += block-common.sh +IN_TARGETS := launch-xenstore +IN_TARGETS += vif-setup +IN_TARGETS += xendomains +IN_TARGETS += xen-hotplug-common.sh +IN_TARGETS += init.d/sysconfig.xendomains +IN_TARGETS += init.d/xen-watchdog +IN_TARGETS += init.d/xencommons +IN_TARGETS += init.d/xendomains +IN_TARGETS += init.d/xendriverdomain +IN_TARGETS += init.d/sysconfig.xencommons + .PHONY: all all: subdirs-all +$(foreach file,$(IN_TARGETS),$(eval $(call apply-build-vars,$(file)))) + +.PHONY: build +build: $(IN_TARGETS) + .PHONY: install install: install-initd install-scripts subdirs-install @@ -37,7 +53,7 @@ uninstall: uninstall-initd uninstall-scripts subdirs-uninstall # See docs/misc/distro_mapping.txt for INITD_DIR location .PHONY: install-initd -install-initd: +install-initd: build $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) @@ -60,7 +76,7 @@ uninstall-initd: rm -f $(DESTDIR)$(SYSCONFIG_DIR)/xendomains .PHONY: install-scripts -install-scripts: +install-scripts: build $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR) set -e; for i in $(XEN_SCRIPTS); \ do \ @@ -81,3 +97,4 @@ clean: subdirs-clean .PHONY: distclean distclean: clean + $(RM) $(IN_TARGETS) diff --git a/tools/hotplug/NetBSD/Makefile b/tools/hotplug/NetBSD/Makefile index 1cd3db2ccb..8ae788131e 100644 --- a/tools/hotplug/NetBSD/Makefile +++ b/tools/hotplug/NetBSD/Makefile @@ -12,9 +12,17 @@ XEN_SCRIPTS += qemu-ifup XEN_SCRIPT_DATA := XEN_RCD_PROG := rc.d/xencommons rc.d/xendomains rc.d/xen-watchdog rc.d/xendriverdomain +IN_TARGETS := rc.d/xencommons +IN_TARGETS += rc.d/xendriverdomain + .PHONY: all all: +$(foreach file,$(IN_TARGETS),$(eval $(call apply-build-vars,$(file)))) + +.PHONY: build +build: $(IN_TARGETS) + .PHONY: install install: install-scripts install-rcd @@ -22,7 +30,7 @@ install: install-scripts install-rcd uninstall: uninstall-scripts uninstall-rcd .PHONY: install-scripts -install-scripts: +install-scripts: build $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR) set -e; for i in $(XEN_SCRIPTS); \ do \ @@ -39,7 +47,7 @@ uninstall-scripts: rm -f $(addprefix $(DESTDIR)$(XEN_SCRIPT_DIR)/, $(XEN_SCRIPT_DATA)) .PHONY: install-rcd -install-rcd: +install-rcd: build $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) set -e; for i in $(XEN_RCD_PROG); \ do \ @@ -57,3 +65,4 @@ clean: .PHONY: distclean distclean: clean + $(RM) $(IN_TARGETS) diff --git a/tools/hotplug/common/Makefile b/tools/hotplug/common/Makefile index 62afe1019e..3b0b5a0296 100644 --- a/tools/hotplug/common/Makefile +++ b/tools/hotplug/common/Makefile @@ -7,8 +7,15 @@ include $(XEN_ROOT)/tools/Rules.mk XEN_SCRIPTS := XEN_SCRIPT_DATA := hotplugpath.sh +IN_TARGETS := hotplugpath.sh + .PHONY: all -all: +all: build + +$(foreach file,$(IN_TARGETS),$(eval $(call apply-build-vars,$(file)))) + +.PHONY: build +build: $(IN_TARGETS) .PHONY: install install: install-scripts @@ -38,3 +45,4 @@ clean: .PHONY: distclean distclean: clean + $(RM) $(IN_TARGETS) diff --git a/tools/ocaml/libs/xs/Makefile b/tools/ocaml/libs/xs/Makefile index e160e6a711..b0963611fb 100644 --- a/tools/ocaml/libs/xs/Makefile +++ b/tools/ocaml/libs/xs/Makefile @@ -8,6 +8,8 @@ OCAMLOPTFLAGS += -for-pack Xenstore .NOTPARALLEL: # Ocaml is such a PITA! +IN_TARGETS := paths.ml + PREINTF = xsraw.cmi xst.cmi PREOBJS = queueop xsraw xst PRELIBS = $(foreach obj, $(PREOBJS),$(obj).cmo) $(foreach obj,$(PREOJBS),$(obj).cmx) @@ -17,6 +19,10 @@ LIBS = xenstore.cma xenstore.cmxa all: $(PREINTF) $(PRELIBS) $(INTF) $(LIBS) $(PROGRAMS) +$(foreach file,$(IN_TARGETS),$(eval $(call apply-build-vars,$(file)))) + +$(OBJS): $(IN_TARGETS) + bins: $(PROGRAMS) libs: $(LIBS) @@ -43,4 +49,7 @@ install: $(LIBS) META uninstall: $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenstore +.PHONY: distclean + $(RM) $(IN_TARGETS) + include $(OCAML_TOPLEVEL)/Makefile.rules diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index c333394a34..b3d1a8b8de 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -72,6 +72,9 @@ XENSTOREDLIBS = \ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xsd_glue $(OCAML_TOPLEVEL)/libs/xsd_glue/plugin_interface_v1.cmxa \ -ccopt -L -ccopt $(XEN_ROOT)/tools/libs/ctrl +IN_TARGETS := paths.ml +IN_TARGETS += oxenstored.conf + PROGRAMS = oxenstored oxenstored_LIBS = $(XENSTOREDLIBS) @@ -83,7 +86,9 @@ oxenstored_OBJS = $(oxenstored_MLSORTED:.ml=) OCAML_PROGRAM = oxenstored -all: $(INTF) $(LIBS) $(PROGRAMS) +all: $(IN_TARGETS) $(INTF) $(LIBS) $(PROGRAMS) + +$(foreach file,$(IN_TARGETS),$(eval $(call apply-build-vars,$(file)))) bins: $(PROGRAMS) @@ -99,4 +104,7 @@ uninstall: rm -f $(DESTDIR)$(XEN_CONFIG_DIR)/oxenstored.conf rm -f $(DESTDIR)$(sbindir)/oxenstored +distclean: + $(RM) $(IN_TARGETS) + include $(OCAML_TOPLEVEL)/Makefile.rules -- 2.51.0
