diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-05-28 10:02:57 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-05-28 10:02:57 +0100 |
| commit | 3026986b0f62183e897f7de8ca2f6e1216ad5074 (patch) | |
| tree | 7044a679a42b72b0124e8df69419ab389c974ee9 /tools/blktap2/vhd | |
| parent | b3bde375d3b14939dcd04dde1a68c9f55361746a (diff) | |
| download | xen-3026986b0f62183e897f7de8ca2f6e1216ad5074.tar.gz xen-3026986b0f62183e897f7de8ca2f6e1216ad5074.tar.bz2 xen-3026986b0f62183e897f7de8ca2f6e1216ad5074.zip | |
blktap2: fix makefile of blktap2
- clean up to use SUBDIRS-y
- With parallel make, libvhd might not be created before
link. guarantee it.
- use LDFLAGS for link which is set by upper level makefiles.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Diffstat (limited to 'tools/blktap2/vhd')
| -rw-r--r-- | tools/blktap2/vhd/Makefile | 26 | ||||
| -rw-r--r-- | tools/blktap2/vhd/lib/Makefile | 2 |
2 files changed, 12 insertions, 16 deletions
diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile index 099a0baca7..fc0565e14f 100644 --- a/tools/blktap2/vhd/Makefile +++ b/tools/blktap2/vhd/Makefile @@ -2,11 +2,12 @@ XEN_ROOT=../../../ BLKTAP_ROOT := ../ include $(XEN_ROOT)/tools/Rules.mk +SUBDIRS-y := +SUBDIRS-y += lib + IBIN = vhd-util vhd-update INST_DIR = $(SBINDIR) -LIBDIR = lib - CFLAGS += -Werror CFLAGS += -Wno-unused CFLAGS += -I../include @@ -20,7 +21,7 @@ ifeq ($(VHD_STATIC),y) CFLAGS += -static endif -LIBS := -L$(LIBDIR) -lvhd +LIBS := -Llib -lvhd LIBS += -luuid # Get gcc to generate the dependencies for us. @@ -29,27 +30,22 @@ DEPS = .*.d all: build -build: libvhd $(IBIN) - -libvhd: - @set -e - $(MAKE) -C $(LIBDIR) all +build: $(IBIN) -vhd-util: vhd-util.o - $(CC) $(CFLAGS) -o vhd-util vhd-util.o $(LIBS) +vhd-util: vhd-util.o subdir-all-lib + $(CC) $(CFLAGS) -o vhd-util vhd-util.o $(LDFLAGS) $(LIBS) -vhd-update: vhd-update.o - $(CC) $(CFLAGS) -o vhd-update vhd-update.o $(LIBS) +vhd-update: vhd-update.o subdir-all-lib + $(CC) $(CFLAGS) -o vhd-update vhd-update.o $(LDFLAGS) $(LIBS) install: all - $(MAKE) -C $(LIBDIR) install $(INSTALL_DIR) -p $(DESTDIR)$(INST_DIR) $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(INST_DIR) clean: - $(MAKE) -C $(LIBDIR) clean rm -rf *.o *~ $(DEPS) $(IBIN) -.PHONY: all build clean install libvhd vhd-util vhd-update +.PHONY: all build clean install vhd-util vhd-update +all clean install: %: subdirs-% -include $(DEPS) diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile index e26ef86403..c768a1ac4d 100644 --- a/tools/blktap2/vhd/lib/Makefile +++ b/tools/blktap2/vhd/lib/Makefile @@ -54,7 +54,7 @@ build: $(LIBVHD-BUILD) libvhd.a: $(LIB-OBJS) $(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG),$(LIBVHD-SONAME) $(SHLIB_CFLAGS) \ - -o libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $(LIBS) $^ + $(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 $@ $^ |