diff mbox

Include libxendevicemodel with libxc

Message ID 1487761417-25004-1-git-send-email-paul.durrant@citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Paul Durrant Feb. 22, 2017, 11:03 a.m. UTC
libxendevicemodel has just been split out from libxc. From mini-os's
point of view we don't care about the distinction, so keep things
simple by just including libxendevicemodel if libxc is enabled.

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
--
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

Comments

Samuel Thibault Feb. 22, 2017, 11:04 a.m. UTC | #1
Paul Durrant, on mer. 22 févr. 2017 11:03:37 +0000, wrote:
> libxendevicemodel has just been split out from libxc. From mini-os's
> point of view we don't care about the distinction, so keep things
> simple by just including libxendevicemodel if libxc is enabled.
> 
> Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
> Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>

Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

> ---
>  Makefile | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/Makefile b/Makefile
> index 74f2c31..ef8559b 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -134,6 +134,8 @@ APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/call -whole-archi
>  LIBS += $(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/call/libxencall.a
>  APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/foreignmemory -whole-archive -lxenforeignmemory -no-whole-archive
>  LIBS += $(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/foreignmemory/libxenforeignmemory.a
> +APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/devicemodel -whole-archive -lxendevicemodel -no-whole-archive
> +LIBS += $(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/devicemodel/libxendevicemodel.a
>  APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libxc-$(MINIOS_TARGET_ARCH) -whole-archive -lxenguest -lxenctrl -no-whole-archive
>  LIBS += $(XEN_ROOT)/stubdom/libxc-$(MINIOS_TARGET_ARCH)/libxenctrl.a
>  LIBS += $(XEN_ROOT)/stubdom/libxc-$(MINIOS_TARGET_ARCH)/libxenguest.a
> -- 
> 2.1.4
>
Wei Liu Feb. 22, 2017, 1:09 p.m. UTC | #2
On Wed, Feb 22, 2017 at 12:04:18PM +0100, Samuel Thibault wrote:
> Paul Durrant, on mer. 22 févr. 2017 11:03:37 +0000, wrote:
> > libxendevicemodel has just been split out from libxc. From mini-os's
> > point of view we don't care about the distinction, so keep things
> > simple by just including libxendevicemodel if libxc is enabled.
> > 
> > Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
> > Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
> 
> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

Applied.
diff mbox

Patch

diff --git a/Makefile b/Makefile
index 74f2c31..ef8559b 100644
--- a/Makefile
+++ b/Makefile
@@ -134,6 +134,8 @@  APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/call -whole-archi
 LIBS += $(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/call/libxencall.a
 APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/foreignmemory -whole-archive -lxenforeignmemory -no-whole-archive
 LIBS += $(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/foreignmemory/libxenforeignmemory.a
+APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/devicemodel -whole-archive -lxendevicemodel -no-whole-archive
+LIBS += $(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/devicemodel/libxendevicemodel.a
 APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libxc-$(MINIOS_TARGET_ARCH) -whole-archive -lxenguest -lxenctrl -no-whole-archive
 LIBS += $(XEN_ROOT)/stubdom/libxc-$(MINIOS_TARGET_ARCH)/libxenctrl.a
 LIBS += $(XEN_ROOT)/stubdom/libxc-$(MINIOS_TARGET_ARCH)/libxenguest.a