[PATCH 0/2] libxl: two pkg-config related patches

[PATCH 0/2] libxl: two pkg-config related patches

[Wei Liu]

Wei Liu (2):
  libxl: don't delete xenlight.pc.in when cleaning
  libxl: provide xlutil.pc

 .gitignore                  |    4 ++--
 tools/configure.ac          |    1 +
 tools/libxl/Makefile        |   10 ++++++----
 tools/libxl/xlutil.pc.in.in |    9 +++++++++
 4 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 tools/libxl/xlutil.pc.in.in

-- 
1.7.10.4

[PATCH 1/2] libxl: don't delete xenlight.pc.in when cleaning

[Wei Liu]

That file is generated by configure. Deleting it leads to rerun
configure after every 'make clean'.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 tools/libxl/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index 08fe814..9f36924 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -282,7 +282,7 @@ clean:
 	$(RM) -f _*.h *.o *.so* *.a $(CLIENTS) $(DEPS)
 	$(RM) -f _*.c *.pyc _paths.*.tmp _*.api-for-check
 	$(RM) -f testidl.c.new testidl.c *.api-ok
-	$(RM) -f xenlight.pc xenlight.pc.in
+	$(RM) -f xenlight.pc
 
 distclean: clean
 
-- 
1.7.10.4

[PATCH 2/2] libxl: provide xlutil.pc

[Wei Liu]

Please rerun autogen.sh after applying this patch.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 .gitignore                  |    4 ++--
 tools/configure.ac          |    1 +
 tools/libxl/Makefile        |    8 +++++---
 tools/libxl/xlutil.pc.in.in |    9 +++++++++
 4 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 tools/libxl/xlutil.pc.in.in

