Commit 52330b92 authored by Matthias Clasen's avatar Matthias Clasen
Browse files

Drop legacy icon name mapping

The switch gnome -> Adwaita is the perfect opportunity to do
this cleanup. Also, the icon name mapping tool doesn't work.

https://bugzilla.gnome.org/show_bug.cgi?id=728984
parent 8e0fe6f6
......@@ -30,35 +30,6 @@ AC_SUBST(SVGSRCDIR, "src/symbolic")
AC_SUBST([render_sizes], ["8x8 16x16 22x22 24x24 32x32 48x48 256x256"])
AC_SUBST([symbolic_render_sizes], [""])
# Allow icon mapping to be disabled
AC_ARG_ENABLE([icon-mapping],
AC_HELP_STRING([--enable-icon-mapping],
[Enable compatibility symlinks [default=auto]]),
[enable_mapping=$enableval],
[enable_mapping=yes])
ICONMAP="true"
if test "x$enable_mapping" != "xno"; then
UTILS_REQUIRED=0.8.7
AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
have_utils=yes, have_utils=no)
if test "x$have_utils" = "xyes"; then
UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
ICONMAP="$UTILS_PATH/icon-name-mapping"
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
and install adwaita-icon-theme])
fi
else
ICONMAP="false"
fi
AC_SUBST(ICONMAP)
AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache)
if test -z "$GTK_UPDATE_ICON_CACHE"; then
AC_MSG_ERROR([Could not find gtk-update-icon-cache])
......
......@@ -11,21 +11,7 @@ install-data-local:
$(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \
done; \
done; \
if [ $(ICONMAP) != "false" ]; then \
cd $(DESTDIR)$(themedir); \
for size in $(render_sizes); do \
cd $$size || continue; \
echo -e "Going to set up icon mapping for $$size"; \
for dir in `find . -type d`; do \
context="`echo $$dir | cut -c 3-`"; \
if [ $$context ]; then \
$(ICONMAP) -c $$context; \
fi; \
done; \
cd ..; \
done; \
fi
done;
## FIXME we should add a way to remove links generated by icon mapping
uninstall-local:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment