From 3253d99365813f2d2ffd05e10cbb8c11f53d746e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 22 Mar 2017 06:39:17 +0100 Subject: New upstream version 0.26.0 --- icons/Makefile.in | 93 ++++++++++++++----------------------------------------- 1 file changed, 23 insertions(+), 70 deletions(-) (limited to 'icons/Makefile.in') diff --git a/icons/Makefile.in b/icons/Makefile.in index cffd751..49a770f 100644 --- a/icons/Makefile.in +++ b/icons/Makefile.in @@ -90,9 +90,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = icons ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/appdata-xml.m4 \ - $(top_srcdir)/m4/ax_check_enable_debug.m4 \ - $(top_srcdir)/m4/ax_generate_changelog.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_generate_changelog.m4 \ $(top_srcdir)/m4/ax_is_release.m4 \ $(top_srcdir)/m4/ax_require_defined.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gsettings.m4 \ @@ -106,7 +104,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/appdata-xml.m4 \ $(top_srcdir)/m4/yelp.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(dist_images_DATA) \ +DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \ $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h @@ -131,35 +129,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(imagesdir)" -DATA = $(dist_images_DATA) +DATA = $(dist_noinst_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -170,6 +140,9 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ APPSTREAM_UTIL = @APPSTREAM_UTIL@ AR = @AR@ +AUTHENTICATOR_CFLAGS = @AUTHENTICATOR_CFLAGS@ +AUTHENTICATOR_LIBS = @AUTHENTICATOR_LIBS@ +AUTHENTICATOR_PACKAGES = @AUTHENTICATOR_PACKAGES@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -257,6 +230,7 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ PLUGIN_LIBS = @PLUGIN_LIBS@ POSUB = @POSUB@ +PUBLISHER_VALAFLAGS = @PUBLISHER_VALAFLAGS@ PUBLISHING_CFLAGS = @PUBLISHING_CFLAGS@ PUBLISHING_LIBS = @PUBLISHING_LIBS@ RANLIB = @RANLIB@ @@ -338,16 +312,20 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -imagesdir = $(datadir)/shotwell/icons -dist_images_DATA = \ +dist_noinst_DATA = \ + about-aachen.jpg \ all-rejected.png \ crop-pivot-reticle.png \ crop.svg \ drag_nub.png \ faces-tool.png \ + filter-flagged-disabled.png \ filter-flagged.png \ + filter-photos-disabled.png \ filter-photos.png \ + filter-raw-disabled.png \ filter-raw.png \ + filter-videos-disabled.png \ filter-videos.png \ five-star-filter.svg \ five-stars.svg \ @@ -428,27 +406,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -install-dist_imagesDATA: $(dist_images_DATA) - @$(NORMAL_INSTALL) - @list='$(dist_images_DATA)'; test -n "$(imagesdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(imagesdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(imagesdir)" || exit 1; \ - fi; \ - 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)$(imagesdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(imagesdir)" || exit $$?; \ - done - -uninstall-dist_imagesDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_images_DATA)'; test -n "$(imagesdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(imagesdir)'; $(am__uninstall_files_from_dir) tags TAGS: ctags CTAGS: @@ -490,9 +447,6 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(imagesdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -543,7 +497,7 @@ info: info-am info-am: -install-data-am: install-dist_imagesDATA +install-data-am: install-dvi: install-dvi-am @@ -587,22 +541,21 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_imagesDATA +uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ cscopelist-am ctags-am distclean distclean-generic \ distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-dist_imagesDATA 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 \ - mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ - uninstall-am uninstall-dist_imagesDATA + 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-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am .PRECIOUS: Makefile -- cgit v1.2.3