dist: ship .ico in tarball
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.
Marc-André Lureau
11 years ago
| 37 | 37 |
AM_PROG_CC_C_O
|
| 38 | 38 |
AC_PROG_LIBTOOL
|
| 39 | 39 |
|
|
40 |
AC_CHECK_PROGS(ICOTOOL, [icotool], [icotool])
|
|
41 |
|
| 40 | 42 |
AS_IF([test "x$os_win32" = "xyes"], [
|
| 41 | 43 |
AC_CHECK_TOOL(WINDRES, [windres])
|
| 42 | |
AC_CHECK_PROGS(ICOTOOL, [icotool])
|
| 43 | 44 |
|
| 44 | 45 |
if test -z "$WINDRES" ; then
|
| 45 | 46 |
AC_MSG_ERROR("windres is required to compile virt-viewer on this platform")
|
| 46 | |
fi
|
| 47 | |
if test -z "$ICOTOOL" ; then
|
| 48 | |
AC_MSG_ERROR("icotool is required to compile virt-viewer on this platform")
|
| 49 | 47 |
fi
|
| 50 | 48 |
])
|
| 51 | 49 |
|
| 8 | 8 |
%.ico: $(foreach s,$(ico_sizes),$(s)x$(s)/%.png)
|
| 9 | 9 |
$(AM_V_GEN)$(ICOTOOL) -c -o $@ $^
|
| 10 | 10 |
|
| 11 | |
CLEANFILES = virt-viewer.ico
|
|
11 |
EXTRA_DIST = virt-viewer.ico
|
| 12 | 12 |
|
| 13 | 13 |
-include $(top_srcdir)/git.mk
|
| 120 | 120 |
EXTRA_DIST += $(desktop_DATA)
|
| 121 | 121 |
|
| 122 | 122 |
VIRT_VIEWER_RES = virt-viewer.rc virt-viewer.manifest
|
| 123 | |
ICONDIR = $(top_builddir)/icons
|
|
123 |
ICONDIR = $(top_srcdir)/icons
|
| 124 | 124 |
MANIFESTDIR = $(srcdir)
|
| 125 | 125 |
EXTRA_DIST += $(VIRT_VIEWER_RES)
|
| 126 | 126 |
|
|
| 129 | 129 |
windows_cmdline_wrapper_SOURCES = windows-cmdline-wrapper.c
|
| 130 | 130 |
windows_cmdline_wrapper_LDFLAGS = -lpsapi
|
| 131 | 131 |
|
| 132 | |
virt-viewer_rc.$(OBJEXT): $(VIRT_VIEWER_RES) $(top_builddir)/icons/virt-viewer.ico
|
|
132 |
virt-viewer_rc.$(OBJEXT): $(VIRT_VIEWER_RES) $(ICONDIR)/virt-viewer.ico
|
| 133 | 133 |
$(AM_V_GEN)$(WINDRES) \
|
| 134 | 134 |
-DICONDIR='\"$(ICONDIR)\"' \
|
| 135 | 135 |
-DMANIFESTDIR='\"$(MANIFESTDIR)\"' \
|