[PATCH] libxl: Add make deps

[PATCH] libxl: Add make deps

[Jean Guyader]

[-- Attachment #1: Type: text/plain, Size: 156 bytes --]


Signed-off-by: Jean Guyader <jean.guyader@eu.citrix.com>
---
 tools/libxl/Makefile |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-libxl-Add-make-deps.patch --]
[-- Type: text/x-patch; name="0001-libxl-Add-make-deps.patch", Size: 797 bytes --]

diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index 0358cea..79c585f 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -25,11 +25,16 @@ LIBCONFIG_OUTPUT = $(LIBCONFIG_SOURCE)/.libs
 
 LIBXL_OBJS-y = osdeps.o
 LIBXL_OBJS = flexarray.o libxl.o libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o libxl_internal.o xenguest.o libxl_utils.o $(LIBXL_OBJS-y)
+LIBXL_HEADERS = flexarray.h libxl.h libxl_internal.h libxl_osdeps.h libxl_utils.h xen_uuid.h
+LIBXL_SRCS = ${LIBXL_OBJS:.o=.c} $(LIBXL_HEADERS) xl.c
 
 CLIENTS = xl
 
 .PHONY: all
-all: $(CLIENTS) libxenlight.so libxenlight.a
+all: $(CLIENTS) libxenlight.so libxenlight.a .deps
+
+.deps: $(LIBXL_SRCS)
+	$(CC) -MM $(LIBXL_SRCS) > .deps
 
 libxenlight.so: libxenlight.so.$(MAJOR)
 	ln -sf $< $@

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

[PATCH] libxl: Makefile and libconfig

[Jean Guyader]

[-- Attachment #1: Type: text/plain, Size: 220 bytes --]


Get rid of the depedency on the LIBCONFIG_SOURCE directory.

Signed-off-by: Jean Guyader <jean.guyader@eu.citrix.com>
---
 tools/libxl/Makefile |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-libxl-Makefile-and-libconfig.patch --]
[-- Type: text/x-patch; name="0002-libxl-Makefile-and-libconfig.patch", Size: 770 bytes --]

diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index 79c585f..4fba7f6 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -51,13 +51,11 @@ libxenlight.a: $(LIBXL_OBJS)
 $(LIBCONFIG_SOURCE).tar.gz:
 	$(WGET) $(LIBCONFIG_URL)/$@
 
-$(LIBCONFIG_SOURCE): $(LIBCONFIG_SOURCE).tar.gz
-	tar xzf $<
-
-$(LIBCONFIG_OUTPUT)/libconfig.so: $(LIBCONFIG_SOURCE)
+$(LIBCONFIG_OUTPUT)/libconfig.so: $(LIBCONFIG_SOURCE).tar.gz
+	[ ! -d "$(LIBCONFIG_SOURCE)" ] && tar xzf $<
 	cd $(LIBCONFIG_SOURCE) && ./configure --prefix=$(DESTDIR)$(PREFIX) && $(MAKE)
 
-xl.o: $(LIBCONFIG_SOURCE)
+xl.o: $(LIBCONFIG_OUTPUT)/libconfig.so xl.c
 	$(CC) $(CFLAGS) -I$(LIBCONFIG_SOURCE) -c xl.c
 
 $(CLIENTS): xl.o libxenlight.so $(LIBCONFIG_OUTPUT)/libconfig.so

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: [PATCH] libxl: Makefile and libconfig

[Paolo Bonzini]

On 12/03/2009 04:20 PM, Jean Guyader wrote:
> +$(LIBCONFIG_OUTPUT)/libconfig.so: $(LIBCONFIG_SOURCE).tar.gz
> +	[ ! -d "$(LIBCONFIG_SOURCE)" ]&&  tar xzf $<

If the .tar.gz changes you have to rm -rf first and then extract.

Paolo