xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: xen-devel@lists.xensource.com
Cc: david.vrabel@citrix.com, Ian Campbell <ian.campbell@citrix.com>,
	Stefano.Stabellini@eu.citrix.com, Tim.Deegan@citrix.com
Subject: [PATCH v2 04/10] blktap2/libvhd: Build shared objects using -fPIC.
Date: Fri, 10 Feb 2012 12:02:42 +0000	[thread overview]
Message-ID: <1328875368-9608-4-git-send-email-stefano.stabellini@eu.citrix.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1202101154320.7456@kaball-desktop>

From: Ian Campbell <ian.campbell@citrix.com>

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 tools/blktap2/vhd/lib/Makefile |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile
index b72e4d9..1acee70 100644
--- a/tools/blktap2/vhd/lib/Makefile
+++ b/tools/blktap2/vhd/lib/Makefile
@@ -49,27 +49,32 @@ LIB-SRCS        += atomicio.c
 LIB-OBJS         = $(patsubst %.c,%.o,$(LIB-SRCS))
 LIB-OBJS        += $(LVM-UTIL-OBJ)
 
+LIB-PICOBJS      = $(patsubst %.o,%.opic,$(LIB-OBJS))
+
 LIBVHD           = libvhd.a libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR)
 
 all: build
 
-build: $(LIBVHD-BUILD)
+build: libvhd.a libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR)
 
 libvhd.a: $(LIB-OBJS)
+	$(AR) rc $@ $^
+
+libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR): $(LIB-PICOBJS)
 	$(CC) -Wl,$(SONAME_LDFLAG),$(LIBVHD-SONAME) $(SHLIB_LDFLAGS) \
 		$(LDFLAGS) -o libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $^ $(LIBS)
 	ln -sf libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) libvhd.so.$(LIBVHD-MAJOR)
 	ln -sf libvhd.so.$(LIBVHD-MAJOR) libvhd.so
-	$(AR) rc $@ $^
 
 install: all
 	$(INSTALL_DIR) -p $(DESTDIR)$(INST-DIR)
-	$(INSTALL_PROG) $(LIBVHD) $(DESTDIR)$(INST-DIR)
+	$(INSTALL_PROG) libvhd.a $(DESTDIR)$(INST-DIR)
+	$(INSTALL_PROG) libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $(DESTDIR)$(INST-DIR)
 	ln -sf libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $(DESTDIR)$(INST-DIR)/libvhd.so.$(LIBVHD-MAJOR)
 	ln -sf libvhd.so.$(LIBVHD-MAJOR) $(DESTDIR)$(INST-DIR)/libvhd.so
 
 clean:
-	rm -rf *.a *.so* *.o *~ $(DEPS) $(LIBVHD)
+	rm -rf *.a *.so* *.o *.opic *~ $(DEPS) $(LIBVHD)
 
 .PHONY: all build clean install libvhd
 
-- 
1.7.8.3

  parent reply	other threads:[~2012-02-10 12:02 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-10 12:01 [PATCH v2 00/10] arm: compile tools Stefano Stabellini
2012-02-10 12:02 ` [PATCH v2 01/10] arm: few missing #define Stefano Stabellini
2012-02-13 13:49   ` Ian Campbell
2012-02-14 15:11     ` Stefano Stabellini
2012-02-15 12:27       ` Ian Campbell
2012-02-13 15:37   ` Ian Campbell
2012-02-10 12:02 ` [PATCH v2 02/10] arm: add stub hvm/save.h Stefano Stabellini
2012-02-13 12:21   ` Ian Campbell
2012-02-14 19:47     ` Stefano Stabellini
2012-02-10 12:02 ` [PATCH v2 03/10] libxl: do not allocate e820 for non x86 guests Stefano Stabellini
2012-02-13 17:28   ` Ian Jackson
2012-02-14 19:16     ` Stefano Stabellini
2012-02-10 12:02 ` Stefano Stabellini [this message]
2012-02-13 17:29   ` [PATCH v2 04/10] blktap2/libvhd: Build shared objects using -fPIC Ian Jackson
2012-02-10 12:02 ` [PATCH v2 05/10] arm: compile libxc Stefano Stabellini
2012-02-13 15:56   ` Ian Campbell
2012-02-13 17:38   ` Ian Jackson
2012-02-10 12:02 ` [PATCH v2 06/10] arm: compile libxenguest Stefano Stabellini
2012-02-13 16:10   ` Ian Campbell
2012-02-14 19:11     ` Stefano Stabellini
2012-02-10 12:02 ` [PATCH v2 07/10] arm: compile libxl Stefano Stabellini
2012-02-13 16:11   ` Ian Campbell
2012-02-13 17:35   ` Ian Jackson
2012-02-14 19:16     ` Stefano Stabellini
2012-02-10 12:02 ` [PATCH v2 08/10] arm: compile memshr Stefano Stabellini
2012-02-13 16:15   ` Ian Campbell
2012-02-10 12:02 ` [PATCH v2 09/10] arm: compile xentrace Stefano Stabellini
2012-02-13 16:16   ` Ian Campbell
2012-02-10 12:02 ` [PATCH v2 10/10] tools: only compile libfsimage/xfs on X86 Stefano Stabellini
2012-02-13 17:32   ` Ian Jackson
2012-02-13 16:18 ` [PATCH v2 00/10] arm: compile tools Ian Campbell
2012-02-13 17:39   ` Ian Jackson
2012-02-14 19:17     ` Stefano Stabellini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1328875368-9608-4-git-send-email-stefano.stabellini@eu.citrix.com \
    --to=stefano.stabellini@eu.citrix.com \
    --cc=Tim.Deegan@citrix.com \
    --cc=david.vrabel@citrix.com \
    --cc=ian.campbell@citrix.com \
    --cc=xen-devel@lists.xensource.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).