From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH] stubdom: fix link farm runes Date: Mon, 15 Feb 2016 19:40:28 +0000 Message-ID: <1455565228-12729-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aVP0b-00019L-4v for xen-devel@lists.xenproject.org; Mon, 15 Feb 2016 19:40:33 +0000 List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Ian Jackson , Wei Liu , Ian Campbell , Samuel Thibault , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org Previously in the three problematic libraries all public headers were linked to source code directory. We should have created a include directory and link headers there. Signed-off-by: Wei Liu --- Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Cc: Samuel Thibault --- stubdom/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index 6f68e98..2044d76 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -314,9 +314,9 @@ mk-headers-$(XEN_TARGET_ARCH): $(IOEMU_LINKFARM_TARGET) ln -sf $(wildcard $(XEN_ROOT)/tools/include/xen-foreign/*) include/xen-foreign/ && \ $(MAKE) DESTDIR= -C include/xen-foreign/ && \ ( [ -h include/xen/foreign ] || ln -sf ../xen-foreign include/xen/foreign ) - mkdir -p libs-$(XEN_TARGET_ARCH)/toollog + mkdir -p libs-$(XEN_TARGET_ARCH)/toollog/include [ -h libs-$(XEN_TARGET_ARCH)/toollog/Makefile ] || ( cd libs-$(XEN_TARGET_ARCH)/toollog && \ - ln -sf $(XEN_ROOT)/tools/libs/toollog/include/*.h . && \ + ln -sf $(XEN_ROOT)/tools/libs/toollog/include/*.h include/ && \ ln -sf $(XEN_ROOT)/tools/libs/toollog/*.c . && \ ln -sf $(XEN_ROOT)/tools/libs/toollog/Makefile . ) mkdir -p libs-$(XEN_TARGET_ARCH)/evtchn/include @@ -343,17 +343,17 @@ mk-headers-$(XEN_TARGET_ARCH): $(IOEMU_LINKFARM_TARGET) ln -sf $(XEN_ROOT)/tools/libs/foreignmemory/include/*.h include/ && \ ln -sf $(XEN_ROOT)/tools/libs/foreignmemory/*.c . && \ ln -sf $(XEN_ROOT)/tools/libs/foreignmemory/Makefile . ) - mkdir -p libxc-$(XEN_TARGET_ARCH) + mkdir -p libxc-$(XEN_TARGET_ARCH)/include [ -h libxc-$(XEN_TARGET_ARCH)/Makefile ] || ( cd libxc-$(XEN_TARGET_ARCH) && \ ln -sf $(XEN_ROOT)/tools/libxc/*.h . && \ - ln -sf $(XEN_ROOT)/tools/libxc/include/*.h . && \ + ln -sf $(XEN_ROOT)/tools/libxc/include/*.h include/ && \ ln -sf $(XEN_ROOT)/tools/libxc/*.c . && \ ln -sf $(XEN_ROOT)/tools/libxc/Makefile . ) - mkdir -p xenstore + mkdir -p xenstore/include [ -h xenstore/Makefile ] || ( cd xenstore && \ ln -sf $(XEN_ROOT)/tools/xenstore/*.c . && \ ln -sf $(XEN_ROOT)/tools/xenstore/*.h . && \ - ln -sf $(XEN_ROOT)/tools/xenstore/include/*.h . && \ + ln -sf $(XEN_ROOT)/tools/xenstore/include/*.h include/ && \ ln -sf $(XEN_ROOT)/tools/xenstore/Makefile . ) $(MAKE) DESTDIR= -C $(MINI_OS) links touch mk-headers-$(XEN_TARGET_ARCH) -- 2.1.4