d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

This commit is contained in:
Volker Grabsch 2015-01-11 18:23:11 -05:00
parent 8fb5da24f5 0c6cc9c91c
commit eaac1a873f
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Makefile
View File

@ -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>' >> $@