| Message ID | alpine.DEB.2.02.1407101718000.29039@kaball.uk.xensource.com |
|---|---|
| State | New |
| Headers | show |
On 10/07/14 17:19, Stefano Stabellini wrote: > The public libxc and xenstore headers have been moved to > tools/libxc/include and tools/xenstore/include respectively. > > Change the Makefiles accordingly. In which trees? My xen.git at current staging has: tools/xenstore/xenstore.h tools/libxc/xenctrl.h and no intermediate include/ directories. ~Andrew > > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > > diff --git a/Makefile b/Makefile > index 37c7066..c1900ca 100644 > --- a/Makefile > +++ b/Makefile > @@ -46,9 +46,9 @@ $(filter %-user,$(SUBDIR_RULES)): libqemu_user.a > > recurse-all: $(SUBDIR_RULES) > > -CPPFLAGS += -I$(XEN_ROOT)/tools/libxc > +CPPFLAGS += -I$(XEN_ROOT)/tools/libxc/include > CPPFLAGS += -I$(XEN_ROOT)/tools/blktap/lib > -CPPFLAGS += -I$(XEN_ROOT)/tools/xenstore > +CPPFLAGS += -I$(XEN_ROOT)/tools/xenstore/include > CPPFLAGS += -I$(XEN_ROOT)/tools/include > > tapdisk-ioemu: tapdisk-ioemu.c cutils.c block.c block-raw.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c block-vvfat.c block-qcow2.c hw/xen_blktap.c osdep.c > diff --git a/xen-hooks.mak b/xen-hooks.mak > index 58d61c9..9263892 100644 > --- a/xen-hooks.mak > +++ b/xen-hooks.mak > @@ -1,5 +1,5 @@ > -CPPFLAGS+= -I$(XEN_ROOT)/tools/libxc > -CPPFLAGS+= -I$(XEN_ROOT)/tools/xenstore > +CPPFLAGS+= -I$(XEN_ROOT)/tools/libxc/include > +CPPFLAGS+= -I$(XEN_ROOT)/tools/xenstore/include > CPPFLAGS+= -I$(XEN_ROOT)/tools/include > > SSE2 := $(call cc-option,-msse2,) > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel
On Thu, 10 Jul 2014, Andrew Cooper wrote: > On 10/07/14 17:19, Stefano Stabellini wrote: > > The public libxc and xenstore headers have been moved to > > tools/libxc/include and tools/xenstore/include respectively. > > > > Change the Makefiles accordingly. > > In which trees? > > My xen.git at current staging has: > > tools/xenstore/xenstore.h > tools/libxc/xenctrl.h > > and no intermediate include/ directories. It's a work in progress: http://marc.info/?l=xen-devel&m=140500919102405 > ~Andrew > > > > > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > > > > diff --git a/Makefile b/Makefile > > index 37c7066..c1900ca 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -46,9 +46,9 @@ $(filter %-user,$(SUBDIR_RULES)): libqemu_user.a > > > > recurse-all: $(SUBDIR_RULES) > > > > -CPPFLAGS += -I$(XEN_ROOT)/tools/libxc > > +CPPFLAGS += -I$(XEN_ROOT)/tools/libxc/include > > CPPFLAGS += -I$(XEN_ROOT)/tools/blktap/lib > > -CPPFLAGS += -I$(XEN_ROOT)/tools/xenstore > > +CPPFLAGS += -I$(XEN_ROOT)/tools/xenstore/include > > CPPFLAGS += -I$(XEN_ROOT)/tools/include > > > > tapdisk-ioemu: tapdisk-ioemu.c cutils.c block.c block-raw.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c block-vvfat.c block-qcow2.c hw/xen_blktap.c osdep.c > > diff --git a/xen-hooks.mak b/xen-hooks.mak > > index 58d61c9..9263892 100644 > > --- a/xen-hooks.mak > > +++ b/xen-hooks.mak > > @@ -1,5 +1,5 @@ > > -CPPFLAGS+= -I$(XEN_ROOT)/tools/libxc > > -CPPFLAGS+= -I$(XEN_ROOT)/tools/xenstore > > +CPPFLAGS+= -I$(XEN_ROOT)/tools/libxc/include > > +CPPFLAGS+= -I$(XEN_ROOT)/tools/xenstore/include > > CPPFLAGS+= -I$(XEN_ROOT)/tools/include > > > > SSE2 := $(call cc-option,-msse2,) > > > > _______________________________________________ > > Xen-devel mailing list > > Xen-devel@lists.xen.org > > http://lists.xen.org/xen-devel >
diff --git a/Makefile b/Makefile index 37c7066..c1900ca 100644 --- a/Makefile +++ b/Makefile @@ -46,9 +46,9 @@ $(filter %-user,$(SUBDIR_RULES)): libqemu_user.a recurse-all: $(SUBDIR_RULES) -CPPFLAGS += -I$(XEN_ROOT)/tools/libxc +CPPFLAGS += -I$(XEN_ROOT)/tools/libxc/include CPPFLAGS += -I$(XEN_ROOT)/tools/blktap/lib -CPPFLAGS += -I$(XEN_ROOT)/tools/xenstore +CPPFLAGS += -I$(XEN_ROOT)/tools/xenstore/include CPPFLAGS += -I$(XEN_ROOT)/tools/include tapdisk-ioemu: tapdisk-ioemu.c cutils.c block.c block-raw.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c block-vvfat.c block-qcow2.c hw/xen_blktap.c osdep.c diff --git a/xen-hooks.mak b/xen-hooks.mak index 58d61c9..9263892 100644 --- a/xen-hooks.mak +++ b/xen-hooks.mak @@ -1,5 +1,5 @@ -CPPFLAGS+= -I$(XEN_ROOT)/tools/libxc -CPPFLAGS+= -I$(XEN_ROOT)/tools/xenstore +CPPFLAGS+= -I$(XEN_ROOT)/tools/libxc/include +CPPFLAGS+= -I$(XEN_ROOT)/tools/xenstore/include CPPFLAGS+= -I$(XEN_ROOT)/tools/include SSE2 := $(call cc-option,-msse2,)
The public libxc and xenstore headers have been moved to tools/libxc/include and tools/xenstore/include respectively. Change the Makefiles accordingly. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>