diff --git a/.gitignore b/.gitignore
index 33c2ca0..13ee05b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -153,8 +153,8 @@ tools/include/xen/*
 tools/include/xen-foreign/*.(c|h|size)
 tools/include/xen-foreign/checker
 tools/libxl/libxlu_cfg_y.output
-tools/libxl/xenlight.pc
-tools/libxl/xenlight.pc.in
+tools/libxl/*.pc
+tools/libxl/*.pc.in
 tools/libxl/xl
 tools/libxl/testenum
 tools/libxl/testenum.c
diff --git a/tools/configure.ac b/tools/configure.ac
index 113285d..1ecc216 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -28,6 +28,7 @@ hotplug/Linux/xen-hotplug-common.sh
 hotplug/Linux/xendomains
 hotplug/NetBSD/rc.d/xencommons
 libxl/xenlight.pc.in
+libxl/xlutil.pc.in
 ])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([../])
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index 9f36924..a579187 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -143,7 +143,7 @@ $(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxenstore)
 SAVE_HELPER_OBJS = libxl_save_helper.o _libxl_save_msgs_helper.o
 $(SAVE_HELPER_OBJS): CFLAGS += $(CFLAGS_libxenctrl)
 
-PKG_CONFIG = xenlight.pc
+PKG_CONFIG = xenlight.pc xlutil.pc
 
 testidl.o: CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenlight)
 testidl.c: libxl_types.idl gentest.py libxl.h $(AUTOINCS)
@@ -250,8 +250,8 @@ libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so
 testidl: testidl.o libxlutil.so libxenlight.so
 	$(CC) $(LDFLAGS) -o $@ testidl.o libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS)
 
-xenlight.pc: xenlight.pc.in Makefile
-	@sed -e 's/@@version@@/$(MAJOR).$(MINOR)/g' < xenlight.pc.in > $@.new
+$(PKG_CONFIG): %.in : Makefile
+	@sed -e 's/@@version@@/$(MAJOR).$(MINOR)/g' < $@.in > $@.new
 	@mv -f $@.new $@
 
 .PHONY: install
@@ -276,6 +276,7 @@ install: all
 	$(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h libxlutil.h $(DESTDIR)$(INCLUDEDIR)
 	$(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh
 	$(INSTALL_DATA) xenlight.pc $(DESTDIR)$(SHAREDIR)/pkgconfig/
+	$(INSTALL_DATA) xlutil.pc $(DESTDIR)$(SHAREDIR)/pkgconfig/
 
 .PHONY: clean
 clean:
@@ -283,6 +284,7 @@ clean:
 	$(RM) -f _*.c *.pyc _paths.*.tmp _*.api-for-check
 	$(RM) -f testidl.c.new testidl.c *.api-ok
 	$(RM) -f xenlight.pc
+	$(RM) -f xlutil.pc
 
 distclean: clean
 
diff --git a/tools/libxl/xlutil.pc.in.in b/tools/libxl/xlutil.pc.in.in
new file mode 100644
index 0000000..e7dc14d
--- /dev/null
+++ b/tools/libxl/xlutil.pc.in.in
@@ -0,0 +1,9 @@
+prefix=@prefix@
+includedir=@includedir@
+libdir=@libdir@
+
+Name: Xlutil
+Description: The xl utility library for Xen hypervisor
+Version: @@version@@
+Cflags: -I${includedir}
+Libs: -L${libdir} -lxlutil
-- 
1.7.10.4

Re: [PATCH 1/2] libxl: don't delete xenlight.pc.in when cleaning

[Ian Campbell]

On Tue, 2015-01-20 at 11:29 +0000, Wei Liu wrote:
> That file is generated by configure. Deleting it leads to rerun
> configure after every 'make clean'.

Can you move it to distclean then please. With that:
Acked-by: Ian Campbell <ian.campbell@citrix.com>

> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> Cc: Ian Campbell <ian.campbell@citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> ---
>  tools/libxl/Makefile |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
> index 08fe814..9f36924 100644
> --- a/tools/libxl/Makefile
> +++ b/tools/libxl/Makefile
> @@ -282,7 +282,7 @@ clean:
>  	$(RM) -f _*.h *.o *.so* *.a $(CLIENTS) $(DEPS)
>  	$(RM) -f _*.c *.pyc _paths.*.tmp _*.api-for-check
>  	$(RM) -f testidl.c.new testidl.c *.api-ok
> -	$(RM) -f xenlight.pc xenlight.pc.in
> +	$(RM) -f xenlight.pc
>  
>  distclean: clean
>  

Re: [PATCH 2/2] libxl: provide xlutil.pc

[Ian Campbell]

On Tue, 2015-01-20 at 11:29 +0000, Wei Liu wrote:
> Please rerun autogen.sh after applying this patch.
> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> Cc: Ian Campbell <ian.campbell@citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>

As with the previous, please clean t he .in in distclean, otherwise:
Acked-by: Ian Campbell <ian.campbell@citrix.com>

Re: [PATCH 1/2] libxl: don't delete xenlight.pc.in when cleaning

[Ian Jackson]

Wei Liu writes ("[PATCH 1/2] libxl: don't delete xenlight.pc.in when cleaning"):
> That file is generated by configure. Deleting it leads to rerun
> configure after every 'make clean'.
...
> -	$(RM) -f xenlight.pc xenlight.pc.in
> +	$(RM) -f xenlight.pc
>  
>  distclean: clean

Surely this should be moved to the distclean target, not just
removed ?

Ian.

Re: [PATCH 2/2] libxl: provide xlutil.pc

[Ian Jackson]

Wei Liu writes ("[PATCH 2/2] libxl: provide xlutil.pc"):
> +++ b/tools/libxl/xlutil.pc.in.in
> @@ -0,0 +1,9 @@
> +prefix=@prefix@
> +includedir=@includedir@
> +libdir=@libdir@

I haven't reviewed this in detail but it looks plausible.

I think (apropos of my comment on the previous patch) that
xlutil.pc.in should be deleted by distclean.

Thanks,
Ian.