From nobody Wed Nov 19 03:20:06 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1763120005; cv=none; d=zohomail.com; s=zohoarc; b=P6xzJUIp2SKMgk14ZSRoTC3CcdkMpqzL9xl3GN8U4cVrtBF+o/XjQaIqeNLQ+K4SZYdlqDG+ITD8pARPE5hkhNx/h0VUO4T9/XV4Yt6vVvyMogoyqY/QkWVYshGMdC7LJh7/Qaqpg5sfrdfQTErUdhTQyrDroWEhs8Rbs7ON30M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763120005; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=cqrX1vxyYUVBqUz0HLEJ2M0JuWIrU5qpOakfLpsYylE=; b=ZUWDPn803uQGzZxmQ4Rv8DIJrVm1AILcsDnxvMeLxMbSwwgQK+c8pqiC+/evUutyjgKUiSEnTuXMw1fpOLQ3dSZYw9zZQwvpEDdjcgr+sA+Z19++ZIUscsWl5OOoQHbNk5ITgLFpaq1evQEqyMpmTPtJKJAJO3pnsV2+M2aGGMM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1763120005284418.74931638729106; Fri, 14 Nov 2025 03:33:25 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1162456.1490123 (Exim 4.92) (envelope-from ) id 1vJs38-0002jJ-Sl; Fri, 14 Nov 2025 11:33:06 +0000 Received: by outflank-mailman (output) from mailman id 1162456.1490123; Fri, 14 Nov 2025 11:33:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vJs38-0002j8-Pq; Fri, 14 Nov 2025 11:33:06 +0000 Received: by outflank-mailman (input) for mailman id 1162456; Fri, 14 Nov 2025 11:33:05 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vJs37-0001jd-Dv for xen-devel@lists.xenproject.org; Fri, 14 Nov 2025 11:33:05 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [2a07:de40:b251:101:10:150:64:2]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id af2e087d-c14d-11f0-9d18-b5c5bf9af7f9; Fri, 14 Nov 2025 12:33:04 +0100 (CET) Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 1B9331F460; Fri, 14 Nov 2025 11:33:04 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id AAB383EA61; Fri, 14 Nov 2025 11:33:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id GC7fJ28TF2naSwAAD6G6ig (envelope-from ); Fri, 14 Nov 2025 11:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: af2e087d-c14d-11f0-9d18-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1763119984; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cqrX1vxyYUVBqUz0HLEJ2M0JuWIrU5qpOakfLpsYylE=; b=DawyupUTEwG1FdnJn34Gw9rX6M7Mz7Qm7K+YjUS1co3WDIwQmoNm3rjGbuE85VD1u31t74 OmV6OL6vxBZCcFusXWQOwnoqYqR4SJO4U/jixvoJbI53VbNKQer1ElgychE97AzQmAo8gr LVa5n5qoaY21vMQ5HFTCFAmlZKQQDBI= Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1763119984; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cqrX1vxyYUVBqUz0HLEJ2M0JuWIrU5qpOakfLpsYylE=; b=DawyupUTEwG1FdnJn34Gw9rX6M7Mz7Qm7K+YjUS1co3WDIwQmoNm3rjGbuE85VD1u31t74 OmV6OL6vxBZCcFusXWQOwnoqYqR4SJO4U/jixvoJbI53VbNKQer1ElgychE97AzQmAo8gr LVa5n5qoaY21vMQ5HFTCFAmlZKQQDBI= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , Christian Lindig , David Scott Subject: [PATCH v2 4/4] tools: replace @xxx@ markers at build time Date: Fri, 14 Nov 2025 12:32:38 +0100 Message-ID: <20251114113238.9279-5-jgross@suse.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251114113238.9279-1-jgross@suse.com> References: <20251114113238.9279-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-6.80 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCPT_COUNT_SEVEN(0.00)[11]; FROM_EQ_ENVFROM(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; TO_DN_SOME(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Spam-Flag: NO X-Spam-Score: -6.80 X-Spam-Level: X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1763120007879153000 Content-Type: text/plain; charset="utf-8" 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 --- V2: - don't rename source files --- .gitignore | 1 + Config.mk | 2 +- config/Tools-paths.mk.in | 10 ++++++++++ tools/configure | 21 ++------------------- tools/configure.ac | 19 +------------------ tools/hotplug/FreeBSD/Makefile | 7 ++++++- tools/hotplug/Linux/Makefile | 10 +++++++++- tools/hotplug/NetBSD/Makefile | 7 ++++++- tools/hotplug/common/Makefile | 7 ++++++- tools/ocaml/libs/xs/Makefile | 9 +++++++++ tools/ocaml/xenstored/Makefile | 9 ++++++++- 11 files changed, 59 insertions(+), 43 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 =20 dist/* extras/ diff --git a/Config.mk b/Config.mk index d21d67945a..8d1368d25b 100644 --- a/Config.mk +++ b/Config.mk @@ -159,7 +159,7 @@ define move-if-changed if ! cmp -s $(1) $(2); then mv -f $(1) $(2); else rm -f $(1); fi endef =20 -PATH_FILES :=3D Paths +PATH_FILES :=3D Paths Tools-paths INC_FILES :=3D $(foreach f, $(PATH_FILES), $(XEN_ROOT)/config/$(f).mk) =20 include $(INC_FILES) 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 :=3D @XENSTORED@ +XENSTORED_KVA :=3D @XENSTORED_KVA@ +XENSTORED_PORT :=3D @XENSTORED_PORT@ +XEN_RUN_STORED :=3D @XEN_RUN_STORED@ + +LINUX_BACKEND_MODULES :=3D @LINUX_BACKEND_MODULES@ + +qemu_xen_path :=3D @qemu_xen_path@ 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=3D$ac_cv_c_compiler_gnu =20 =20 =20 -ac_config_files=3D"$ac_config_files ../config/Tools.mk hotplug/common/hotp= lugpath.sh hotplug/FreeBSD/rc.d/xencommons hotplug/FreeBSD/rc.d/xendriverdo= main hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/sysconf= ig.xendomains hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencom= mons hotplug/Linux/init.d/xendomains hotplug/Linux/init.d/xendriverdomain h= otplug/Linux/launch-xenstore hotplug/Linux/vif-setup hotplug/Linux/xen-hotp= lug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons hotpl= ug/NetBSD/rc.d/xendriverdomain ocaml/libs/xs/paths.ml ocaml/xenstored/paths= .ml ocaml/xenstored/oxenstored.conf" +ac_config_files=3D"$ac_config_files ../config/Tools.mk ../config/Tools-pat= hs.mk" =20 ac_config_headers=3D"$ac_config_headers config.h" =20 @@ -11268,24 +11268,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "../config/Tools.mk") CONFIG_FILES=3D"$CONFIG_FILES ../config/Tools.mk= " ;; - "hotplug/common/hotplugpath.sh") CONFIG_FILES=3D"$CONFIG_FILES hotplug= /common/hotplugpath.sh" ;; - "hotplug/FreeBSD/rc.d/xencommons") CONFIG_FILES=3D"$CONFIG_FILES hotpl= ug/FreeBSD/rc.d/xencommons" ;; - "hotplug/FreeBSD/rc.d/xendriverdomain") CONFIG_FILES=3D"$CONFIG_FILES = hotplug/FreeBSD/rc.d/xendriverdomain" ;; - "hotplug/Linux/init.d/sysconfig.xencommons") CONFIG_FILES=3D"$CONFIG_F= ILES hotplug/Linux/init.d/sysconfig.xencommons" ;; - "hotplug/Linux/init.d/sysconfig.xendomains") CONFIG_FILES=3D"$CONFIG_F= ILES hotplug/Linux/init.d/sysconfig.xendomains" ;; - "hotplug/Linux/init.d/xen-watchdog") CONFIG_FILES=3D"$CONFIG_FILES hot= plug/Linux/init.d/xen-watchdog" ;; - "hotplug/Linux/init.d/xencommons") CONFIG_FILES=3D"$CONFIG_FILES hotpl= ug/Linux/init.d/xencommons" ;; - "hotplug/Linux/init.d/xendomains") CONFIG_FILES=3D"$CONFIG_FILES hotpl= ug/Linux/init.d/xendomains" ;; - "hotplug/Linux/init.d/xendriverdomain") CONFIG_FILES=3D"$CONFIG_FILES = hotplug/Linux/init.d/xendriverdomain" ;; - "hotplug/Linux/launch-xenstore") CONFIG_FILES=3D"$CONFIG_FILES hotplug= /Linux/launch-xenstore" ;; - "hotplug/Linux/vif-setup") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux= /vif-setup" ;; - "hotplug/Linux/xen-hotplug-common.sh") CONFIG_FILES=3D"$CONFIG_FILES h= otplug/Linux/xen-hotplug-common.sh" ;; - "hotplug/Linux/xendomains") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linu= x/xendomains" ;; - "hotplug/NetBSD/rc.d/xencommons") CONFIG_FILES=3D"$CONFIG_FILES hotplu= g/NetBSD/rc.d/xencommons" ;; - "hotplug/NetBSD/rc.d/xendriverdomain") CONFIG_FILES=3D"$CONFIG_FILES h= otplug/NetBSD/rc.d/xendriverdomain" ;; - "ocaml/libs/xs/paths.ml") CONFIG_FILES=3D"$CONFIG_FILES ocaml/libs/xs/= paths.ml" ;; - "ocaml/xenstored/paths.ml") CONFIG_FILES=3D"$CONFIG_FILES ocaml/xensto= red/paths.ml" ;; - "ocaml/xenstored/oxenstored.conf") CONFIG_FILES=3D"$CONFIG_FILES ocaml= /xenstored/oxenstored.conf" ;; + "../config/Tools-paths.mk") CONFIG_FILES=3D"$CONFIG_FILES ../config/To= ols-paths.mk" ;; "config.h") CONFIG_HEADERS=3D"$CONFIG_HEADERS config.h" ;; "hotplug/Linux/systemd/proc-xen.mount") CONFIG_FILES=3D"$CONFIG_FILES = hotplug/Linux/systemd/proc-xen.mount" ;; "hotplug/Linux/systemd/xen-init-dom0.service") CONFIG_FILES=3D"$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..8de923781c 100644 --- a/tools/hotplug/FreeBSD/Makefile +++ b/tools/hotplug/FreeBSD/Makefile @@ -8,9 +8,13 @@ XEN_SCRIPT_DATA :=3D =20 XEN_RCD_PROG :=3D rc.d/xencommons rc.d/xendriverdomain =20 +IN_FILES :=3D rc.d/xencommons rc.d/xendriverdomain + .PHONY: all all: =20 +$(foreach file,$(IN_FILES),$(eval $(call apply-build-vars,$(file)))) + .PHONY: install install: install-scripts install-rcd =20 @@ -35,7 +39,7 @@ uninstall-scripts: rm -f $(addprefix $(DESTDIR)$(XEN_SCRIPT_DIR)/, $(XEN_SCRIPT_DATA)) =20 .PHONY: install-rcd -install-rcd: +install-rcd: $(IN_FILES) $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) set -e; for i in $(XEN_RCD_PROG); \ do \ @@ -51,3 +55,4 @@ clean: =20 .PHONY: distclean distclean: clean + rm -rf $(IN_FILES) diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index 9a7b3a3515..6fcf84a6f4 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -26,9 +26,16 @@ XEN_SCRIPT_DATA :=3D xen-script-common.sh locking.sh log= ging.sh XEN_SCRIPT_DATA +=3D xen-hotplug-common.sh xen-network-common.sh vif-commo= n.sh XEN_SCRIPT_DATA +=3D block-common.sh =20 +IN_FILES :=3D launch-xenstore vif-setup xendomains xen-hotplug-common.sh +IN_FILES +=3D init.d/sysconfig.xendomains init.d/xen-watchdog +IN_FILES +=3D init.d/xencommons init.d/xendomains +IN_FILES +=3D init.d/xendriverdomain init.d/sysconfig.xencommons + .PHONY: all all: subdirs-all =20 +$(foreach file,$(IN_FILES),$(eval $(call apply-build-vars,$(file)))) + .PHONY: install install: install-initd install-scripts subdirs-install =20 @@ -37,7 +44,7 @@ uninstall: uninstall-initd uninstall-scripts subdirs-unin= stall =20 # See docs/misc/distro_mapping.txt for INITD_DIR location .PHONY: install-initd -install-initd: +install-initd: $(IN_FILES) $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) @@ -81,3 +88,4 @@ clean: subdirs-clean =20 .PHONY: distclean distclean: clean + rm -rf $(IN_FILES) diff --git a/tools/hotplug/NetBSD/Makefile b/tools/hotplug/NetBSD/Makefile index 1cd3db2ccb..4ac6bd8fa7 100644 --- a/tools/hotplug/NetBSD/Makefile +++ b/tools/hotplug/NetBSD/Makefile @@ -12,9 +12,13 @@ XEN_SCRIPTS +=3D qemu-ifup XEN_SCRIPT_DATA :=3D XEN_RCD_PROG :=3D rc.d/xencommons rc.d/xendomains rc.d/xen-watchdog rc.d/x= endriverdomain =20 +IN_FILES :=3D rc.d/xencommons rc.d/xendriverdomain + .PHONY: all all: =20 +$(foreach file,$(IN_FILES),$(eval $(call apply-build-vars,$(file)))) + .PHONY: install install: install-scripts install-rcd =20 @@ -39,7 +43,7 @@ uninstall-scripts: rm -f $(addprefix $(DESTDIR)$(XEN_SCRIPT_DIR)/, $(XEN_SCRIPT_DATA)) =20 .PHONY: install-rcd -install-rcd: +install-rcd: $(IN_FILES) $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) set -e; for i in $(XEN_RCD_PROG); \ do \ @@ -57,3 +61,4 @@ clean: =20 .PHONY: distclean distclean: clean + rm -rf $(IN_FILES) diff --git a/tools/hotplug/common/Makefile b/tools/hotplug/common/Makefile index 62afe1019e..0017332293 100644 --- a/tools/hotplug/common/Makefile +++ b/tools/hotplug/common/Makefile @@ -7,9 +7,13 @@ include $(XEN_ROOT)/tools/Rules.mk XEN_SCRIPTS :=3D XEN_SCRIPT_DATA :=3D hotplugpath.sh =20 +IN_FILES :=3D hotplugpath.sh + .PHONY: all all: =20 +$(foreach file,$(IN_FILES),$(eval $(call apply-build-vars,$(file)))) + .PHONY: install install: install-scripts =20 @@ -17,7 +21,7 @@ install: install-scripts uninstall: uninstall-scripts =20 .PHONY: install-scripts -install-scripts: all +install-scripts: all $(IN_FILES) $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR) set -e; for i in $(XEN_SCRIPTS); \ do \ @@ -38,3 +42,4 @@ clean: =20 .PHONY: distclean distclean: clean + rm -rf $(IN_FILES) diff --git a/tools/ocaml/libs/xs/Makefile b/tools/ocaml/libs/xs/Makefile index e160e6a711..7d70d0904c 100644 --- a/tools/ocaml/libs/xs/Makefile +++ b/tools/ocaml/libs/xs/Makefile @@ -8,6 +8,8 @@ OCAMLOPTFLAGS +=3D -for-pack Xenstore .NOTPARALLEL: # Ocaml is such a PITA! =20 +IN_FILES :=3D paths.ml + PREINTF =3D xsraw.cmi xst.cmi PREOBJS =3D queueop xsraw xst PRELIBS =3D $(foreach obj, $(PREOBJS),$(obj).cmo) $(foreach obj,$(PREOJBS)= ,$(obj).cmx) @@ -17,6 +19,10 @@ LIBS =3D xenstore.cma xenstore.cmxa =20 all: $(PREINTF) $(PRELIBS) $(INTF) $(LIBS) $(PROGRAMS) =20 +$(foreach file,$(IN_FILES),$(eval $(call apply-build-vars,$(file)))) + +$(OBJS): $(IN_FILES) + bins: $(PROGRAMS) =20 libs: $(LIBS) @@ -43,4 +49,7 @@ install: $(LIBS) META uninstall: $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenstore =20 +.PHONY: distclean + rm -rf $(IN_FILES) + include $(OCAML_TOPLEVEL)/Makefile.rules diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index c333394a34..2576991030 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -72,6 +72,8 @@ XENSTOREDLIBS =3D \ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xsd_glue $(OCAML_TOPLEVEL)/libs/x= sd_glue/plugin_interface_v1.cmxa \ -ccopt -L -ccopt $(XEN_ROOT)/tools/libs/ctrl =20 +IN_FILES :=3D paths.ml oxenstored.conf + PROGRAMS =3D oxenstored =20 oxenstored_LIBS =3D $(XENSTOREDLIBS) @@ -83,7 +85,9 @@ oxenstored_OBJS =3D $(oxenstored_MLSORTED:.ml=3D) =20 OCAML_PROGRAM =3D oxenstored =20 -all: $(INTF) $(LIBS) $(PROGRAMS) +all: $(IN_FILES) $(INTF) $(LIBS) $(PROGRAMS) + +$(foreach file,$(IN_FILES),$(eval $(call apply-build-vars,$(file)))) =20 bins: $(PROGRAMS) =20 @@ -99,4 +103,7 @@ uninstall: rm -f $(DESTDIR)$(XEN_CONFIG_DIR)/oxenstored.conf rm -f $(DESTDIR)$(sbindir)/oxenstored =20 +distclean: + rm -rf $(IN_FILES) + include $(OCAML_TOPLEVEL)/Makefile.rules --=20 2.51.0