small build improvement, procedure rename

git-svn-id: svn://svn.c3d2.de/c3d2-web/trunk@431 31f61c52-7bfb-0310-b897-fc00f8a278f0
This commit is contained in:
toidinamai 2006-07-20 23:10:57 +00:00
parent 5efff1f3d5
commit 1ed1c81ce8
1 changed files with 8 additions and 7 deletions

View File

@ -55,10 +55,11 @@ CLEAN=$(CONTENT) $(NEWSFILES) $(WWW_CCC_DE_UPDATES) $(DS_PAGES)
NOVALID_IGNORE:=false NOVALID_IGNORE:=false
define xml_to_html define xml_process
$(VALIDATOR) $(VFLAGS) $< $(VALIDATOR) $(VFLAGS) $<
$(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) $< $(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) $<
$(VALIDATOR) $(VFLAGS) $@ || $(NOVALID_IGNORE) || { rm $@ ; exit 1 ; } $(VALIDATOR) $(VFLAGS) $@ || $(NOVALID_IGNORE) || \
{ touch -m -t 197001010000 Makefile $@ ; exit 1 ; }
endef endef
@ -83,25 +84,25 @@ news.xml: $(NEWSITEMS)
sh scripts/gen_news.xml.sh $^ > $@ sh scripts/gen_news.xml.sh $^ > $@
$(NEWSFILES): news.xml $(NAVIGATION) $(STYLE) $(NEWSFILES): news.xml $(NAVIGATION) $(STYLE)
$(call xml_to_html) $(call xml_process)
build/%.html: content/pages/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES) build/%.html: content/pages/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES)
$(call xml_to_html) $(call xml_process)
build/news/%.html : BASEURL="../" build/news/%.html : BASEURL="../"
build/news/%.html: content/news/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES) build/news/%.html: content/news/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES)
$(call xml_to_html) $(call xml_process)
build/cgi-bin/search.html : BASEURL="../" build/cgi-bin/search.html : BASEURL="../"
build/cgi-bin/search.html: content/cgi-bin/search.xml $(STYLE) $(NAVIGATION) build/cgi-bin/search.html: content/cgi-bin/search.xml $(STYLE) $(NAVIGATION)
$(call xml_to_html) $(call xml_process)
# -- MNE-20060421: Lt. Astro geht Validierung noch nicht mit dem Fahrplan, # -- MNE-20060421: Lt. Astro geht Validierung noch nicht mit dem Fahrplan,
# daher fuer Datenspuren auskommentiert # daher fuer Datenspuren auskommentiert
build/datenspuren/%html : STYLE=$(DS_STYLE) build/datenspuren/%html : STYLE=$(DS_STYLE)
build/datenspuren/%html : NOVALID_IGNORE=true build/datenspuren/%html : NOVALID_IGNORE=true
build/datenspuren/%.html: content/datenspuren/%.xml $(DS_STYLE) build/datenspuren/%.html: content/datenspuren/%.xml $(DS_STYLE)
$(call xml_to_html) $(call xml_process)
content/datenspuren/schedule.xml: content/static/datenspuren/fahrplan/days.de.html content/datenspuren/schedule.xml: content/static/datenspuren/fahrplan/days.de.html
cp $< $@ cp $< $@