[or-cvs] Remove some of the redundancy in the Makefile

Peter Palfrader weasel at seul.org
Thu Jan 26 22:21:27 UTC 2006


Update of /home/or/cvsroot/website
In directory moria:/tmp/cvs-serv11314

Modified Files:
	Makefile 
Log Message:
Remove some of the redundancy in the Makefile

Index: Makefile
===================================================================
RCS file: /home/or/cvsroot/website/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -d -r1.10 -r1.11
--- Makefile	20 Jan 2006 23:18:21 -0000	1.10
+++ Makefile	26 Jan 2006 22:21:25 -0000	1.11
@@ -18,19 +18,10 @@ WMLOPT  = \
           -D TORCVSSTABLE=$(TORCVSSTABLE) \
           -D TORCVSHEAD=$(TORCVSHEAD)
 
-WMLFILES=$(wildcard en/*.wml \
-                    de/*.wml \
-                    it/*.wml \
-                    fr/*.wml \
-                    se/*.wml \
-          )
-WMIFILES=$(wildcard include/*.wmi \
-                    en/*.wmi      \
-                    de/*.wmi      \
-                    it/*.wmi      \
-                    fr/*.wmi      \
-                    se/*.wmi      \
-          )
+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,        \
@@ -54,7 +45,6 @@ DEPFILES =  $(patsubst de/%.wml,.deps/%.
               )                                      \
              )
 
-LANGS=de en it fr se
 
 all: $(HTMLFILES)
 



More information about the tor-commits mailing list