[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] WMLify eff/
Update of /home/or/cvsroot/website
In directory moria:/tmp/cvs-serv17552
Modified Files:
Makefile Makefile.common
Log Message:
WMLify eff/
Index: Makefile
===================================================================
RCS file: /home/or/cvsroot/website/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -d -r1.12 -r1.13
--- Makefile 26 Jan 2006 22:26:07 -0000 1.12
+++ Makefile 26 Jan 2006 23:15:02 -0000 1.13
@@ -11,11 +11,12 @@ TORCVSHEAD = ../tor-head
#TORCVSHEAD = /home/arma/work/onion/cvs/tor
WMLBASE = .
-WMLOPT = \
- -I include \
- -D DOCROOT=$(WMLBASE) \
- -D IMGROOT=$(WMLBASE)/images \
- -D TORCVSSTABLE=$(TORCVSSTABLE) \
- -D TORCVSHEAD=$(TORCVSHEAD)
+SUBDIRS=eff
include $(WMLBASE)/Makefile.common
+all: $(SUBDIRS)
+
+eff:
+ $(MAKE) -C "$@" WMLBASE=../$(WMLBASE)
+
+.PHONY: eff
Index: Makefile.common
===================================================================
RCS file: /home/or/cvsroot/website/Makefile.common,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- Makefile.common 26 Jan 2006 22:26:07 -0000 1.1
+++ Makefile.common 26 Jan 2006 23:15:02 -0000 1.2
@@ -1,84 +1,69 @@
+WMLOPT = \
+ -I $(WMLBASE)/include \
+ -D DOCROOT=$(WMLBASE) \
+ -D IMGROOT=$(WMLBASE)/images \
+ -D TORCVSSTABLE=$(TORCVSSTABLE) \
+ -D TORCVSHEAD=$(TORCVSHEAD)
+
LANGS=de en it fr se
WMLFILES=$(wildcard $(patsubst %, %/*.wml, $(LANGS)))
WMIFILES=$(wildcard $(patsubst %, %/*.wmi, $(LANGS)) $(WMLBASE)/include/*.wmi )
-HTMLFILES = $(patsubst de/%.wml, %.html.de, \
- $(patsubst en/%.wml, %.html.en, \
- $(patsubst it/%.wml, %.html.it, \
- $(patsubst fr/%.wml, %.html.fr, \
- $(patsubst se/%.wml, %.html.se, \
- $(WMLFILES) \
- ) \
- ) \
- ) \
- ) \
- )
-DEPFILES = $(patsubst de/%.wml,.deps/%.html.de.d, \
- $(patsubst en/%.wml,.deps/%.html.en.d, \
- $(patsubst it/%.wml,.deps/%.html.it.d, \
- $(patsubst fr/%.wml,.deps/%.html.fr.d,\
- $(patsubst se/%.wml,.deps/%.html.se.d,\
- $(WMLFILES) \
- ) \
- ) \
- ) \
- ) \
- )
+HTMLFILES = $(shell perl -le 's, (.*)/(.*).wml , $$2.html.$$1 ,x, print $$_ for @ARGV' $(WMLFILES))
+DEPFILES = $(shell perl -le 's, (.*)/(.*).wml , .deps/$$2.html.$$1.d ,x, print $$_ for @ARGV' $(WMLFILES))
all: $(HTMLFILES)
-
-
%.html.en: en/%.wml
- lang=`dirname $<` && wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $@
+ lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@
%.html.de: de/%.wml en/%.wml
- lang=`dirname $<` && wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $@
+ lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@
%.html.it: it/%.wml en/%.wml
- lang=`dirname $<` && wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $@
+ lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@
%.html.fr: fr/%.wml en/%.wml
- lang=`dirname $<` && wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $@
+ lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@
%.html.se: se/%.wml en/%.wml
- lang=`dirname $<` && wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $@
+ lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@
.deps/%.html.en.d: en/%.wml .deps/.stamp
tmpfile=`tempfile` \
lang=`dirname $<` && \
OUT=`echo $@ | sed -e 's,\.deps/\(.*\)\.d$$,\1,'` && \
- wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \
+ wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \
sed -e s',\(^[^ ]*\):,.deps/\1.d:,' < $$tmpfile >> $@ && \
rm -f $$tmpfile
.deps/%.html.de.d: de/%.wml .deps/.stamp
tmpfile=`tempfile` \
lang=`dirname $<` && \
OUT=`echo $@ | sed -e 's,\.deps/\(.*\)\.d$$,\1,'` && \
- wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \
+ wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \
sed -e s',\(^[^ ]*\):,.deps/\1.d:,' < $$tmpfile >> $@ && \
rm -f $$tmpfile
.deps/%.html.it.d: it/%.wml .deps/.stamp
tmpfile=`tempfile` \
lang=`dirname $<` && \
OUT=`echo $@ | sed -e 's,\.deps/\(.*\)\.d$$,\1,'` && \
- wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \
+ wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \
sed -e s',\(^[^ ]*\):,.deps/\1.d:,' < $$tmpfile >> $@ && \
rm -f $$tmpfile
.deps/%.html.fr.d: fr/%.wml .deps/.stamp
tmpfile=`tempfile` \
lang=`dirname $<` && \
OUT=`echo $@ | sed -e 's,\.deps/\(.*\)\.d$$,\1,'` && \
- wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \
+ wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \
sed -e s',\(^[^ ]*\):,.deps/\1.d:,' < $$tmpfile >> $@ && \
rm -f $$tmpfile
.deps/%.html.se.d: se/%.wml .deps/.stamp
tmpfile=`tempfile` \
lang=`dirname $<` && \
OUT=`echo $@ | sed -e 's,\.deps/\(.*\)\.d$$,\1,'` && \
- wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \
+ wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \
sed -e s',\(^[^ ]*\):,.deps/\1.d:,' < $$tmpfile >> $@ && \
rm -f $$tmpfile
.deps/.stamp:
@@ -88,5 +73,8 @@ all: $(HTMLFILES)
dep: $(DEPFILES)
clean:
rm -f $(HTMLFILES) $(DEPFILES)
+ for sub in $(SUBDIRS); do \
+ $(MAKE) -C "$$sub" WMLBASE=../$(WMLBASE) clean; \
+ done
include $(DEPFILES)