Attachment #576704 for bug #685890

View | Details | Raw Unified | Return to bug 685890
Collapse All | Expand All




	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)	\


###############################################################################

install-icons: | $(public_icons)
	for icon in $(public_icons); do \
		THEME=`echo $$icon | cut -d_ -f1`; \
		CONTEXT=`echo $$icon | cut -d_ -f2`; \

	fi

.PHONY: build-png-icons clean-png-icons
build-png-icons: | $(png_icons)

clean-png-icons:
	rm -f $(png_icons)





dnl ICONS: convert svg to png
AC_PATH_PROG(RSVG_CONVERT, rsvg-convert)
AM_CONDITIONAL([HAVE_RSVG_CONVERT], [test "x$RSVG_CONVERT" != x])
    AC_MSG_ERROR([could not locate rsvg-convert])
fi
AC_PATH_PROG(INKSCAPE, inkscape)
AM_CONDITIONAL([HAVE_INKSCAPE], [test "x$INKSCAPE" != x])
    AC_MSG_ERROR([could not locate inkscape])
fi

MATE_COMPILE_WARNINGS([yes])


Lines 17-36 public_icons = \ Link Here

(-)a/logview/data/icons/Makefile.am (-7 / +24 lines)
17	hicolor_apps_scalable_mate-system-log-symbolic.svg \	17	hicolor_apps_scalable_mate-system-log-symbolic.svg \
18	$(NULL)	18	$(NULL)
19		19
		20	if HAVE_INKSCAPE
20	hicolor_apps_16x16_mate-system-log.png: logview.svg	21	hicolor_apps_16x16_mate-system-log.png: logview.svg
21	$(INKSCAPE) -z $^ --export-area=303:65:319:81 -w=16 -h=16 -e=$@	22	$(if $(wildcard $(INKSCAPE)), \
		23	$(info $(shell $(INKSCAPE) -z $^ --export-area=303:65:319:81 -w=16 -h=16 -e=$@)), \
		24	$(error could not locate inkscape) \
		25	)
22		26
23	hicolor_apps_22x22_mate-system-log.png: logview.svg	27	hicolor_apps_22x22_mate-system-log.png: logview.svg
24	$(INKSCAPE) -z $^ --export-area=303:101:325:123 -w=22 -h=22 -e=$@	28	$(if $(wildcard $(INKSCAPE)), \
		29	$(info $(shell $(INKSCAPE) -z $^ --export-area=303:101:325:123 -w=22 -h=22 -e=$@)), \
		30	$(error could not locate inkscape) \
		31	)
25		32
26	hicolor_apps_32x32_mate-system-log.png: logview.svg	33	hicolor_apps_32x32_mate-system-log.png: logview.svg
27	$(INKSCAPE) -z $^ --export-area=304:142:336:174 -w=32 -h=32 -e=$@	34	$(if $(wildcard $(INKSCAPE)), \
		35	$(info $(shell $(INKSCAPE) -z $^ --export-area=304:142:336:174 -w=32 -h=32 -e=$@)), \
		36	$(error could not locate inkscape) \
		37	)
28		38
29	hicolor_apps_48x48_mate-system-log.png: logview.svg	39	hicolor_apps_48x48_mate-system-log.png: logview.svg
30	$(INKSCAPE) -z $^ --export-area=296:202:344:250 -w=48 -h=48 -e=$@	40	$(if $(wildcard $(INKSCAPE)), \
		41	$(info $(shell $(INKSCAPE) -z $^ --export-area=296:202:344:250 -w=48 -h=48 -e=$@)), \
		42	$(error could not locate inkscape) \
		43	)
31		44
32	hicolor_apps_256x256_mate-system-log.png: logview.svg	45	hicolor_apps_256x256_mate-system-log.png: logview.svg
33	$(INKSCAPE) -z $^ --export-area=33:11:289:267 -w=256 -h=256 -e=$@	46	$(if $(wildcard $(INKSCAPE)), \
		47	$(info $(shell $(INKSCAPE) -z $^ --export-area=33:11:289:267 -w=256 -h=256 -e=$@)), \
		48	$(error could not locate inkscape) \
		49	)
		50	endif
34		51
35	noinst_DATA = \	52	noinst_DATA = \
36	logview.svg \	53	logview.svg \
Lines 43-49 EXTRA_DIST = \ Link Here
43		60
44	###############################################################################	61	###############################################################################
45		62
46	install-icons:	63	install-icons: \| $(public_icons)
47	for icon in $(public_icons); do \	64	for icon in $(public_icons); do \
48	THEME=`echo $$icon \| cut -d_ -f1`; \	65	THEME=`echo $$icon \| cut -d_ -f1`; \
49	CONTEXT=`echo $$icon \| cut -d_ -f2`; \	66	CONTEXT=`echo $$icon \| cut -d_ -f2`; \
Lines 80-86 update-icon-cache: Link Here
80	fi	97	fi
81		98
82	.PHONY: build-png-icons clean-png-icons	99	.PHONY: build-png-icons clean-png-icons
83	build-png-icons: $(png_icons)	100	build-png-icons: \| $(png_icons)
84		101
85	clean-png-icons:	102	clean-png-icons:
86	rm -f $(png_icons)	103	rm -f $(png_icons)

Return to bug 685890

Lines 11-18 public_icons = \ Link Here

(-)a/baobab/pixmaps/Makefile.am (-2 / +4 lines)
11	hicolor_apps_scalable_mate-disk-usage-analyzer.svg \	11	hicolor_apps_scalable_mate-disk-usage-analyzer.svg \
12	$(NULL)	12	$(NULL)
13		13
		14	if HAVE_RSVG_CONVERT
14	hicolor_apps_%.png: hicolor_apps_scalable_mate-disk-usage-analyzer.svg	15	hicolor_apps_%.png: hicolor_apps_scalable_mate-disk-usage-analyzer.svg
15	$(RSVG_CONVERT) -w $(word 1, $(subst x, ,$(word 1,$(subst _, ,$)))) -h $(word 2, $(subst x, ,$(word 1,$(subst _, ,$)))) $^ -o $@	16	$(RSVG_CONVERT) -w $(word 1, $(subst x, ,$(word 1,$(subst _, ,$)))) -h $(word 2, $(subst x, ,$(word 1,$(subst _, ,$)))) $^ -o $@
		17	endif
16		18
17	EXTRA_DIST = \	19	EXTRA_DIST = \
18	$(public_icons) \	20	$(public_icons) \
Lines 20-26 EXTRA_DIST = \ Link Here
20		22
21	###############################################################################	23	###############################################################################
22		24
23	install-icons: $(public_icons)	25	install-icons: \| $(public_icons)
24	for icon in $(public_icons); do \	26	for icon in $(public_icons); do \
25	THEME=`echo $$icon \| cut -d_ -f1`; \	27	THEME=`echo $$icon \| cut -d_ -f1`; \
26	CONTEXT=`echo $$icon \| cut -d_ -f2`; \	28	CONTEXT=`echo $$icon \| cut -d_ -f2`; \
Lines 57-63 update-icon-cache: Link Here
57	fi	59	fi
58		60
59	.PHONY: build-png-icons clean-png-icons	61	.PHONY: build-png-icons clean-png-icons
60	build-png-icons: $(png_icons)	62	build-png-icons: \| $(png_icons)
61		63
62	clean-png-icons:	64	clean-png-icons:
63	rm -f $(png_icons)	65	rm -f $(png_icons)

Lines 31-43 AC_PATH_PROG(GLIB_MKENUMS, [glib-mkenums]) Link Here

(-)a/configure.ac (-6 / +2 lines)
31		31
32	dnl ICONS: convert svg to png	32	dnl ICONS: convert svg to png
33	AC_PATH_PROG(RSVG_CONVERT, rsvg-convert)	33	AC_PATH_PROG(RSVG_CONVERT, rsvg-convert)
34	if test x$RSVG_CONVERT = x ; then	34	AM_CONDITIONAL([HAVE_RSVG_CONVERT], [test "x$RSVG_CONVERT" != x])
35	AC_MSG_ERROR([could not locate rsvg-convert])
36	fi
37	AC_PATH_PROG(INKSCAPE, inkscape)	35	AC_PATH_PROG(INKSCAPE, inkscape)
38	if test x$INKSCAPE = x ; then	36	AM_CONDITIONAL([HAVE_INKSCAPE], [test "x$INKSCAPE" != x])
39	AC_MSG_ERROR([could not locate inkscape])
40	fi
41		37
42	MATE_COMPILE_WARNINGS([yes])	38	MATE_COMPILE_WARNINGS([yes])
43		39