diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-08-24 08:27:30 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-08-24 08:27:30 +0100 |
| commit | 552cd79c66dabeafab6ea48d13dd028cb47e76f7 (patch) | |
| tree | 1c31d04e9fb83066555ff2ddc907f5c3abbd1b0d /tools/libxc/Makefile | |
| parent | b0ae5f8bd10e16c1aa3dafed8534905bb7ba33bf (diff) | |
| download | xen-552cd79c66dabeafab6ea48d13dd028cb47e76f7.tar.gz xen-552cd79c66dabeafab6ea48d13dd028cb47e76f7.tar.bz2 xen-552cd79c66dabeafab6ea48d13dd028cb47e76f7.zip | |
libxc: More LZMA/BZIP fixes.
- Fix an error message in xc_try_bzip2_decode()
- Check library installation on demand using a Makefile function,
rather than generating a dependency file. Cleaner and avoids a race
on generating the dep file.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'tools/libxc/Makefile')
| -rw-r--r-- | tools/libxc/Makefile | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 5693025e60..c0fd44b502 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -114,7 +114,7 @@ TAGS: .PHONY: clean clean: - rm -rf *.rpm $(LIB) *~ $(DEPS) .*.deps \ + rm -rf *.rpm $(LIB) *~ $(DEPS) \ $(CTRL_LIB_OBJS) $(CTRL_PIC_OBJS) \ $(GUEST_LIB_OBJS) $(GUEST_PIC_OBJS) @@ -152,30 +152,24 @@ libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR) ln -sf $< $@ ifeq ($(CONFIG_MiniOS),y) -.zlib.deps: - echo >$@ +zlib-options = else -.zlib.deps: - @(set -e; \ - . ../check/funcs.sh; \ - echo >$@.new; \ - if has_header bzlib.h; then \ - echo "-DHAVE_BZLIB" >>$@.new; \ - echo "-lbz2" >>$@.new; \ - echo " - BZIP2 decompression supported"; \ - fi; \ - if has_header lzma.h; then \ - echo "-DHAVE_LZMA" >>$@.new; \ - echo "-llzma" >>$@.new; \ - echo " - LZMA decompression supported"; \ - fi; \ - mv $@.new $@) +zlib-options = $(shell \ + (. ../check/funcs.sh; \ + if has_header bzlib.h; then \ + echo "-DHAVE_BZLIB"; \ + echo "-lbz2"; \ + fi; \ + if has_header lzma.h; then \ + echo "-DHAVE_LZMA"; \ + echo "-llzma"; \ + fi) | grep $(1)) endif -xc_dom_bzimageloader.o: .zlib.deps -xc_dom_bzimageloader.o: CFLAGS += $(shell grep D .zlib.deps) +xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D) +xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D) -libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(shell grep l .zlib.deps) +libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(call zlib-options,l) libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) |