diff options
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | baobab/pixmaps/Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | logview/data/icons/Makefile.am | 12 |
4 files changed, 26 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index a132414b..1d9f3104 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,10 +32,12 @@ requires: # Useful URL: https://git.archlinux.org/svntogit/community.git/tree/mate-utils - gcc - git + - inkscape - intltool - itstool - libcanberra - libgtop + - librsvg - make - mate-common - mate-panel @@ -49,12 +51,14 @@ requires: - g++ - git - gtk-doc-tools + - inkscape - intltool - libcanberra-gtk3-dev - libglib2.0-dev - libgtk-3-dev - libgtop2-dev - libmate-panel-applet-dev + - librsvg2-bin - libx11-dev - libxext-dev - libxt-dev @@ -73,10 +77,12 @@ requires: - gcc-c++ - git - hardlink + - inkscape - libX11-devel - libXmu-devel - libcanberra-devel - libgtop2-devel + - librsvg2-tools - make - mate-common - mate-panel-devel @@ -90,12 +96,14 @@ requires: - g++ - git - gtk-doc-tools + - inkscape - intltool - libcanberra-gtk3-dev - libglib2.0-dev - libgtk-3-dev - libgtop2-dev - libmate-panel-applet-dev + - librsvg2-bin - libx11-dev - libxext-dev - libxt-dev diff --git a/baobab/pixmaps/Makefile.am b/baobab/pixmaps/Makefile.am index 5edbe806..f36e8bf3 100644 --- a/baobab/pixmaps/Makefile.am +++ b/baobab/pixmaps/Makefile.am @@ -12,7 +12,7 @@ public_icons = \ $(NULL) hicolor_apps_%.png: hicolor_apps_scalable_mate-disk-usage-analyzer.svg - rsvg-convert -w $(word 1, $(subst x, ,$(word 1,$(subst _, ,$*)))) -h $(word 2, $(subst x, ,$(word 1,$(subst _, ,$*)))) $^ -o $@ + $(RSVG_CONVERT) -w $(word 1, $(subst x, ,$(word 1,$(subst _, ,$*)))) -h $(word 2, $(subst x, ,$(word 1,$(subst _, ,$*)))) $^ -o $@ EXTRA_DIST = \ $(public_icons) \ @@ -47,7 +47,7 @@ gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor install-data-hook: update-icon-cache uninstall-hook: update-icon-cache -update-icon-cache: $(public_icons) +update-icon-cache: @-if test -z "$(DESTDIR)"; then \ echo "Updating Gtk icon cache."; \ $(gtk_update_icon_cache); \ diff --git a/configure.ac b/configure.ac index b9f1437e..654c908a 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,16 @@ AM_PROG_LIBTOOL AC_PATH_PROG(GLIB_GENMARSHAL, [glib-genmarshal]) AC_PATH_PROG(GLIB_MKENUMS, [glib-mkenums]) +dnl ICONS: convert svg to png +AC_PATH_PROG(RSVG_CONVERT, rsvg-convert) +if test x$RSVG_CONVERT = x ; then + AC_MSG_ERROR([could not locate rsvg-convert]) +fi +AC_PATH_PROG(INKSCAPE, inkscape) +if test x$INKSCAPE = x ; then + AC_MSG_ERROR([could not locate inkscape]) +fi + MATE_COMPILE_WARNINGS([yes]) AC_PATH_XTRA diff --git a/logview/data/icons/Makefile.am b/logview/data/icons/Makefile.am index 7dcf7a2c..9db44489 100644 --- a/logview/data/icons/Makefile.am +++ b/logview/data/icons/Makefile.am @@ -18,19 +18,19 @@ public_icons = \ $(NULL) hicolor_apps_16x16_mate-system-log.png: logview.svg - inkscape -z $^ --export-area=303:65:319:81 -w=16 -h=16 -e=$@ + $(INKSCAPE) -z $^ --export-area=303:65:319:81 -w=16 -h=16 -e=$@ hicolor_apps_22x22_mate-system-log.png: logview.svg - inkscape -z $^ --export-area=303:101:325:123 -w=22 -h=22 -e=$@ + $(INKSCAPE) -z $^ --export-area=303:101:325:123 -w=22 -h=22 -e=$@ hicolor_apps_32x32_mate-system-log.png: logview.svg - inkscape -z $^ --export-area=304:142:336:174 -w=32 -h=32 -e=$@ + $(INKSCAPE) -z $^ --export-area=304:142:336:174 -w=32 -h=32 -e=$@ hicolor_apps_48x48_mate-system-log.png: logview.svg - inkscape -z $^ --export-area=296:202:344:250 -w=48 -h=48 -e=$@ + $(INKSCAPE) -z $^ --export-area=296:202:344:250 -w=48 -h=48 -e=$@ hicolor_apps_256x256_mate-system-log.png: logview.svg - inkscape -z $^ --export-area=33:11:289:267 -w=256 -h=256 -e=$@ + $(INKSCAPE) -z $^ --export-area=33:11:289:267 -w=256 -h=256 -e=$@ noinst_DATA = \ logview.svg \ @@ -70,7 +70,7 @@ gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor install-data-hook: update-icon-cache uninstall-hook: update-icon-cache -update-icon-cache: $(public_icons) +update-icon-cache: @-if test -z "$(DESTDIR)"; then \ echo "Updating Gtk icon cache."; \ $(gtk_update_icon_cache); \ |