comparison GNUmakefile @ 8:39768562fc89

- Use sed(1) instead of perl(1) for whitespace stripping. - Removed (from SVN) binary/books/ and binary/downloads/. - Delete targets whose recipes exit with a non-zero code.
author Ruslan Ermilov <ru@nginx.com>
date Mon, 15 Aug 2011 10:30:59 +0000
parents 8e9bd20faa47
children 9d3403f5204d
comparison
equal deleted inserted replaced
7:cc28e27da275 8:39768562fc89
11 define XSLScript 11 define XSLScript
12 java -cp $(CP) \ 12 java -cp $(CP) \
13 com.pault.StyleSheet \ 13 com.pault.StyleSheet \
14 -x com.pault.XX -y com.pault.XX \ 14 -x com.pault.XX -y com.pault.XX \
15 $(1) xsls/dump.xsls \ 15 $(1) xsls/dump.xsls \
16 | perl -e 'undef $$/; $$_ = <>; s/(\n\n)+/\n/gs; print' > $(2) 16 | sed 's/ *$$//;/^ *$$/N;/\n *$$/D' > $(2)
17 17
18 if [ ! -s $(2) ]; then rm $(2); fi; test -s $(2) 18 if [ ! -s $(2) ]; then rm $(2); fi; test -s $(2)
19 endef 19 endef
20 20
21 21
146 binary/books/nginx_1_web_server.jpg \ 146 binary/books/nginx_1_web_server.jpg \
147 binary/books/nginx_http_server.jpg \ 147 binary/books/nginx_http_server.jpg \
148 binary/books/nginx_in_practice.jpg 148 binary/books/nginx_in_practice.jpg
149 149
150 binary/books/nginx_http_server_jp.jpg: sources/1106030720.jpg 150 binary/books/nginx_http_server_jp.jpg: sources/1106030720.jpg
151 mkdir -p $(dir $@)
151 $(call JPEGNORM, $<, $@) 152 $(call JPEGNORM, $<, $@)
152 153
153 binary/books/nginx_1_web_server.jpg: \ 154 binary/books/nginx_1_web_server.jpg: \
154 sources/Nginx\ 1\ Web\ Server\ Implementation\ Cookbook.jpg 155 sources/Nginx\ 1\ Web\ Server\ Implementation\ Cookbook.jpg
156 mkdir -p $(dir $@)
155 $(call JPEGNORM, "$<", $@) 157 $(call JPEGNORM, "$<", $@)
156 158
157 binary/books/nginx_http_server.jpg: sources/0868OS_MockupCover.jpg 159 binary/books/nginx_http_server.jpg: sources/0868OS_MockupCover.jpg
160 mkdir -p $(dir $@)
158 $(call JPEGNORM, $<, $@) 161 $(call JPEGNORM, $<, $@)
159 162
160 binary/books/nginx_in_practice.jpg: sources/20807089-1_o.jpg 163 binary/books/nginx_in_practice.jpg: sources/20807089-1_o.jpg
164 mkdir -p $(dir $@)
161 $(call JPEGNORM, $<, $@) 165 $(call JPEGNORM, $<, $@)
162 166
163 167
164 .PHONY: gzip 168 .PHONY: gzip
165 gzip: rsync_gzip 169 gzip: rsync_gzip
247 rm -f $(SITE).tar.bz2 251 rm -f $(SITE).tar.bz2
248 tar -c -y -f $(SITE).tar.bz2 \ 252 tar -c -y -f $(SITE).tar.bz2 \
249 --directory $(TEMP) \ 253 --directory $(TEMP) \
250 --exclude .svn \ 254 --exclude .svn \
251 $(SITE) 255 $(SITE)
256
257 .DELETE_ON_ERROR: