summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Xu <alex_y_xu@yahoo.ca>2014-01-26 13:57:21 -0500
committerAlex Xu <alex_y_xu@yahoo.ca>2014-01-26 13:57:21 -0500
commit57d8ff65e38a056f96d82aba545aa2600f30751b (patch)
treeb7714b463c9a0d596df2f91dc7ccf799da77bd7c
parentd9af299843dca9b6c9c890a6c7bbce99b2b32fb1 (diff)
downloadhtml5ks-57d8ff65e38a056f96d82aba545aa2600f30751b.tar.xz
html5ks-57d8ff65e38a056f96d82aba545aa2600f30751b.zip
Makefile various improvements
-rw-r--r--Makefile12
1 files changed, 4 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 482a32f..139675c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,7 @@
null :=
SPACE := $(null) $(null)
-FFMPEG ?= ffmpeg
-FFMPEG += -v warning -y
+FFMPEG ?= ffmpeg -v warning -y
OPUSENC ?= opusenc
ZOPFLIPNG ?= zopflipng
DEFLOPT ?= wine DeflOpt
@@ -78,15 +77,14 @@ CTC_ANIM := $(DUMP)/ui/ctc_anim.png $(DUMP)/ui/ctc_anim.webp
images: $(WEBP) $(CTC_ANIM) www/favicon.ico
$(DUMP)/ui/ctc_strip.webp: $(DUMP)/ui/ctc_strip.png
- :
%.webp: %.png
+ $(CWEBP) -q 99 -m 6 "$<" -o "$@"
$(PNGQUANT) --force --speed 1 --ext .png "$<"
$(ZOPFLIPNG) -m -y "$<" "$<"
$(DEFLOPT) "$<"
$(DEFLUFF) < "$<" > "$<".tmp
mv -f "$<".tmp "$<"
- $(CWEBP) -q 99 -m 6 "$<" -o "$@"
%.webp: %.jpg
$(CWEBP) -q 90 -m 6 "$<" -o "$@"
@@ -96,16 +94,15 @@ www/favicon.ico: $(DUMP)/ui/icon.png
$(DUMP)/ui/bt-cf-unchecked.webp $(DUMP)/ui/bt-cf-checked.webp: %.webp: %.png
$(CONVERT) -trim "$<" "$<"
+ $(CWEBP) -q 99 -m 6 "$<" -o "$@"
$(PNGQUANT) --force --speed 1 --ext .png "$<"
$(ZOPFLIPNG) -m -y "$<" "$<"
$(DEFLOPT) "$<"
$(DEFLUFF) < "$<" > "$<".tmp
mv -f "$<".tmp "$<"
- $(CWEBP) -q 99 -m 6 "$<" -o "$@"
$(DUMP)/ui/ctc_strip-0.png: $(CTC_ANIM_SRC)
$(CONVERT) "$<" -crop 16x16 $(patsubst %.png,%*.png,$<)
- $(PNGQUANT) --force --speed 1 --ext .png "$<"
$(DUMP)/ui/ctc_strip-%.png: $(CTC_ANIM_SRC) $(DUMP)/ui/ctc_strip-0.png
@touch "$@"
@@ -145,7 +142,6 @@ watch:
${MAKE}; \
done
-.PHONY: video audio images js jshint clean space watch
-
# disable default rules, increases `make` speed by 3 seconds
.SUFFIXES:
+.PHONY: video audio images js jshint clean space watch