Blob Blame History Raw

# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1250803576 -3600
# Node ID 7dad2e23bf892a6be9244265e028a9899503e664
# Parent a687c4d35fdd00c89c097d691c3039e07f737a1d
libxenguest: Fix libbz2/liblzma dependency computation.

 1. Create an empty dep file if neither lib is installed
 2. Forcibly disable support for libs if building minios

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

--- a/tools/libxc/Makefile	Thu Aug 20 22:12:25 2009 +0100
+++ b/tools/libxc/Makefile	Thu Aug 20 22:26:16 2009 +0100
@@ -151,10 +151,14 @@ libxenguest.so.$(MAJOR): libxenguest.so.
 libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
 	ln -sf $< $@
 
+ifeq ($(CONFIG_MiniOS),y)
+.zlib.deps:
+	echo >$@
+else
 .zlib.deps:
 	@(set -e;					\
           . ../check/funcs.sh;				\
-	  rm -f $@.new;					\
+	  echo >$@.new;					\
 	  if has_header bzlib.h; then			\
             echo "-DHAVE_BZLIB" >>$@.new;		\
 	    echo "-lbz2" >>$@.new;			\
@@ -166,6 +170,7 @@ libxenguest.so.$(MAJOR): libxenguest.so.
 	    echo " - LZMA decompression supported";	\
 	  fi;						\
 	  mv $@.new $@)
+endif
 
 xc_dom_bzimageloader.o: .zlib.deps
 xc_dom_bzimageloader.o: CFLAGS += $(shell grep D .zlib.deps)