diff options
| author | rbuj <[email protected]> | 2019-05-02 20:51:09 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-05-06 12:29:06 +0200 |
| commit | 2cee2d73e23c18d7ed15f861d5a4b46c60e13252 (patch) | |
| tree | 9f1ddbdf7e6b9325162b454c0d83642fe674df5d /baobab | |
| parent | 31a51b718ad7711534bb667b2ba289c871269e78 (diff) | |
| download | mate-utils-2cee2d73e23c18d7ed15f861d5a4b46c60e13252.tar.bz2 mate-utils-2cee2d73e23c18d7ed15f861d5a4b46c60e13252.tar.xz | |
Make inkscape and rsvg-convert optional
TEST on Fedora:
inkscape, librsvg2-tools package are not installed on system: The user can build, install and distribute the package:
$ sudo dnf remove inkscape librsvg2-tools -y
$ ./configure --prefix=/usr
$ make
$ sudo make install
$ make distcheck
logview/data/icons:
Can not run build-png-icons target if inkscape package is not installed on system:
$ make -C logview/data/icons clean-png-icons
make: Entering directory '/home/robert/devel/mate-utils/logview/data/icons'
rm -f hicolor_apps_16x16_mate-system-log.png hicolor_apps_22x22_mate-system-log.png hicolor_apps_32x32_mate-system-log.png hicolor_apps_48x48_mate-system-log.png hicolor_apps_256x256_mate-system-log.png
make: Leaving directory '/home/robert/devel/mate-utils/logview/data/icons'
$ make -C logview/data/icons build-png-icons
make: Entering directory '/home/robert/devel/mate-utils/logview/data/icons'
make: *** No rule to make target 'hicolor_apps_16x16_mate-system-log.png', needed by 'build-png-icons'. Stop.
make: Leaving directory '/home/robert/devel/mate-utils/logview/data/icons'
Can run build-png-icons target if inkscape package is installed on system:
$ sudo dnf install inkscape -y
$ ./configure --prefix=/usr
$ make -C logview/data/icons build-png-icons
make: Entering directory '/home/robert/devel/mate-utils/logview/data/icons'
Background RRGGBBAA: ffffff00 Area 303:65:319:81 exported to 16 x 16 pixels (96 dpi) Bitmap saved as: hicolor_apps_16x16_mate-system-log.png
Background RRGGBBAA: ffffff00 Area 303:101:325:123 exported to 22 x 22 pixels (96 dpi) Bitmap saved as: hicolor_apps_22x22_mate-system-log.png
Background RRGGBBAA: ffffff00 Area 304:142:336:174 exported to 32 x 32 pixels (96 dpi) Bitmap saved as: hicolor_apps_32x32_mate-system-log.png
Background RRGGBBAA: ffffff00 Area 296:202:344:250 exported to 48 x 48 pixels (96 dpi) Bitmap saved as: hicolor_apps_48x48_mate-system-log.png
Background RRGGBBAA: ffffff00 Area 33:11:289:267 exported to 256 x 256 pixels (96 dpi) Bitmap saved as: hicolor_apps_256x256_mate-system-log.png
make: Nothing to be done for 'build-png-icons'.
make: Leaving directory '/home/robert/devel/mate-utils/logview/data/icons'
baobab/pixmaps:
Can not run build-png-icons target if librsvg2-tools package is not installed on system:
$ make -C baobab/pixmaps clean-png-icons
make: Entering directory '/home/robert/devel/mate-utils/baobab/pixmaps'
rm -f hicolor_apps_16x16_mate-disk-usage-analyzer.png hicolor_apps_22x22_mate-disk-usage-analyzer.png hicolor_apps_32x32_mate-disk-usage-analyzer.png hicolor_apps_48x48_mate-disk-usage-analyzer.png hicolor_apps_128x128_mate-disk-usage-analyzer.png
make: Leaving directory '/home/robert/devel/mate-utils/baobab/pixmaps'
$ make -C baobab/pixmaps build-png-icons
make: Entering directory '/home/robert/devel/mate-utils/baobab/pixmaps'
make: *** No rule to make target 'hicolor_apps_16x16_mate-disk-usage-analyzer.png', needed by 'build-png-icons'. Stop.
make: Leaving directory '/home/robert/devel/mate-utils/baobab/pixmaps'
Can run build-png-icons target if librsvg2-tools package is installed on system:
$ sudo dnf install -y librsvg2-tools
$ ./configure --prefix=/usr
$ make -C baobab/pixmaps build-png-icons
make: Entering directory '/home/robert/devel/mate-utils/baobab/pixmaps'
/usr/bin/rsvg-convert -w 16 -h 16 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_16x16_mate-disk-usage-analyzer.png
/usr/bin/rsvg-convert -w 22 -h 22 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_22x22_mate-disk-usage-analyzer.png
/usr/bin/rsvg-convert -w 32 -h 32 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_32x32_mate-disk-usage-analyzer.png
/usr/bin/rsvg-convert -w 48 -h 48 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_48x48_mate-disk-usage-analyzer.png
/usr/bin/rsvg-convert -w 128 -h 128 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_128x128_mate-disk-usage-analyzer.png
make: Leaving directory '/home/robert/devel/mate-utils/baobab/pixmaps'
Closes #223
Diffstat (limited to 'baobab')
| -rw-r--r-- | baobab/pixmaps/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/baobab/pixmaps/Makefile.am b/baobab/pixmaps/Makefile.am index f36e8bf3..6804bef9 100644 --- a/baobab/pixmaps/Makefile.am +++ b/baobab/pixmaps/Makefile.am @@ -11,8 +11,10 @@ public_icons = \ hicolor_apps_scalable_mate-disk-usage-analyzer.svg \ $(NULL) +if HAVE_RSVG_CONVERT 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 $@ +endif EXTRA_DIST = \ $(public_icons) \ @@ -20,7 +22,7 @@ EXTRA_DIST = \ ############################################################################### -install-icons: $(public_icons) +install-icons: | $(public_icons) for icon in $(public_icons); do \ THEME=`echo $$icon | cut -d_ -f1`; \ CONTEXT=`echo $$icon | cut -d_ -f2`; \ @@ -57,7 +59,7 @@ update-icon-cache: fi .PHONY: build-png-icons clean-png-icons -build-png-icons: $(png_icons) +build-png-icons: | $(png_icons) clean-png-icons: rm -f $(png_icons) |