Commit 5fffe42f authored by Laurent Léonard's avatar Laurent Léonard

Imported Upstream version 0.9.0

parent e1716e03
......@@ -69,6 +69,7 @@ Further patches have been submitted by:
Niels de Vos <ndevos-at-redhat-dot-com>
Wen Congyang <wency-at-cn-dot-fujitsu-dot-com>
Gerhard Stenzel <gerhard-dot-stenzel-at-de-dot-ibm-dot-com>
Yuri Chornoivan <yurchor-at-ukr-dot-net>
<...send a patch & get your name here...>
......
......@@ -10,4 +10,5 @@ a fairly recent version of glade-3: if a small UI change seems to rewrite the
entire glade file, you likely have a too old (or too new :) glade version.
Before submitting any patches, please run 'make check-pylint' to check for
basic syntax errors/warnings. This command requires the pylint package.
basic syntax errors/warnings. This command requires the pylint and python-pep8
packages to be installed.
ACLOCAL_AMFLAGS = -I m4/
SUBDIRS = src pixmaps man po tests
SUBDIRS = src icons man po tests
EXTRA_DIST = @PACKAGE@.spec HACKING COPYING-DOCS xmldocs.make omf.make \
intltool-extract.in intltool-merge.in intltool-update.in
......
......@@ -227,7 +227,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4/
SUBDIRS = src pixmaps man po tests
SUBDIRS = src icons man po tests
EXTRA_DIST = @PACKAGE@.spec HACKING COPYING-DOCS xmldocs.make omf.make \
intltool-extract.in intltool-merge.in intltool-update.in
......
Virtual Machine Manager News
============================
Release 0.9.0 (July 26, 2011)
-----------------------------
- Use a hiding toolbar for fullscreen mode
- Use libguestfs to show guest packagelist and more (Richard W.M. Jones)
- Basic 'New VM' wizard support for LXC guests
- Remote serial console access (with latest libvirt)
- Remote URL guest installs (with latest libvirt)
- Add Hardware: Support <filesystem> devices
- Add Hardware: Support <smartcard> devices (Marc-André Lureau)
- Enable direct interface selection for qemu/kvm (Gerhard Stenzel)
- Allow viewing and changing disk serial number
Release 0.8.7 (March 24, 2011)
------------------------------
- Allow renaming an offline VM
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.66 for virt-manager 0.8.7.
# Generated by GNU Autoconf 2.66 for virt-manager 0.9.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -549,8 +549,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='virt-manager'
PACKAGE_TARNAME='virt-manager'
PACKAGE_VERSION='0.8.7'
PACKAGE_STRING='virt-manager 0.8.7'
PACKAGE_VERSION='0.9.0'
PACKAGE_STRING='virt-manager 0.9.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
......@@ -718,7 +718,7 @@ with_libvirt_package_names
with_kvm_packages
enable_unsupported_rhel_options
with_preferred_distros
with___with_default_graphics
with_default_graphics
'
ac_precious_vars='build_alias
host_alias
......@@ -1270,7 +1270,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures virt-manager 0.8.7 to adapt to many kinds of systems.
\`configure' configures virt-manager 0.9.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1340,7 +1340,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of virt-manager 0.8.7:";;
short | recursive ) echo "Configuration of virt-manager 0.9.0:";;
esac
cat <<\_ACEOF
......@@ -1457,7 +1457,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
virt-manager configure 0.8.7
virt-manager configure 0.9.0
generated by GNU Autoconf 2.66
Copyright (C) 2010 Free Software Foundation, Inc.
......@@ -1704,7 +1704,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by virt-manager $as_me 0.8.7, which was
It was created by virt-manager $as_me 0.9.0, which was
generated by GNU Autoconf 2.66. Invocation command line was
$ $0 $@
......@@ -2054,7 +2054,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Latest virtinst version required to run
VIRTINST_VERSION="0.500.6"
VIRTINST_VERSION="0.600.0"
am__api_version='1.11'
......@@ -2524,7 +2524,7 @@ fi
# Define the identity of the package.
PACKAGE='virt-manager'
VERSION='0.8.7'
VERSION='0.9.0'
cat >>confdefs.h <<_ACEOF
......@@ -6521,7 +6521,9 @@ fi
# Check whether --enable-unsupported-rhel-options was given.
if test "${enable_unsupported_rhel_options+set}" = set; then :
enableval=$enable_unsupported_rhel_options; test "x$enableval" == "xno" && ENABLE_UNSUPPORTED_RHEL_OPTS=0
enableval=$enable_unsupported_rhel_options; test "x$enableval" == "xno" && \
ENABLE_UNSUPPORTED_RHEL_OPTS=0 ||
ENABLE_UNSUPPORTED_RHEL_OPTS=1
else
ENABLE_UNSUPPORTED_RHEL_OPTS=1
fi
......@@ -6537,9 +6539,9 @@ fi
# Check whether --with---with-default-graphics was given.
if test "${with___with_default_graphics+set}" = set; then :
withval=$with___with_default_graphics; DEFAULT_GRAPHICS=$withval
# Check whether --with-default-graphics was given.
if test "${with_default_graphics+set}" = set; then :
withval=$with_default_graphics; DEFAULT_GRAPHICS=$withval
else
DEFAULT_GRAPHICS="vnc"
fi
......@@ -6562,7 +6564,7 @@ fi
ac_config_files="$ac_config_files Makefile pixmaps/Makefile pixmaps/hicolor/Makefile pixmaps/hicolor/16x16/Makefile pixmaps/hicolor/16x16/actions/Makefile pixmaps/hicolor/22x22/Makefile pixmaps/hicolor/22x22/actions/Makefile pixmaps/hicolor/24x24/Makefile pixmaps/hicolor/24x24/actions/Makefile pixmaps/hicolor/32x32/Makefile pixmaps/hicolor/32x32/actions/Makefile po/Makefile.in src/Makefile src/virtManager/Makefile src/virtManagerTui/Makefile man/Makefile tests/Makefile virt-manager.spec"
ac_config_files="$ac_config_files Makefile po/Makefile.in src/Makefile src/virtManager/Makefile src/virtManagerTui/Makefile src/virtManagerTui/importblacklist/Makefile man/Makefile tests/Makefile virt-manager.spec icons/Makefile icons/hicolor/Makefile icons/hicolor/16x16/Makefile icons/hicolor/22x22/Makefile icons/hicolor/24x24/Makefile icons/hicolor/32x32/Makefile icons/hicolor/48x48/Makefile icons/hicolor/256x256/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
......@@ -7134,7 +7136,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by virt-manager $as_me 0.8.7, which was
This file was extended by virt-manager $as_me 0.9.0, which was
generated by GNU Autoconf 2.66. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -7191,7 +7193,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
virt-manager config.status 0.8.7
virt-manager config.status 0.9.0
configured by $0, generated by GNU Autoconf 2.66,
with options \\"\$ac_cs_config\\"
......@@ -7313,23 +7315,22 @@ do
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/Makefile" ;;
"pixmaps/hicolor/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/hicolor/Makefile" ;;
"pixmaps/hicolor/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/hicolor/16x16/Makefile" ;;
"pixmaps/hicolor/16x16/actions/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/hicolor/16x16/actions/Makefile" ;;
"pixmaps/hicolor/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/hicolor/22x22/Makefile" ;;
"pixmaps/hicolor/22x22/actions/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/hicolor/22x22/actions/Makefile" ;;
"pixmaps/hicolor/24x24/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/hicolor/24x24/Makefile" ;;
"pixmaps/hicolor/24x24/actions/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/hicolor/24x24/actions/Makefile" ;;
"pixmaps/hicolor/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/hicolor/32x32/Makefile" ;;
"pixmaps/hicolor/32x32/actions/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/hicolor/32x32/actions/Makefile" ;;
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/virtManager/Makefile") CONFIG_FILES="$CONFIG_FILES src/virtManager/Makefile" ;;
"src/virtManagerTui/Makefile") CONFIG_FILES="$CONFIG_FILES src/virtManagerTui/Makefile" ;;
"src/virtManagerTui/importblacklist/Makefile") CONFIG_FILES="$CONFIG_FILES src/virtManagerTui/importblacklist/Makefile" ;;
"man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"virt-manager.spec") CONFIG_FILES="$CONFIG_FILES virt-manager.spec" ;;
"icons/Makefile") CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;;
"icons/hicolor/Makefile") CONFIG_FILES="$CONFIG_FILES icons/hicolor/Makefile" ;;
"icons/hicolor/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES icons/hicolor/16x16/Makefile" ;;
"icons/hicolor/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES icons/hicolor/22x22/Makefile" ;;
"icons/hicolor/24x24/Makefile") CONFIG_FILES="$CONFIG_FILES icons/hicolor/24x24/Makefile" ;;
"icons/hicolor/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES icons/hicolor/32x32/Makefile" ;;
"icons/hicolor/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES icons/hicolor/48x48/Makefile" ;;
"icons/hicolor/256x256/Makefile") CONFIG_FILES="$CONFIG_FILES icons/hicolor/256x256/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
......
AC_INIT(virt-manager, 0.8.7)
AC_INIT(virt-manager, 0.9.0)
# Latest virtinst version required to run
VIRTINST_VERSION="0.500.6"
VIRTINST_VERSION="0.600.0"
AC_CONFIG_SRCDIR(src/virt-manager.py.in)
dnl Make automake keep quiet about wildcards & other GNUmake-isms
......@@ -69,7 +69,9 @@ AC_ARG_ENABLE([unsupported-rhel-options],
AC_HELP_STRING(
[--enable-unsupported-rhel-options],
[enable VM config options unsupported by RHEL @<:@default=yes@:>@]),
[test "x$enableval" == "xno" && ENABLE_UNSUPPORTED_RHEL_OPTS=0],
[test "x$enableval" == "xno" && \
ENABLE_UNSUPPORTED_RHEL_OPTS=0 ||
ENABLE_UNSUPPORTED_RHEL_OPTS=1],
[ENABLE_UNSUPPORTED_RHEL_OPTS=1])
dnl Allow passing in a prefered distro list
......@@ -81,7 +83,7 @@ AC_ARG_WITH([preferred-distros],
[PREFERRED_DISTROS=""])
dnl Default graphics type (spice/vnc)
AC_ARG_WITH([--with-default-graphics],
AC_ARG_WITH([default-graphics],
AC_HELP_STRING(
[--with-default-graphics],
[default graphics type for new guests in gconf(spice or vnc) @<:@default=vnc@:>@]),
......@@ -102,23 +104,24 @@ AM_CONDITIONAL([INSTALL_TUI], [test "x$with_tui" = "xyes"])
AC_OUTPUT(Makefile
pixmaps/Makefile
pixmaps/hicolor/Makefile
pixmaps/hicolor/16x16/Makefile
pixmaps/hicolor/16x16/actions/Makefile
pixmaps/hicolor/22x22/Makefile
pixmaps/hicolor/22x22/actions/Makefile
pixmaps/hicolor/24x24/Makefile
pixmaps/hicolor/24x24/actions/Makefile
pixmaps/hicolor/32x32/Makefile
pixmaps/hicolor/32x32/actions/Makefile
po/Makefile.in
src/Makefile
src/virtManager/Makefile
src/virtManagerTui/Makefile
src/virtManagerTui/importblacklist/Makefile
man/Makefile
tests/Makefile
virt-manager.spec)
virt-manager.spec
icons/Makefile
icons/hicolor/Makefile
icons/hicolor/16x16/Makefile
icons/hicolor/22x22/Makefile
icons/hicolor/24x24/Makefile
icons/hicolor/32x32/Makefile
icons/hicolor/48x48/Makefile
icons/hicolor/256x256/Makefile
)
AC_MSG_NOTICE([])
......
......@@ -34,7 +34,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = pixmaps
subdir = icons
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
......@@ -250,9 +250,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pixmaps/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu pixmaps/Makefile
$(AUTOMAKE) --gnu icons/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
size = $(notdir $(PWD))
appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
actionsiconsdir = $(pkgdatadir)/icons/hicolor/$(size)/actions
dist_appicons_DATA = \
$(wildcard $(srcdir)/apps/*.png)
dist_actionsicons_DATA = \
$(wildcard $(srcdir)/actions/*.png)
......@@ -34,8 +34,9 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = pixmaps/hicolor/16x16/actions
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
subdir = icons/hicolor/16x16
DIST_COMMON = $(dist_actionsicons_DATA) $(dist_appicons_DATA) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
......@@ -66,8 +67,9 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(pixmapdir)"
DATA = $(pixmap_DATA)
am__installdirs = "$(DESTDIR)$(actionsiconsdir)" \
"$(DESTDIR)$(appiconsdir)"
DATA = $(dist_actionsicons_DATA) $(dist_appicons_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
......@@ -194,9 +196,15 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
pixmapdir = $(pkgdatadir)/pixmaps/hicolor/16x16/actions
pixmap_DATA = $(wildcard $(srcdir)/*.png)
EXTRA_DIST = $(pixmap_DATA)
size = $(notdir $(PWD))
appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
actionsiconsdir = $(pkgdatadir)/icons/hicolor/$(size)/actions
dist_appicons_DATA = \
$(wildcard $(srcdir)/apps/*.png)
dist_actionsicons_DATA = \
$(wildcard $(srcdir)/actions/*.png)
all: all-am
.SUFFIXES:
......@@ -209,9 +217,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pixmaps/hicolor/16x16/actions/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/hicolor/16x16/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu pixmaps/hicolor/16x16/actions/Makefile
$(AUTOMAKE) --gnu icons/hicolor/16x16/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......@@ -230,26 +238,46 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-pixmapDATA: $(pixmap_DATA)
install-dist_actionsiconsDATA: $(dist_actionsicons_DATA)
@$(NORMAL_INSTALL)
test -z "$(actionsiconsdir)" || $(MKDIR_P) "$(DESTDIR)$(actionsiconsdir)"
@list='$(dist_actionsicons_DATA)'; test -n "$(actionsiconsdir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(actionsiconsdir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(actionsiconsdir)" || exit $$?; \
done
uninstall-dist_actionsiconsDATA:
@$(NORMAL_UNINSTALL)
@list='$(dist_actionsicons_DATA)'; test -n "$(actionsiconsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(actionsiconsdir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(actionsiconsdir)" && rm -f $$files
install-dist_appiconsDATA: $(dist_appicons_DATA)
@$(NORMAL_INSTALL)
test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
@list='$(pixmap_DATA)'; test -n "$(pixmapdir)" || list=; \
test -z "$(appiconsdir)" || $(MKDIR_P) "$(DESTDIR)$(appiconsdir)"
@list='$(dist_appicons_DATA)'; test -n "$(appiconsdir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pixmapdir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(pixmapdir)" || exit $$?; \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appiconsdir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(appiconsdir)" || exit $$?; \
done
uninstall-pixmapDATA:
uninstall-dist_appiconsDATA:
@$(NORMAL_UNINSTALL)
@list='$(pixmap_DATA)'; test -n "$(pixmapdir)" || list=; \
@list='$(dist_appicons_DATA)'; test -n "$(appiconsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(pixmapdir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(pixmapdir)" && rm -f $$files
echo " ( cd '$(DESTDIR)$(appiconsdir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(appiconsdir)" && rm -f $$files
tags: TAGS
TAGS:
......@@ -291,7 +319,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(pixmapdir)"; do \
for dir in "$(DESTDIR)$(actionsiconsdir)" "$(DESTDIR)$(appiconsdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
......@@ -339,7 +367,8 @@ info: info-am
info-am:
install-data-am: install-pixmapDATA
install-data-am: install-dist_actionsiconsDATA \
install-dist_appiconsDATA
install-dvi: install-dvi-am
......@@ -383,20 +412,23 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-pixmapDATA
uninstall-am: uninstall-dist_actionsiconsDATA \
uninstall-dist_appiconsDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-pdf install-pdf-am install-pixmapDATA install-ps \
install install-am install-data install-data-am \
install-dist_actionsiconsDATA install-dist_appiconsDATA \
install-dvi install-dvi-am install-exec install-exec-am \
install-html install-html-am install-info install-info-am \
install-man install-pdf install-pdf-am install-ps \
install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
uninstall-am uninstall-pixmapDATA
uninstall-am uninstall-dist_actionsiconsDATA \
uninstall-dist_appiconsDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
......
size = $(notdir $(PWD))
appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
actionsiconsdir = $(pkgdatadir)/icons/hicolor/$(size)/actions
devicesiconsdir = $(pkgdatadir)/icons/hicolor/$(size)/devices
dist_appicons_DATA = \
$(wildcard $(srcdir)/apps/*.png)
dist_actionsicons_DATA = \
$(wildcard $(srcdir)/actions/*.png)
dist_devicesicons_DATA = \
$(wildcard $(srcdir)/devices/*.png)
This diff is collapsed.
size = $(notdir $(PWD))
appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
actionsiconsdir = $(pkgdatadir)/icons/hicolor/$(size)/actions
dist_appicons_DATA = \
$(wildcard $(srcdir)/apps/*.png)
dist_actionsicons_DATA = \
$(wildcard $(srcdir)/actions/*.png)
......@@ -34,8 +34,9 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = pixmaps/hicolor/24x24/actions
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
subdir = icons/hicolor/24x24
DIST_COMMON = $(dist_actionsicons_DATA) $(dist_appicons_DATA) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
......@@ -66,8 +67,9 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(pixmapdir)"
DATA = $(pixmap_DATA)
am__installdirs = "$(DESTDIR)$(actionsiconsdir)" \
"$(DESTDIR)$(appiconsdir)"
DATA = $(dist_actionsicons_DATA) $(dist_appicons_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
......@@ -194,9 +196,15 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
pixmapdir = $(pkgdatadir)/pixmaps/hicolor/24x24/actions
pixmap_DATA = $(wildcard $(srcdir)/*.png)
EXTRA_DIST = $(pixmap_DATA)
size = $(notdir $(PWD))
appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
actionsiconsdir = $(pkgdatadir)/icons/hicolor/$(size)/actions
dist_appicons_DATA = \
$(wildcard $(srcdir)/apps/*.png)
dist_actionsicons_DATA = \
$(wildcard $(srcdir)/actions/*.png)
all: all-am
.SUFFIXES:
......@@ -209,9 +217,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pixmaps/hicolor/24x24/actions/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/hicolor/24x24/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu pixmaps/hicolor/24x24/actions/Makefile
$(AUTOMAKE) --gnu icons/hicolor/24x24/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......@@ -230,26 +238,46 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-pixmapDATA: $(pixmap_DATA)
install-dist_actionsiconsDATA: $(dist_actionsicons_DATA)
@$(NORMAL_INSTALL)
test -z "$(actionsiconsdir)" || $(MKDIR_P) "$(DESTDIR)$(actionsiconsdir)"
@list='$(dist_actionsicons_DATA)'; test -n "$(actionsiconsdir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(actionsiconsdir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(actionsiconsdir)" || exit $$?; \
done
uninstall-dist_actionsiconsDATA:
@$(NORMAL_UNINSTALL)
@list='$(dist_actionsicons_DATA)'; test -n "$(actionsiconsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(actionsiconsdir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(actionsiconsdir)" && rm -f $$files
install-dist_appiconsDATA: $(dist_appicons_DATA)
@$(NORMAL_INSTALL)
test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
@list='$(pixmap_DATA)'; test -n "$(pixmapdir)" || list=; \
test -z "$(appiconsdir)" || $(MKDIR_P) "$(DESTDIR)$(appiconsdir)"
@list='$(dist_appicons_DATA)'; test -n "$(appiconsdir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pixmapdir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(pixmapdir)" || exit $$?; \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appiconsdir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(appiconsdir)" || exit $$?; \
done
uninstall-pixmapDATA:
uninstall-dist_appiconsDATA:
@$(NORMAL_UNINSTALL)
@list='$(pixmap_DATA)'; test -n "$(pixmapdir)" || list=; \
@list='$(dist_appicons_DATA)'; test -n "$(appiconsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(pixmapdir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(pixmapdir)" && rm -f $$files
echo " ( cd '$(DESTDIR)$(appiconsdir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(appiconsdir)" && rm -f $$files
tags: TAGS
TAGS:
......@@ -291,7 +319,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(pixmapdir)"; do \
for dir in "$(DESTDIR)$(actionsiconsdir)" "$(DESTDIR)$(appiconsdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
......@@ -339,7 +367,8 @@ info: info-am
info-am:
install-data-am: install-pixmapDATA
install-data-am: install-dist_actionsiconsDATA \
install-dist_appiconsDATA
install-dvi: install-dvi-am
......@@ -383,20 +412,23 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-pixmapDATA
uninstall-am: uninstall-dist_actionsiconsDATA \