From nobody Mon Feb 9 11:30:50 2026 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1597496668; cv=none; d=zohomail.com; s=zohoarc; b=gJ8XDZ4pvAoPacdR2HV/9e9gFrxoxVsk74CgBDVMSdqkuYyWjSD5iQEHeSEEskCr7DMoLHK3yXiJuTRmPhubfHhkHsyRPVFu4A51QLsqwjiW1oIIVs9XSF7Y0Reg2ScinFogKNj5lf+yQnSH97kMshgZuaccMESXkkbtjgoyJ3I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597496668; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=p4oz6Um3cLyCaLCFAJH7fPNT5sUk8qwjDIclpmWkrLQ=; b=CBTzIGzT9wwuiyojhwzI77kdbAo67IefTbf+di8TGmDcJpd1bIsiOtn/esLtoxhu940xBmHDwAasBjJiGvQ/i+Df0vrRbzrrltxf9AW+lBDcOhW+ksXaTZjtDpFOzo2lR93ybOutuVKMsLDC0jRh6YrqhwBBWCL68mX0PUQchPo= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1597496668224614.0430873829624; Sat, 15 Aug 2020 06:04:28 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k6vqj-0006R6-IV; Sat, 15 Aug 2020 13:03:53 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k6vqi-0006Qw-QT for xen-devel@lists.xenproject.org; Sat, 15 Aug 2020 13:03:52 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ba06c901-3d43-4400-b417-ba719b71ea38; Sat, 15 Aug 2020 13:03:51 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id D91ABB57D; Sat, 15 Aug 2020 13:04:13 +0000 (UTC) X-Inumbo-ID: ba06c901-3d43-4400-b417-ba719b71ea38 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Ian Jackson , Wei Liu , George Dunlap , Nick Rosbrook Subject: [PATCH I v2 2/6] tools: switch XEN_LIBXEN* make variables to lower case (XEN_libxen*) Date: Sat, 15 Aug 2020 15:03:37 +0200 Message-Id: <20200815130341.27147-3-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200815130341.27147-1-jgross@suse.com> References: <20200815130341.27147-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Content-Type: text/plain; charset="utf-8" In order to harmonize names of library related make variables switch XEN_LIBXEN* names to XEN_libxen*, as all other related variables (e.g. CFLAGS_libxen*, SHDEPS_libxen*, ...) already use this pattern. Rename XEN_LIBXC to XEN_libxenctrl, XEN_XENSTORE to XEN_libxenstore, XEN_XENLIGHT to XEN_libxenlight, XEN_XLUTIL to XEN_libxlutil, and XEN_LIBVCHAN to XEN_libxenvchan for the same reason. Introduce XEN_libxenguest with the same value as XEN_libxenctrl. No functional change. Signed-off-by: Juergen Gross Acked-by: Wei Liu --- tools/Rules.mk | 120 +++++++++++++++--------------- tools/golang/xenlight/Makefile | 4 +- tools/libs/call/Makefile | 2 +- tools/libs/devicemodel/Makefile | 2 +- tools/libs/evtchn/Makefile | 2 +- tools/libs/foreignmemory/Makefile | 2 +- tools/libs/gnttab/Makefile | 2 +- tools/libs/hypfs/Makefile | 2 +- tools/libs/toolcore/Makefile | 2 +- tools/libs/toollog/Makefile | 2 +- tools/libvchan/Makefile | 2 +- tools/libxc/Makefile | 2 +- tools/xenstat/libxenstat/Makefile | 2 +- tools/xenstore/Makefile | 2 +- 14 files changed, 75 insertions(+), 73 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 5ed5664bf7..b42e50ebf6 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -12,21 +12,23 @@ INSTALL =3D $(XEN_ROOT)/tools/cross-install LDFLAGS +=3D $(PREPEND_LDFLAGS_XEN_TOOLS) =20 XEN_INCLUDE =3D $(XEN_ROOT)/tools/include -XEN_LIBXENTOOLCORE =3D $(XEN_ROOT)/tools/libs/toolcore -XEN_LIBXENTOOLLOG =3D $(XEN_ROOT)/tools/libs/toollog -XEN_LIBXENEVTCHN =3D $(XEN_ROOT)/tools/libs/evtchn -XEN_LIBXENGNTTAB =3D $(XEN_ROOT)/tools/libs/gnttab -XEN_LIBXENCALL =3D $(XEN_ROOT)/tools/libs/call -XEN_LIBXENFOREIGNMEMORY =3D $(XEN_ROOT)/tools/libs/foreignmemory -XEN_LIBXENDEVICEMODEL =3D $(XEN_ROOT)/tools/libs/devicemodel -XEN_LIBXENHYPFS =3D $(XEN_ROOT)/tools/libs/hypfs -XEN_LIBXC =3D $(XEN_ROOT)/tools/libxc -XEN_XENLIGHT =3D $(XEN_ROOT)/tools/libxl +XEN_libxentoolcore =3D $(XEN_ROOT)/tools/libs/toolcore +XEN_libxentoollog =3D $(XEN_ROOT)/tools/libs/toollog +XEN_libxenevtchn =3D $(XEN_ROOT)/tools/libs/evtchn +XEN_libxengnttab =3D $(XEN_ROOT)/tools/libs/gnttab +XEN_libxencall =3D $(XEN_ROOT)/tools/libs/call +XEN_libxenforeignmemory =3D $(XEN_ROOT)/tools/libs/foreignmemory +XEN_libxendevicemodel =3D $(XEN_ROOT)/tools/libs/devicemodel +XEN_libxenhypfs =3D $(XEN_ROOT)/tools/libs/hypfs +XEN_libxenctrl =3D $(XEN_ROOT)/tools/libxc +# Currently libxenguest lives in the same directory as libxenctrl +XEN_libxenguest =3D $(XEN_libxenctrl) +XEN_libxenlight =3D $(XEN_ROOT)/tools/libxl # Currently libxlutil lives in the same directory as libxenlight -XEN_XLUTIL =3D $(XEN_XENLIGHT) -XEN_XENSTORE =3D $(XEN_ROOT)/tools/xenstore -XEN_LIBXENSTAT =3D $(XEN_ROOT)/tools/xenstat/libxenstat/src -XEN_LIBVCHAN =3D $(XEN_ROOT)/tools/libvchan +XEN_libxlutil =3D $(XEN_libxenlight) +XEN_libxenstore =3D $(XEN_ROOT)/tools/xenstore +XEN_libxenstat =3D $(XEN_ROOT)/tools/xenstat/libxenstat/src +XEN_libxenvchan =3D $(XEN_ROOT)/tools/libvchan =20 CFLAGS_xeninclude =3D -I$(XEN_INCLUDE) =20 @@ -97,75 +99,75 @@ endif # Consumers of libfoo should not directly use $(SHDEPS_libfoo) or # $(SHLIB_libfoo) =20 -CFLAGS_libxentoollog =3D -I$(XEN_LIBXENTOOLLOG)/include $(CFLAGS_xeninclud= e) +CFLAGS_libxentoollog =3D -I$(XEN_libxentoollog)/include $(CFLAGS_xeninclud= e) SHDEPS_libxentoollog =3D -LDLIBS_libxentoollog =3D $(SHDEPS_libxentoollog) $(XEN_LIBXENTOOLLOG)/libx= entoollog$(libextension) -SHLIB_libxentoollog =3D $(SHDEPS_libxentoollog) -Wl,-rpath-link=3D$(XEN_L= IBXENTOOLLOG) +LDLIBS_libxentoollog =3D $(SHDEPS_libxentoollog) $(XEN_libxentoollog)/libx= entoollog$(libextension) +SHLIB_libxentoollog =3D $(SHDEPS_libxentoollog) -Wl,-rpath-link=3D$(XEN_l= ibxentoollog) =20 -CFLAGS_libxentoolcore =3D -I$(XEN_LIBXENTOOLCORE)/include $(CFLAGS_xenincl= ude) +CFLAGS_libxentoolcore =3D -I$(XEN_libxentoolcore)/include $(CFLAGS_xenincl= ude) SHDEPS_libxentoolcore =3D -LDLIBS_libxentoolcore =3D $(SHDEPS_libxentoolcore) $(XEN_LIBXENTOOLCORE)/l= ibxentoolcore$(libextension) -SHLIB_libxentoolcore =3D $(SHDEPS_libxentoolcore) -Wl,-rpath-link=3D$(XEN= _LIBXENTOOLCORE) +LDLIBS_libxentoolcore =3D $(SHDEPS_libxentoolcore) $(XEN_libxentoolcore)/l= ibxentoolcore$(libextension) +SHLIB_libxentoolcore =3D $(SHDEPS_libxentoolcore) -Wl,-rpath-link=3D$(XEN= _libxentoolcore) =20 -CFLAGS_libxenevtchn =3D -I$(XEN_LIBXENEVTCHN)/include $(CFLAGS_xeninclude) +CFLAGS_libxenevtchn =3D -I$(XEN_libxenevtchn)/include $(CFLAGS_xeninclude) SHDEPS_libxenevtchn =3D $(SHLIB_libxentoolcore) -LDLIBS_libxenevtchn =3D $(SHDEPS_libxenevtchn) $(XEN_LIBXENEVTCHN)/libxene= vtchn$(libextension) -SHLIB_libxenevtchn =3D $(SHDEPS_libxenevtchn) -Wl,-rpath-link=3D$(XEN_LIB= XENEVTCHN) +LDLIBS_libxenevtchn =3D $(SHDEPS_libxenevtchn) $(XEN_libxenevtchn)/libxene= vtchn$(libextension) +SHLIB_libxenevtchn =3D $(SHDEPS_libxenevtchn) -Wl,-rpath-link=3D$(XEN_lib= xenevtchn) =20 -CFLAGS_libxengnttab =3D -I$(XEN_LIBXENGNTTAB)/include $(CFLAGS_xeninclude) +CFLAGS_libxengnttab =3D -I$(XEN_libxengnttab)/include $(CFLAGS_xeninclude) SHDEPS_libxengnttab =3D $(SHLIB_libxentoollog) $(SHLIB_libxentoolcore) -LDLIBS_libxengnttab =3D $(SHDEPS_libxengnttab) $(XEN_LIBXENGNTTAB)/libxeng= nttab$(libextension) -SHLIB_libxengnttab =3D $(SHDEPS_libxengnttab) -Wl,-rpath-link=3D$(XEN_LIB= XENGNTTAB) +LDLIBS_libxengnttab =3D $(SHDEPS_libxengnttab) $(XEN_libxengnttab)/libxeng= nttab$(libextension) +SHLIB_libxengnttab =3D $(SHDEPS_libxengnttab) -Wl,-rpath-link=3D$(XEN_lib= xengnttab) =20 -CFLAGS_libxencall =3D -I$(XEN_LIBXENCALL)/include $(CFLAGS_xeninclude) +CFLAGS_libxencall =3D -I$(XEN_libxencall)/include $(CFLAGS_xeninclude) SHDEPS_libxencall =3D $(SHLIB_libxentoolcore) -LDLIBS_libxencall =3D $(SHDEPS_libxencall) $(XEN_LIBXENCALL)/libxencall$(l= ibextension) -SHLIB_libxencall =3D $(SHDEPS_libxencall) -Wl,-rpath-link=3D$(XEN_LIBXENC= ALL) +LDLIBS_libxencall =3D $(SHDEPS_libxencall) $(XEN_libxencall)/libxencall$(l= ibextension) +SHLIB_libxencall =3D $(SHDEPS_libxencall) -Wl,-rpath-link=3D$(XEN_libxenc= all) =20 -CFLAGS_libxenforeignmemory =3D -I$(XEN_LIBXENFOREIGNMEMORY)/include $(CFLA= GS_xeninclude) +CFLAGS_libxenforeignmemory =3D -I$(XEN_libxenforeignmemory)/include $(CFLA= GS_xeninclude) SHDEPS_libxenforeignmemory =3D $(SHLIB_libxentoolcore) -LDLIBS_libxenforeignmemory =3D $(SHDEPS_libxenforeignmemory) $(XEN_LIBXENF= OREIGNMEMORY)/libxenforeignmemory$(libextension) -SHLIB_libxenforeignmemory =3D $(SHDEPS_libxenforeignmemory) -Wl,-rpath-li= nk=3D$(XEN_LIBXENFOREIGNMEMORY) +LDLIBS_libxenforeignmemory =3D $(SHDEPS_libxenforeignmemory) $(XEN_libxenf= oreignmemory)/libxenforeignmemory$(libextension) +SHLIB_libxenforeignmemory =3D $(SHDEPS_libxenforeignmemory) -Wl,-rpath-li= nk=3D$(XEN_libxenforeignmemory) =20 -CFLAGS_libxendevicemodel =3D -I$(XEN_LIBXENDEVICEMODEL)/include $(CFLAGS_x= eninclude) +CFLAGS_libxendevicemodel =3D -I$(XEN_libxendevicemodel)/include $(CFLAGS_x= eninclude) SHDEPS_libxendevicemodel =3D $(SHLIB_libxentoollog) $(SHLIB_libxentoolcore= ) $(SHLIB_libxencall) -LDLIBS_libxendevicemodel =3D $(SHDEPS_libxendevicemodel) $(XEN_LIBXENDEVIC= EMODEL)/libxendevicemodel$(libextension) -SHLIB_libxendevicemodel =3D $(SHDEPS_libxendevicemodel) -Wl,-rpath-link= =3D$(XEN_LIBXENDEVICEMODEL) +LDLIBS_libxendevicemodel =3D $(SHDEPS_libxendevicemodel) $(XEN_libxendevic= emodel)/libxendevicemodel$(libextension) +SHLIB_libxendevicemodel =3D $(SHDEPS_libxendevicemodel) -Wl,-rpath-link= =3D$(XEN_libxendevicemodel) =20 -CFLAGS_libxenhypfs =3D -I$(XEN_LIBXENHYPFS)/include $(CFLAGS_xeninclude) +CFLAGS_libxenhypfs =3D -I$(XEN_libxenhypfs)/include $(CFLAGS_xeninclude) SHDEPS_libxenhypfs =3D $(SHLIB_libxentoollog) $(SHLIB_libxentoolcore) $(SH= LIB_libxencall) -LDLIBS_libxenhypfs =3D $(SHDEPS_libxenhypfs) $(XEN_LIBXENHYPFS)/libxenhypf= s$(libextension) -SHLIB_libxenhypfs =3D $(SHDEPS_libxenhypfs) -Wl,-rpath-link=3D$(XEN_LIBXE= NHYPFS) +LDLIBS_libxenhypfs =3D $(SHDEPS_libxenhypfs) $(XEN_libxenhypfs)/libxenhypf= s$(libextension) +SHLIB_libxenhypfs =3D $(SHDEPS_libxenhypfs) -Wl,-rpath-link=3D$(XEN_libxe= nhypfs) =20 # code which compiles against libxenctrl get __XEN_TOOLS__ and # therefore sees the unstable hypercall interfaces. -CFLAGS_libxenctrl =3D -I$(XEN_LIBXC)/include $(CFLAGS_libxentoollog) $(CFL= AGS_libxenforeignmemory) $(CFLAGS_libxendevicemodel) $(CFLAGS_xeninclude) -= D__XEN_TOOLS__ +CFLAGS_libxenctrl =3D -I$(XEN_libxenctrl)/include $(CFLAGS_libxentoollog) = $(CFLAGS_libxenforeignmemory) $(CFLAGS_libxendevicemodel) $(CFLAGS_xeninclu= de) -D__XEN_TOOLS__ SHDEPS_libxenctrl =3D $(SHLIB_libxentoollog) $(SHLIB_libxenevtchn) $(SHLIB= _libxengnttab) $(SHLIB_libxencall) $(SHLIB_libxenforeignmemory) $(SHLIB_lib= xendevicemodel) -LDLIBS_libxenctrl =3D $(SHDEPS_libxenctrl) $(XEN_LIBXC)/libxenctrl$(libext= ension) -SHLIB_libxenctrl =3D $(SHDEPS_libxenctrl) -Wl,-rpath-link=3D$(XEN_LIBXC) +LDLIBS_libxenctrl =3D $(SHDEPS_libxenctrl) $(XEN_libxenctrl)/libxenctrl$(l= ibextension) +SHLIB_libxenctrl =3D $(SHDEPS_libxenctrl) -Wl,-rpath-link=3D$(XEN_libxenc= trl) =20 -CFLAGS_libxenguest =3D -I$(XEN_LIBXC)/include $(CFLAGS_libxenevtchn) $(CFL= AGS_libxenforeignmemory) $(CFLAGS_xeninclude) +CFLAGS_libxenguest =3D -I$(XEN_libxenguest)/include $(CFLAGS_libxenevtchn)= $(CFLAGS_libxenforeignmemory) $(CFLAGS_xeninclude) SHDEPS_libxenguest =3D $(SHLIB_libxenevtchn) -LDLIBS_libxenguest =3D $(SHDEPS_libxenguest) $(XEN_LIBXC)/libxenguest$(lib= extension) -SHLIB_libxenguest =3D $(SHDEPS_libxenguest) -Wl,-rpath-link=3D$(XEN_LIBXC) +LDLIBS_libxenguest =3D $(SHDEPS_libxenguest) $(XEN_libxenguest)/libxengues= t$(libextension) +SHLIB_libxenguest =3D $(SHDEPS_libxenguest) -Wl,-rpath-link=3D$(XEN_libxe= nguest) =20 -CFLAGS_libxenstore =3D -I$(XEN_XENSTORE)/include $(CFLAGS_xeninclude) +CFLAGS_libxenstore =3D -I$(XEN_libxenstore)/include $(CFLAGS_xeninclude) SHDEPS_libxenstore =3D $(SHLIB_libxentoolcore) -LDLIBS_libxenstore =3D $(SHDEPS_libxenstore) $(XEN_XENSTORE)/libxenstore$(= libextension) -SHLIB_libxenstore =3D $(SHDEPS_libxenstore) -Wl,-rpath-link=3D$(XEN_XENST= ORE) +LDLIBS_libxenstore =3D $(SHDEPS_libxenstore) $(XEN_libxenstore)/libxenstor= e$(libextension) +SHLIB_libxenstore =3D $(SHDEPS_libxenstore) -Wl,-rpath-link=3D$(XEN_libxe= nstore) ifeq ($(CONFIG_Linux),y) LDLIBS_libxenstore +=3D -ldl endif =20 -CFLAGS_libxenstat =3D -I$(XEN_LIBXENSTAT) +CFLAGS_libxenstat =3D -I$(XEN_libxenstat) SHDEPS_libxenstat =3D $(SHLIB_libxenctrl) $(SHLIB_libxenstore) -LDLIBS_libxenstat =3D $(SHDEPS_libxenstat) $(XEN_LIBXENSTAT)/libxenstat$(= libextension) -SHLIB_libxenstat =3D $(SHDEPS_libxenstat) -Wl,-rpath-link=3D$(XEN_LIBXEN= STAT) +LDLIBS_libxenstat =3D $(SHDEPS_libxenstat) $(XEN_libxenstat)/libxenstat$(= libextension) +SHLIB_libxenstat =3D $(SHDEPS_libxenstat) -Wl,-rpath-link=3D$(XEN_libxen= stat) =20 -CFLAGS_libxenvchan =3D -I$(XEN_LIBVCHAN) $(CFLAGS_libxengnttab) $(CFLAGS_l= ibxenevtchn) +CFLAGS_libxenvchan =3D -I$(XEN_libxenvchan) $(CFLAGS_libxengnttab) $(CFLAG= S_libxenevtchn) SHDEPS_libxenvchan =3D $(SHLIB_libxentoollog) $(SHLIB_libxenstore) $(SHLIB= _libxenevtchn) $(SHLIB_libxengnttab) -LDLIBS_libxenvchan =3D $(SHDEPS_libxenvchan) $(XEN_LIBVCHAN)/libxenvchan$(= libextension) -SHLIB_libxenvchan =3D $(SHDEPS_libxenvchan) -Wl,-rpath-link=3D$(XEN_LIBVC= HAN) +LDLIBS_libxenvchan =3D $(SHDEPS_libxenvchan) $(XEN_libxenvchan)/libxenvcha= n$(libextension) +SHLIB_libxenvchan =3D $(SHDEPS_libxenvchan) -Wl,-rpath-link=3D$(XEN_libxe= nvchan) =20 ifeq ($(debug),y) # Disable optimizations @@ -176,15 +178,15 @@ else CFLAGS +=3D -O2 -fomit-frame-pointer endif =20 -CFLAGS_libxenlight =3D -I$(XEN_XENLIGHT) $(CFLAGS_libxenctrl) $(CFLAGS_xen= include) +CFLAGS_libxenlight =3D -I$(XEN_libxenlight) $(CFLAGS_libxenctrl) $(CFLAGS_= xeninclude) SHDEPS_libxenlight =3D $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(SHLIB_li= bxenhypfs) -LDLIBS_libxenlight =3D $(SHDEPS_libxenlight) $(XEN_XENLIGHT)/libxenlight$(= libextension) -SHLIB_libxenlight =3D $(SHDEPS_libxenlight) -Wl,-rpath-link=3D$(XEN_XENLI= GHT) +LDLIBS_libxenlight =3D $(SHDEPS_libxenlight) $(XEN_libxenlight)/libxenligh= t$(libextension) +SHLIB_libxenlight =3D $(SHDEPS_libxenlight) -Wl,-rpath-link=3D$(XEN_libxe= nlight) =20 -CFLAGS_libxlutil =3D -I$(XEN_XLUTIL) +CFLAGS_libxlutil =3D -I$(XEN_libxlutil) SHDEPS_libxlutil =3D $(SHLIB_libxenlight) -LDLIBS_libxlutil =3D $(SHDEPS_libxlutil) $(XEN_XLUTIL)/libxlutil$(libexten= sion) -SHLIB_libxlutil =3D $(SHDEPS_libxlutil) -Wl,-rpath-link=3D$(XEN_XLUTIL) +LDLIBS_libxlutil =3D $(SHDEPS_libxlutil) $(XEN_libxlutil)/libxlutil$(libex= tension) +SHLIB_libxlutil =3D $(SHDEPS_libxlutil) -Wl,-rpath-link=3D$(XEN_libxlutil) =20 CFLAGS +=3D -D__XEN_INTERFACE_VERSION__=3D__XEN_LATEST_INTERFACE_VERSION__ =20 diff --git a/tools/golang/xenlight/Makefile b/tools/golang/xenlight/Makefile index eac9dbf12a..a83fff7573 100644 --- a/tools/golang/xenlight/Makefile +++ b/tools/golang/xenlight/Makefile @@ -30,11 +30,11 @@ idl-gen: $(GOXL_GEN_FILES) # # NB that because the users of this library need to be able to # recompile the library from source, it needs to include '-lxenlight' -# in the LDFLAGS; and thus we need to add -L$(XEN_XENLIGHT) here +# in the LDFLAGS; and thus we need to add -L$(XEN_libxenlight) here # so that it can find the actual library. .PHONY: build build: xenlight.go $(GOXL_GEN_FILES) - CGO_CFLAGS=3D"$(CFLAGS_libxenlight) $(CFLAGS_libxentoollog)" CGO_LDFLAGS= =3D"$(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -L$(XEN_XENLIGHT) -L$(XEN= _LIBXENTOOLLOG)" $(GO) build -x + CGO_CFLAGS=3D"$(CFLAGS_libxenlight) $(CFLAGS_libxentoollog)" CGO_LDFLAGS= =3D"$(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -L$(XEN_libxenlight) -L$(= XEN_libxentoollog)" $(GO) build -x =20 .PHONY: install install: build diff --git a/tools/libs/call/Makefile b/tools/libs/call/Makefile index 7f6dc3fcbd..7994b411fa 100644 --- a/tools/libs/call/Makefile +++ b/tools/libs/call/Makefile @@ -15,5 +15,5 @@ SRCS-$(CONFIG_MiniOS) +=3D minios.c =20 include $(XEN_ROOT)/tools/libs/libs.mk =20 -$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_LIBXENCALL)/include +$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_libxencall)/include $(PKG_CONFIG_LOCAL): PKG_CONFIG_CFLAGS_LOCAL =3D $(CFLAGS_xeninclude) diff --git a/tools/libs/devicemodel/Makefile b/tools/libs/devicemodel/Makef= ile index 61bfa35273..d9d1d1b850 100644 --- a/tools/libs/devicemodel/Makefile +++ b/tools/libs/devicemodel/Makefile @@ -15,5 +15,5 @@ SRCS-$(CONFIG_MiniOS) +=3D compat.c =20 include $(XEN_ROOT)/tools/libs/libs.mk =20 -$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_LIBXENDEVICEMODEL)/include +$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_libxendevicemodel)/include $(PKG_CONFIG_LOCAL): PKG_CONFIG_CFLAGS_LOCAL =3D $(CFLAGS_xeninclude) diff --git a/tools/libs/evtchn/Makefile b/tools/libs/evtchn/Makefile index 9206f622ef..d7aa4d402f 100644 --- a/tools/libs/evtchn/Makefile +++ b/tools/libs/evtchn/Makefile @@ -15,4 +15,4 @@ SRCS-$(CONFIG_MiniOS) +=3D minios.c =20 include $(XEN_ROOT)/tools/libs/libs.mk =20 -$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_LIBXENEVTCHN)/include +$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_libxenevtchn)/include diff --git a/tools/libs/foreignmemory/Makefile b/tools/libs/foreignmemory/M= akefile index 28f1bddc96..823989681d 100644 --- a/tools/libs/foreignmemory/Makefile +++ b/tools/libs/foreignmemory/Makefile @@ -15,5 +15,5 @@ SRCS-$(CONFIG_MiniOS) +=3D minios.c =20 include $(XEN_ROOT)/tools/libs/libs.mk =20 -$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_LIBXENFOREIGNMEMORY)/incl= ude +$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_libxenforeignmemory)/incl= ude $(PKG_CONFIG_LOCAL): PKG_CONFIG_CFLAGS_LOCAL =3D $(CFLAGS_xeninclude) diff --git a/tools/libs/gnttab/Makefile b/tools/libs/gnttab/Makefile index 2da8fbbb7f..c0fffdac71 100644 --- a/tools/libs/gnttab/Makefile +++ b/tools/libs/gnttab/Makefile @@ -17,5 +17,5 @@ SRCS-$(CONFIG_NetBSD) +=3D gnttab_unimp.c gntshr_unimp.c =20 include $(XEN_ROOT)/tools/libs/libs.mk =20 -$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_LIBXENGNTTAB)/include +$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_libxengnttab)/include $(PKG_CONFIG_LOCAL): PKG_CONFIG_CFLAGS_LOCAL =3D $(CFLAGS_xeninclude) diff --git a/tools/libs/hypfs/Makefile b/tools/libs/hypfs/Makefile index 06dd449929..b4c41f6189 100644 --- a/tools/libs/hypfs/Makefile +++ b/tools/libs/hypfs/Makefile @@ -12,5 +12,5 @@ SRCS-y +=3D core.c =20 include ../libs.mk =20 -$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_LIBXENHYPFS)/include +$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_libxenhypfs)/include $(PKG_CONFIG_LOCAL): PKG_CONFIG_CFLAGS_LOCAL =3D $(CFLAGS_xeninclude) diff --git a/tools/libs/toolcore/Makefile b/tools/libs/toolcore/Makefile index 9c5a92d93f..85ff2b26fd 100644 --- a/tools/libs/toolcore/Makefile +++ b/tools/libs/toolcore/Makefile @@ -10,7 +10,7 @@ SRCS-y +=3D handlereg.c =20 include $(XEN_ROOT)/tools/libs/libs.mk =20 -$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_LIBXENTOOLCORE)/include +$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_libxentoolcore)/include =20 $(LIB_OBJS): $(AUTOINCS) $(PIC_OBJS): $(AUTOINCS) diff --git a/tools/libs/toollog/Makefile b/tools/libs/toollog/Makefile index 9156e5d08e..2d3ae4e627 100644 --- a/tools/libs/toollog/Makefile +++ b/tools/libs/toollog/Makefile @@ -10,4 +10,4 @@ SRCS-y +=3D xtl_logger_stdio.c =20 include $(XEN_ROOT)/tools/libs/libs.mk =20 -$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_LIBXENTOOLLOG)/include +$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_libxentoollog)/include diff --git a/tools/libvchan/Makefile b/tools/libvchan/Makefile index d99a6137e1..a5441162a0 100644 --- a/tools/libvchan/Makefile +++ b/tools/libvchan/Makefile @@ -35,7 +35,7 @@ endif PKG_CONFIG_LOCAL :=3D $(foreach pc,$(PKG_CONFIG),$(PKG_CONFIG_DIR)/$(pc)) =20 $(PKG_CONFIG_LOCAL): PKG_CONFIG_PREFIX =3D $(XEN_ROOT) -$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_LIBVCHAN) +$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_libxenvchan) $(PKG_CONFIG_LOCAL): PKG_CONFIG_LIBDIR =3D $(CURDIR) $(PKG_CONFIG_LOCAL): PKG_CONFIG_CFLAGS_LOCAL =3D $(CFLAGS_xeninclude) =20 diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 955cd5ab18..c1e41a8ee9 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -168,7 +168,7 @@ endif PKG_CONFIG_LOCAL :=3D $(foreach pc,$(PKG_CONFIG),$(PKG_CONFIG_DIR)/$(pc)) =20 $(PKG_CONFIG_LOCAL): PKG_CONFIG_PREFIX =3D $(XEN_ROOT) -$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_LIBXC)/include +$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_libxenctrl)/include $(PKG_CONFIG_LOCAL): PKG_CONFIG_LIBDIR =3D $(CURDIR) $(PKG_CONFIG_LOCAL): PKG_CONFIG_CFLAGS_LOCAL =3D $(CFLAGS_xeninclude) =20 diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/M= akefile index ab980852da..b5e623b155 100644 --- a/tools/xenstat/libxenstat/Makefile +++ b/tools/xenstat/libxenstat/Makefile @@ -50,7 +50,7 @@ endif PKG_CONFIG_LOCAL :=3D $(foreach pc,$(PKG_CONFIG),$(PKG_CONFIG_DIR)/$(pc)) =20 $(PKG_CONFIG_LOCAL): PKG_CONFIG_PREFIX =3D $(XEN_ROOT) -$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_LIBXENSTAT) +$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_libxenstat) $(PKG_CONFIG_LOCAL): PKG_CONFIG_LIBDIR =3D $(CURDIR) =20 .PHONY: all diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 445e9911b2..0a64ac1571 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -128,7 +128,7 @@ endif PKG_CONFIG_LOCAL :=3D $(foreach pc,$(PKG_CONFIG),$(PKG_CONFIG_DIR)/$(pc)) =20 $(PKG_CONFIG_LOCAL): PKG_CONFIG_PREFIX =3D $(XEN_ROOT) -$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_XENSTORE)/include +$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_libxenstore)/include $(PKG_CONFIG_LOCAL): PKG_CONFIG_LIBDIR =3D $(CURDIR) $(PKG_CONFIG_LOCAL): PKG_CONFIG_CFLAGS_LOCAL =3D $(CFLAGS_xeninclude) =20 --=20 2.26.2