X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=data%2Ficons%2F22x22%2FMakefile.in;fp=data%2Ficons%2F22x22%2FMakefile.in;h=ac073efd8515ec327eaef11e61ac64c071610ede;hb=bf6d7db22a79d11630454dcd2e867764e89ca9fe;hp=216ded33c1572eba84f6a06ff8e1c6e101aad52c;hpb=7163b4618939eb14d7781b4100f73270ea2f70fa;p=glabels

diff --git a/data/icons/22x22/Makefile.in b/data/icons/22x22/Makefile.in
index 216ded33..ac073efd 100644
--- a/data/icons/22x22/Makefile.in
+++ b/data/icons/22x22/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -40,7 +57,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -52,6 +69,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    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/||"`;; \
@@ -79,8 +101,9 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(appiconsdir)"
-DATA = $(appicons_DATA) $(noinst_DATA)
+am__installdirs = "$(DESTDIR)$(actioniconsdir)" \
+	"$(DESTDIR)$(appiconsdir)"
+DATA = $(actionicons_DATA) $(appicons_DATA) $(noinst_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -104,9 +127,7 @@ DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
 DLLTOOL = @DLLTOOL@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -151,6 +172,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+ITSTOOL = @ITSTOOL@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBBARCODE_CFLAGS = @LIBBARCODE_CFLAGS@
@@ -196,7 +218,6 @@ NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -224,6 +245,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 XGETTEXT = @XGETTEXT@
+XMLLINT = @XMLLINT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -281,11 +303,18 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 size = 22x22
 appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
+actioniconsdir = $(datadir)/$(GLABELS_BRANCH)/icons/hicolor/$(size)/actions
 appicons_DATA = \
 	apps/glabels-3.0.png
 
+actionicons_DATA = \
+	actions/glabels-align-text-bottom.png	\
+	actions/glabels-align-text-middle.png	\
+	actions/glabels-align-text-top.png
+
 noinst_DATA = 
-EXTRA_DIST = $(appicons_DATA) \
+EXTRA_DIST = $(appicons_DATA)			\
+	     $(actionicons_DATA)		\
 	     $(noinst_DATA)
 
 all: all-am
@@ -327,10 +356,34 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
+install-actioniconsDATA: $(actionicons_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(actionicons_DATA)'; test -n "$(actioniconsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(actioniconsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(actioniconsdir)" || 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)$(actioniconsdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(actioniconsdir)" || exit $$?; \
+	done
+
+uninstall-actioniconsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(actionicons_DATA)'; test -n "$(actioniconsdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(actioniconsdir)'; $(am__uninstall_files_from_dir)
 install-appiconsDATA: $(appicons_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(appiconsdir)" || $(MKDIR_P) "$(DESTDIR)$(appiconsdir)"
 	@list='$(appicons_DATA)'; test -n "$(appiconsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(appiconsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(appiconsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -386,7 +439,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(appiconsdir)"; do \
+	for dir in "$(DESTDIR)$(actioniconsdir)" "$(DESTDIR)$(appiconsdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -439,7 +492,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-appiconsDATA
+install-data-am: install-actioniconsDATA install-appiconsDATA
 
 install-dvi: install-dvi-am
 
@@ -483,21 +536,22 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-appiconsDATA
+uninstall-am: uninstall-actioniconsDATA uninstall-appiconsDATA
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-appiconsDATA 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 \
-	uninstall uninstall-am uninstall-appiconsDATA
+	dvi-am html html-am info info-am install \
+	install-actioniconsDATA install-am install-appiconsDATA \
+	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 uninstall \
+	uninstall-actioniconsDATA uninstall-am uninstall-appiconsDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.