xenpm: Use pkgconfig to get cflags and ldflags

diff --git a/master/series b/master/series
index 7778173e31381991ccee016d266945f816b623e4..c455fb75c856b9e128518c9eb88d7bb4cefcef8b 100644 (file)
--- a/master/series
+++ b/master/series
@@ -35,3 +35,4 @@ reset-atapi-after-failed-cd-boot
 vga-edid
 tboot-xen-fixes-01082010.patch
 guest-os-controlled-brightness-support
+xenpm-use-pkgconfig

diff --git a/master/xenpm-use-pkgconfig b/master/xenpm-use-pkgconfig
new file mode 100644 (file)
index 0000000..18c9fad
--- /dev/null
+++ b/master/xenpm-use-pkgconfig
@@ -0,0 +1,16 @@
+diff --git a/tools/xenpmd/Makefile b/tools/xenpmd/Makefile
+index bf335af..be12894 100644
+--- a/tools/xenpmd/Makefile
++++ b/tools/xenpmd/Makefile
+@@ -3,9 +3,9 @@ include $(XEN_ROOT)/tools/Rules.mk
+ 
+ CFLAGS  += -Werror
+ CFLAGS  += $(CFLAGS_libxenstore)
+-CFLAGS  += -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
++CFLAGS  += $(shell pkg-config dbus-glib-1 --cflags)
+ LDFLAGS += $(LDFLAGS_libxenstore)
+-LDFLAGS += -ldbus-glib-1 -ldbus-1 -lpthread -lgobject-2.0 -lglib-2.0 -lintl
++LDFLAGS += $(shell pkg-confing dbus-glib-1 --libs) -lpthread -lintl
+ 
+ BIN      = xenpmd
+