From d0b2e3cb263c24dca72414d3b87dff9adcdae29e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20COUDERC?= Date: Sun, 19 Mar 2017 00:37:28 +0000 Subject: [PATCH] Mark Makefile targets as phony where relevant --- Makefile | 5 ++++- emblems-debian/Makefile | 8 ++++---- joy-theme/grub/Makefile | 2 ++ lines-theme/grub/Makefile | 2 ++ softwaves-theme/grub/Makefile | 2 ++ spacefun-theme/grub/Makefile | 2 ++ 6 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 39bc6d6..abab331 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,11 @@ DEFAULT_BACKGROUND=desktop-background PIXMAPS=$(wildcard pixmaps/*.png) DESKTOPFILES=$(wildcard *.desktop) +.PHONY: all clean install install-local all: build-grub build-emblems +clean: clean-grub clean-emblems +.PHONY: build-grub clean-grub install-grub build-grub clean-grub install-grub: @target=`echo $@ | sed s/-grub//`; \ for grub_theme in $(GRUB_THEMES) ; do \ @@ -14,11 +17,11 @@ build-grub clean-grub install-grub: fi \ done$ +.PHONY: build-emblems clean-emblems install-emblems build-emblems clean-emblems install-emblems: @target=`echo $@ | sed s/-emblems//`; \ $(MAKE) $$target -C emblems-debian || exit 1; -clean: clean-grub clean-emblems install: install-grub install-emblems install-local diff --git a/emblems-debian/Makefile b/emblems-debian/Makefile index 14eabf3..96b9439 100644 --- a/emblems-debian/Makefile +++ b/emblems-debian/Makefile @@ -1,14 +1,15 @@ dir = usr/share/icons/hicolor scal_emblems_dir = $(dir)/scalable/emblems +.PHONY: build clean install + EMBLEMS = $(basename $(wildcard *.svg)) $(info Emblems: '$(EMBLEMS)') RESOLUTIONS := 16 22 32 36 48 64 128 256 $(info Resolutions: '$(RESOLUTIONS)') -# The all target should depend on all PNGs to generate +# The build: target should depend on all PNGs to generate $(info $(foreach SVG,$(EMBLEMS),$(foreach RES,$(RESOLUTIONS),$(SVG)-$(RES)x$(RES).png))) -.PHONY: build build: $(foreach SVG,$(EMBLEMS),$(foreach RES,$(RESOLUTIONS),$(SVG)-$(RES)x$(RES).png)) # Dynamically add rules for PNG generation for each resolution, for each emblem file @@ -18,11 +19,9 @@ $1-$2x$2.png: $1.svg endef $(foreach EMBLEM,$(EMBLEMS),$(foreach RES,$(RESOLUTIONS),$(eval $(call SVG_TO_PNG_RULE,$(EMBLEM),$(RES))))) -.PHONY: clean clean: rm -f *.png -.PHONY: install install: install -d $(DESTDIR)/$(dir) # Iterate over resolutions. @@ -39,6 +38,7 @@ install: $(INSTALL) $${EMBLEM}.icon $${EMBLEMS_DIR}/ ; \ done ; \ done + # Install SVG emblems in the scalable emblems dir. for EMBLEM in $(EMBLEMS) ; do \ EMBLEMS_DIR=$(DESTDIR)/$(scal_emblems_dir) ; \ install -d $${EMBLEMS_DIR} ; \ diff --git a/joy-theme/grub/Makefile b/joy-theme/grub/Makefile index 7c6135e..5c71d48 100644 --- a/joy-theme/grub/Makefile +++ b/joy-theme/grub/Makefile @@ -1,5 +1,7 @@ dir = usr/share/desktop-base/joy-theme/grub +.PHONY: build clean install + files = \ grub-4x3.png \ grub-16x9.png diff --git a/lines-theme/grub/Makefile b/lines-theme/grub/Makefile index fd8077f..a982f07 100644 --- a/lines-theme/grub/Makefile +++ b/lines-theme/grub/Makefile @@ -1,5 +1,7 @@ dir = usr/share/desktop-base/lines-theme/grub +.PHONY: build clean install + files = \ grub-4x3.png \ grub-16x9.png diff --git a/softwaves-theme/grub/Makefile b/softwaves-theme/grub/Makefile index 3a47ff0..9903d36 100644 --- a/softwaves-theme/grub/Makefile +++ b/softwaves-theme/grub/Makefile @@ -1,5 +1,7 @@ dir = usr/share/desktop-base/softwaves-theme/grub +.PHONY: build clean install + files = \ grub-4x3.png \ grub-16x9.png diff --git a/spacefun-theme/grub/Makefile b/spacefun-theme/grub/Makefile index b0db697..235968f 100644 --- a/spacefun-theme/grub/Makefile +++ b/spacefun-theme/grub/Makefile @@ -1,5 +1,7 @@ dir = usr/share/desktop-base/spacefun-theme/grub +.PHONY: build clean install + files = \ grub-4x3.png \ grub-16x9.png