diff options
| author | Volker Grabsch <v@njh.eu> | 2015-01-11 23:23:11 (GMT) |
|---|---|---|
| committer | Volker Grabsch <v@njh.eu> | 2015-01-11 23:23:11 (GMT) |
| commit | eaac1a873f37bdc4f91e1b649e28b118acedc436 (patch) | |
| tree | 5a46cb14f17c532f1aa3d37abbd59cf73ff7881b /Makefile | |
| parent | 8fb5da24f513836f0bb4b3418789216e770bd898 (diff) | |
| parent | 0c6cc9c91cf94e445ec471a5beebb7199483cb9d (diff) | |
| download | mxe-eaac1a873f37bdc4f91e1b649e28b118acedc436.zip mxe-eaac1a873f37bdc4f91e1b649e28b118acedc436.tar.gz mxe-eaac1a873f37bdc4f91e1b649e28b118acedc436.tar.bz2 | |
Merge branch 'stable'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 31 |
1 files changed, 16 insertions, 15 deletions
@@ -554,21 +554,23 @@ update-checksum-%: $(error Package $* not found in index.html)) .PHONY: cleanup-style +define CLEANUP_STYLE + @$(SED) ' \ + s/\r//g; \ + s/[ \t]\+$$//; \ + s,^#!/bin/bash$$,#!/usr/bin/env bash,; \ + $(if $(filter %Makefile,$(1)),,\ + s/\t/ /g; \ + ) \ + ' < $(1) > $(TOP_DIR)/tmp-cleanup-style + @diff -u $(1) $(TOP_DIR)/tmp-cleanup-style >/dev/null \ + || { echo '[cleanup] $(1)'; \ + cp $(TOP_DIR)/tmp-cleanup-style $(1); } + @rm -f $(TOP_DIR)/tmp-cleanup-style + +endef cleanup-style: - @$(foreach FILE,$(wildcard $(addprefix $(TOP_DIR)/,Makefile index.html CNAME src/*.mk src/*test.* tools/*)),\ - $(SED) ' \ - s/\r//g; \ - s/[ \t]\+$$//; \ - s,^#!/bin/bash$$,#!/usr/bin/env bash,; \ - $(if $(filter %Makefile,$(FILE)),,\ - s/\t/ /g; \ - ) \ - ' < $(FILE) > $(TOP_DIR)/tmp-cleanup-style; \ - diff -u $(FILE) $(TOP_DIR)/tmp-cleanup-style >/dev/null \ - || { echo '[cleanup] $(FILE)'; \ - cp $(TOP_DIR)/tmp-cleanup-style $(FILE); }; \ - rm -f $(TOP_DIR)/tmp-cleanup-style; \ - ) + $(foreach FILE,$(wildcard $(addprefix $(TOP_DIR)/,Makefile index.html CNAME src/*.mk src/*test.* tools/*)),$(call CLEANUP_STYLE,$(FILE))) build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk) @echo '<!DOCTYPE html>' > $@ @@ -661,4 +663,3 @@ build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk) @echo '</table>' >> $@ @echo '</body>' >> $@ @echo '</html>' >> $@ - |