From e248666df0454babe72a89e9986911f92fd85879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gilbert=20R=C3=B6hrbein?= Date: Sun, 9 Feb 2014 00:02:25 +0100 Subject: [PATCH] Makefile: make xml_process print nicer, added ALL_XSLS to have some more dependencies --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d0971d942..5932488ee 100644 --- a/Makefile +++ b/Makefile @@ -86,10 +86,15 @@ CLEAN=$(CONTENT) $(NEWSFILES) $(WWW_CCC_DE_UPDATES) $(CALENDAR_SUMMARY) $(DS_PAG NOINPUTVALID:=false NOVALID:=false +ALL_XSLS = $(wildcard xsl/*.xsl) + define xml_process - $(NOINPUTVALID) || $(VALIDATOR) $(VFLAGS_IN) $< + @$(NOINPUTVALID) || echo $(VALIDATOR) $(VFLAGS_IN) $< + @$(NOINPUTVALID) || $(VALIDATOR) $(VFLAGS_IN) $< 2>&1 | grep -v " validates" || true $(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) $< - $(NOVALID) || $(VALIDATOR) $(VFLAGS_OUT) $@ || \ + @$(NOVALID) || echo $(VALIDATOR) $(VFLAGS_OUT) $@ || \ + { touch -m -t 197001010000 Makefile $@ ; exit 1 ; } + @$(NOVALID) || $(VALIDATOR) $(VFLAGS_OUT) $@ || \ { touch -m -t 197001010000 Makefile $@ ; exit 1 ; } endef @@ -186,7 +191,7 @@ $(CALENDAR_SUMMARY): content/events.xml news.xml $(call xml_process) build/calendar.html : VFLAGS_IN=$(VFLAGS) -build/calendar.html: $(CALENDAR_SUMMARY) $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES) $(DATESTAMP) +build/calendar.html: $(CALENDAR_SUMMARY) $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES) $(DATESTAMP) $(ALL_XSLS) $(call xml_process) # XCal