2 Jun
2015
2 Jun
'15
8:10 a.m.
Module: check_mk
Branch: master
Commit: 0a2528882481edcec8f34d58290b317ae668a871
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a2528882481ed…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Jun 2 10:10:52 2015 +0200
Fixed minify/optimize make targets in case of missing tools
---
Makefile | 40 ++++++++++++++++++++++++----------------
1 file changed, 24 insertions(+), 16 deletions(-)
diff --git a/Makefile b/Makefile
index fbaf00a..cb1696b 100644
--- a/Makefile
+++ b/Makefile
@@ -194,24 +194,32 @@ healspaces:
@sed -ri 's/[[:space:]]+$$//g' $(HEAL_SPACES_IN)
optimize-images:
- @for F in web/htdocs/images/*.png web/htdocs/images/icons/*.png; do \
- echo "Optimizing $$F..." ; \
- pngcrush -q -rem alla -brute $$F $$F.opt ; \
- mv $$F.opt $$F; \
- done
+ @if type pngcrush >/dev/null 2>&1; then \
+ for F in web/htdocs/images/*.png web/htdocs/images/icons/*.png; do \
+ echo "Optimizing $$F..." ; \
+ pngcrush -q -rem alla -brute $$F $$F.opt ; \
+ mv $$F.opt $$F; \
+ done ; \
+ else \
+ echo "Missing pngcrush, not optimizing images!" ; \
+ fi
minify-js:
- @for F in $$(cd web/htdocs/js ; ls *.js); do \
- if [ $${F/_min/} == $$F ] ; then \
- NAME=$${F%.*} ; \
- SRC=web/htdocs/js/$$F ; \
- DST=web/htdocs/js/$${NAME}_min.js ; \
- if [ ! -f $$DST ] || [ $$(stat -c%Y $$SRC) -gt $$(stat -c%Y $$DST) ]; then \
- echo "Minifying $$F..." ; \
- cat $$SRC | slimit > $$DST ; \
- fi ; \
- fi ; \
- done
+ @if type slimit >/dev/null 2>&1; then \
+ for F in $$(cd web/htdocs/js ; ls *.js); do \
+ if [ $${F/_min/} == $$F ] ; then \
+ NAME=$${F%.*} ; \
+ SRC=web/htdocs/js/$$F ; \
+ DST=web/htdocs/js/$${NAME}_min.js ; \
+ if [ ! -f $$DST ] || [ $$(stat -c%Y $$SRC) -gt $$(stat -c%Y $$DST) ]; then \
+ echo "Minifying $$F..." ; \
+ cat $$SRC | slimit > $$DST ; \
+ fi ; \
+ fi ; \
+ done ; \
+ else \
+ echo "Missing slimit, not minifying javascript files!" ; \
+ fi
clean:
rm -rf dist.tmp rpm.topdir *.rpm *.deb *.exe \