From a4b323e6a851fbbf8dfef4b5d6c28981113c1fc2 Mon Sep 17 00:00:00 2001
From: ice0 <konoplin@gmail.com>
Date: Aug 30 2018 06:16:41 +0000
Subject: Fixed MacOS build with images


---

diff --git a/autobuild/osx/brew/synfigstudio-osx-build.sh b/autobuild/osx/brew/synfigstudio-osx-build.sh
index 51d801b..005a472 100755
--- a/autobuild/osx/brew/synfigstudio-osx-build.sh
+++ b/autobuild/osx/brew/synfigstudio-osx-build.sh
@@ -57,13 +57,7 @@ travis_fold_start synfig-studio "Building Synfig Studio"
 pushd synfig-studio
   ./bootstrap.sh
   ./configure
-  pushd build_tools # enter src directory to skip image building
-    make install $MAKE_OPTIONS
-  popd # build_tools
-
-  pushd src # enter src directory to skip image building
-    make install $MAKE_OPTIONS
-  popd # src
+  make install $MAKE_OPTIONS
 popd # synfig-studio
 travis_fold_end synfig-studio
 
diff --git a/synfig-studio/images/Makefile.am b/synfig-studio/images/Makefile.am
index 4e0cf72..5650317 100644
--- a/synfig-studio/images/Makefile.am
+++ b/synfig-studio/images/Makefile.am
@@ -416,7 +416,7 @@ SUFFIXES = .sif .tif .png
 
 #.SUFFIXES: $(SUFFIXES)
 
-.sif.ico:
+.sif.ico .sifz.ico:
 	bash ../build_tools/sif2ico.sh $<
 	echo "  File \"images\\$@\"" >>./icons.nsh
 	echo "  Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unicons.nsh
@@ -424,17 +424,7 @@ SUFFIXES = .sif .tif .png
 clean-local:
 	$(RM) -r $(CLEANDIRS)
 
-.sif.bmp:
-	$(SYNFIG) -q $< -o $@.png --time 0
-	convert $@.png $@
-	rm -f $@.png
-
-.sif.$(EXT):
-	$(SYNFIG) -q $< -o $@ --time 0
-	echo "  File \"images\\$@\"" >>./images.nsh
-	echo "  Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
-
-.sifz.$(EXT):
+.sif.$(EXT) .sifz.$(EXT) .sif.bmp .sifz.bmp:
 	$(SYNFIG) -q $< -o $@ --time 0
 	echo "  File \"images\\$@\"" >>./images.nsh
 	echo "  Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh