Mercurial > octave-nkf
changeset 20430:2f2e8b4996cb
build: Avoid triggering rebuild of icons and desktop files (bug #45567)
* etc/module.mk: Make $(octave_dirstamp) file an order-only prerequisite
for built icons and desktop files since we only need for it to exist.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Sat, 25 Jul 2015 15:06:40 -0400 |
| parents | c23b313232c7 |
| children | 4e52267743d7 |
| files | etc/module.mk |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/module.mk Sat Jul 25 14:59:09 2015 -0400 +++ b/etc/module.mk Sat Jul 25 15:06:40 2015 -0400 @@ -70,25 +70,25 @@ all-icons: etc/icons/octave.appdata.xml etc/icons/octave.desktop $(BUILT_ICONS) -etc/icons/octave.appdata.xml: etc/icons/octave.appdata.xml.in Makefile etc/icons/$(octave_dirstamp) +etc/icons/octave.appdata.xml: etc/icons/octave.appdata.xml.in Makefile | etc/icons/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t $@ && \ $(SED) < $< > $@-t \ -e "s|%OCTAVE_DESKTOP_FILE%|${VENDOR}-octave.desktop|" && \ mv $@-t $@ -etc/icons/octave.desktop: etc/icons/octave.desktop.in Makefile etc/icons/$(octave_dirstamp) +etc/icons/octave.desktop: etc/icons/octave.desktop.in Makefile | etc/icons/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t $@ && \ $(SED) < $< > $@-t \ -e "s|%OCTAVE_IMAGEDIR%|${imagedir}|" \ -e "s|%OCTAVE_PREFIX%|${prefix}|" && \ mv $@-t $@ -$(BUILT_PNG_ICONS): etc/icons/octave-logo.svg etc/icons/$(octave_dirstamp) +$(BUILT_PNG_ICONS): etc/icons/octave-logo.svg | etc/icons/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t $@ && \ $(RSVG_CONVERT) -w $(lastword $(subst -, ,$(patsubst %.png,%,$@))) $< > $@-t && \ mv $@-t $@ -etc/icons/octave-logo.ico: $(WINDOWS_PNG_ICONS) etc/icons/$(octave_dirstamp) +etc/icons/octave-logo.ico: $(WINDOWS_PNG_ICONS) | etc/icons/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t $@ && \ $(ICOTOOL) --create --raw $(WINDOWS_PNG_ICONS) > $@-t && \ mv $@-t $@