From 01b527cee6a6446ad5e8fa094ce7c9ff4a0525dc Mon Sep 17 00:00:00 2001
From: kraxel <kraxel>
Date: Tue, 7 Aug 2007 11:21:07 +0000
Subject: some libvirt bits

---
 GNUmakefile | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'GNUmakefile')

diff --git a/GNUmakefile b/GNUmakefile
index fff18b9..79ef2b7 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -8,13 +8,14 @@ CFLAGS	+= -DVERSION='"$(VERSION)"' -DLIB='"$(LIB)"'
 # build
 TARGETS		:= xenlog xenscreen
 BUILD_GTK	:= xenwatch mdns-browser
-BUILD_MDNS	:= mdns-publish-xendom mdns-publish-vnc
-BUILD_VNC       := vnc-client
+BUILD_AVAHI	:= mdns-publish-xendom mdns-publish-vnc
+BUILD_VNCCLIENT := vnc-client
 
 NEEDS_XENSTORE	:= xenlog xenscreen xenwatch mdns-publish-xendom mdns-publish-vnc
+NEEDS_LIBVIRT	:= xenscreen
 NEEDS_GTK	:= xenwatch mdns-browser vnc-client
-NEEDS_MDNS	:= xenwatch mdns-browser mdns-publish-xendom mdns-publish-vnc
-NEEDS_VNC	:= xenwatch mdns-browser vnc-client
+NEEDS_AVAHI	:= xenwatch mdns-browser mdns-publish-xendom mdns-publish-vnc
+NEEDS_VNCCLIENT	:= xenwatch mdns-browser vnc-client
 
 # default target
 all: build
@@ -30,6 +31,7 @@ LIB		:= $(LIB)
 HAVE_GTK	:= $(call ac_pkg_config,gtk+-x11-2.0)
 HAVE_AVAHI	:= $(call ac_pkg_config,avahi-glib)
 HAVE_LIBVIRT	:= $(call ac_pkg_config,libvirt)
+HAVE_XENSTORE	:= $(call ac_lib,xs_daemon_open,xenstore)
 HAVE_VNCCLIENT	:= $(call ac_lib,rfbGetClient,vncclient,-lz -ljpeg)
 HAVE_VNC_TEXT   := $(call ac_lib,TextChatSend,vncclient,-lz -ljpeg)
 endef
@@ -41,20 +43,26 @@ ifeq ($(HAVE_GTK),yes)
   $(NEEDS_GTK) : pkglst += gtk+-x11-2.0
   TARGETS += $(BUILD_GTK)
   ifeq ($(HAVE_VNCCLIENT),yes)
-    TARGETS += $(BUILD_VNC)
-    $(NEEDS_VNC) : LDLIBS += -lvncclient -lz -ljpeg -lGL
+    TARGETS += $(BUILD_VNCCLIENT)
+    $(NEEDS_VNCCLIENT) : LDLIBS += -lvncclient -lz -ljpeg -lGL
   endif
 endif
 
 # avahi stuff
 ifeq ($(HAVE_AVAHI),yes)
-  $(NEEDS_MDNS) : pkglst += avahi-client
-  $(NEEDS_GTK)  : pkglst += avahi-glib
-  TARGETS += $(BUILD_MDNS)
+  $(NEEDS_AVAHI) : pkglst += avahi-client
+  $(NEEDS_GTK)   : pkglst += avahi-glib
+  TARGETS += $(BUILD_AVAHI)
+endif
+
+# libvirt stuff
+ifeq ($(HAVE_LIBVIRT),yes)
+  $(NEEDS_LIBVIRT) : pkglst += libvirt libxml-2.0
+  TARGETS += $(BUILD_LIBVIRT)
 endif
 
 # compile flags
-CFLAGS += $(call ac_inc_cflags,AVAHI VNCCLIENT VNC_TEXT)
+CFLAGS += $(call ac_inc_cflags,XENSTORE LIBVIRT AVAHI VNCCLIENT VNC_TEXT)
 CFLAGS += $(shell test "$(pkglst)" != "" && pkg-config --cflags $(pkglst))
 LDLIBS += $(shell test "$(pkglst)" != "" && pkg-config --libs   $(pkglst))
 
-- 
cgit