diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | src/Makefile.am | 18 |
3 files changed, 0 insertions, 39 deletions
diff --git a/Makefile.am b/Makefile.am index 0975fe951..cb080f702 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,10 +7,6 @@ theme_DATA = $(theme_in_files:.theme.in.in=.theme) THEME_DIRS=$(shell SIZES="$(render_sizes)"; for size in $$SIZES; do for dir in `find $(srcdir)/$(SVGOUTDIR)/$$size/* -type d`; do printf "$$dir,"; done; done | sed -e "s/,$$//g") -render: Makefile - ($(am__cd) $(SVGSRCDIR) && $(MAKE) $(AM_MAKEFLAGS) render) \ - || eval `exit 1` - %.theme.in: %.theme.in.in $(SVGOUTDIR) Makefile dirs="`echo $(THEME_DIRS) | sed -e 's#$(srcdir)/gnome/##g'`"; \ sed -e "s|\@THEME_DIRS\@|$$dirs|g" < $< > $@; \ diff --git a/configure.ac b/configure.ac index 0e1452870..a8838467c 100644 --- a/configure.ac +++ b/configure.ac @@ -57,23 +57,6 @@ fi AC_SUBST(ICONMAP) -# need git, icontool, and inkscape for rendering -allow_rendering=yes -AC_PATH_PROG([GIT], [git], [false]) -if test "x$GIT" = "xfalse"; then - allow_rendering=no -fi -AC_PATH_PROG([ICONTOOL_RENDER], [icontool-render], [false]) -if test "x$ICONTOOL_RENDER" = "xfalse"; then - allow_rendering=no -fi -AC_PATH_PROG([INKSCAPE], [inkscape], [false]) -if test "x$INKSCAPE" = "xfalse"; then - allow_rendering=no -fi -AM_CONDITIONAL(ALLOW_RENDERING, test "x$allow_rendering" = "xyes") - - AC_CONFIG_FILES([ Makefile gnome-icon-theme.pc diff --git a/src/Makefile.am b/src/Makefile.am index c961d1e65..ac879858d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,26 +1,8 @@ icon_in_files = $(shell SRCDIR="$(srcdir)"; for i in `find $$SRCDIR -name "*.svg"`; do printf "$$i "; done) -if ALLOW_RENDERING -render-png: $(icon_in_files) Makefile - for file in $(icon_in_files); do \ - for size in $(render_sizes); do \ - $(ICONTOOL_RENDER) -s $$size -o $(top_builddir)/$(SVGOUTDIR) $$file >/dev/null; \ - done; \ - done - -else -render-png: $(icon_in_files) Makefile - if test "x$(top_srcdir)" != "x$(top_builddir)"; then \ - cp -a $(top_srcdir)/$(SVGOUTDIR) $(top_builddir)/$(SVGOUTDIR); \ - fi - -endif - $(render_sizes): Makefile -render: render-png - install-data-local: for size in $(render_sizes); do \ echo -e "Going to copy files for $$size"; \ |