diff options
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/GNUmakefile b/GNUmakefile index 857a7d8..d8a083f 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -9,13 +9,13 @@ CFLAGS += -DVERSION='"$(VERSION)"' -DLIB='"$(LIB)"' TARGETS := xenlog xenscreen BUILD_GTK := xenwatch xenstore mdns-browser BUILD_AVAHI := mdns-publish-xendom mdns-publish-vnc -BUILD_VNCCLIENT := vnc-client +BUILD_GTK_VNC := vnc-client NEEDS_XENSTORE := xenlog xenscreen xenwatch xenstore mdns-publish-xendom mdns-publish-vnc NEEDS_LIBVIRT := xenscreen NEEDS_GTK := xenwatch xenstore mdns-browser vnc-client NEEDS_AVAHI := mdns-browser mdns-publish-xendom mdns-publish-vnc -NEEDS_VNCCLIENT := xenwatch mdns-browser vnc-client +NEEDS_GTK_VNC := xenwatch mdns-browser vnc-client # default target all: build @@ -31,9 +31,8 @@ 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_GTK_VNC := $(call ac_pkg_config,gtk-vnc-1.0) 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 @@ -42,9 +41,9 @@ ifeq ($(HAVE_GTK),yes) $(NEEDS_GTK) : CFLAGS += -Wno-strict-prototypes $(NEEDS_GTK) : pkglst += gtk+-x11-2.0 TARGETS += $(BUILD_GTK) - ifeq ($(HAVE_VNCCLIENT),yes) - TARGETS += $(BUILD_VNCCLIENT) - $(NEEDS_VNCCLIENT) : LDLIBS += -lvncclient -lz -ljpeg -lGL + ifeq ($(HAVE_GTK_VNC),yes) + TARGETS += $(BUILD_GTK_VNC) + $(NEEDS_GTK_VNC) : pkglst += gtk-vnc-1.0 endif endif @@ -62,7 +61,7 @@ ifeq ($(HAVE_LIBVIRT),yes) endif # compile flags -CFLAGS += $(call ac_inc_cflags,XENSTORE LIBVIRT AVAHI VNCCLIENT VNC_TEXT) +CFLAGS += $(call ac_inc_cflags,XENSTORE LIBVIRT AVAHI GTK_VNC) CFLAGS += $(shell test "$(pkglst)" != "" && pkg-config --cflags $(pkglst)) LDLIBS += $(shell test "$(pkglst)" != "" && pkg-config --libs $(pkglst)) |