Some distros (a 4-letters) don't have icotool.
Let's ship the .ico in the tarball.
The build will fail if icoutil is not installed when
building from git or when the .ico is absent. The error
should be explicit.
---
configure.ac | 6 ++----
icons/Makefile.am | 2 +-
src/Makefile.am | 4 ++--
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index c8e7429..291bdb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,16 +38,14 @@ AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_LIBTOOL
+AC_CHECK_PROGS(ICOTOOL, [icotool], [icotool])
+
AS_IF([test "x$os_win32" = "xyes"], [
AC_CHECK_TOOL(WINDRES, [windres])
- AC_CHECK_PROGS(ICOTOOL, [icotool])
if test -z "$WINDRES" ; then
AC_MSG_ERROR("windres is required to compile virt-viewer on this platform")
fi
- if test -z "$ICOTOOL" ; then
- AC_MSG_ERROR("icotool is required to compile virt-viewer on this platform")
- fi
])
AC_CONFIG_LIBOBJ_DIR([src])
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 699d36d..8f2db64 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -9,6 +9,6 @@ ico_sizes = 16 32 48 256
%.ico: $(foreach s,$(ico_sizes),$(s)x$(s)/%.png)
$(AM_V_GEN)$(ICOTOOL) -c -o $@ $^
-CLEANFILES = virt-viewer.ico
+EXTRA_DIST = virt-viewer.ico
-include $(top_srcdir)/git.mk
diff --git a/src/Makefile.am b/src/Makefile.am
index 6b7d2ee..d99b043 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -121,7 +121,7 @@ desktop_DATA = remote-viewer.desktop
EXTRA_DIST += $(desktop_DATA)
VIRT_VIEWER_RES = virt-viewer.rc virt-viewer.manifest
-ICONDIR = $(top_builddir)/icons
+ICONDIR = $(top_srcdir)/icons
MANIFESTDIR = $(srcdir)
EXTRA_DIST += $(VIRT_VIEWER_RES)
@@ -130,7 +130,7 @@ bin_PROGRAMS += windows-cmdline-wrapper
windows_cmdline_wrapper_SOURCES = windows-cmdline-wrapper.c
windows_cmdline_wrapper_LDFLAGS = -lpsapi
-virt-viewer_rc.$(OBJEXT): $(VIRT_VIEWER_RES) $(top_builddir)/icons/virt-viewer.ico
+virt-viewer_rc.$(OBJEXT): $(VIRT_VIEWER_RES) $(ICONDIR)/virt-viewer.ico
$(AM_V_GEN)$(WINDRES) \
-DICONDIR='\"$(ICONDIR)\"' \
-DMANIFESTDIR='\"$(MANIFESTDIR)\"' \
--
1.7.10.1
