[MPlayer-DOCS] CVS: homepage Makefile,1.1,1.2

[Torinthiel CVS]

CVS change done by Torinthiel CVS

Update of /cvsroot/mplayer/homepage
In directory mail:/var2/tmp/cvs-serv20134

Modified Files:
	Makefile 
Log Message:
- Extend buildsystem to accept essays subdirectory
- Simplify make clean


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/homepage/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	13 Nov 2004 23:20:40 -0000	1.1
+++ Makefile	14 May 2005 13:38:48 -0000	1.2
@@ -1,5 +1,4 @@
 DESIGNS := design7 design6 design5 design4 design3
-SOURCES := $(wildcard src/*.src.*)
 TRANSLATIONS := es hu pl
 pl_ENCODING := iso-8859-2
 hu_ENCODING := iso-8859-2
@@ -7,18 +6,28 @@
 ifeq ($(INTERNAL),yes)
 
 SRC2HTML = $(addsuffix $(2).html, $(notdir $(basename $(basename $(1)))))
+PAGES := $(wildcard ../src/*.src.en)
+ESSAYS := $(wildcard ../essays/src/*.src.en)
 
 all: en $(TRANSLATIONS)
 
 # The English homepage requires some special treatment
-en: $(call SRC2HTML, $(wildcard ../src/*.src.en))
-$(call SRC2HTML, $(wildcard ../src/*.src.en)): %.html : ../src/%.src.en src/upper src/selector src/lower
+en: $(call SRC2HTML, $(PAGES) $(ESSAYS))
+$(call SRC2HTML, $(PAGES)): %.html : ../src/%.src.en src/upper src/selector src/lower
+	cat src/upper src/selector $< src/lower > $@
+
+$(call SRC2HTML, $(ESSAYS)): %.html : ../essays/src/%.src.en src/upper src/selector src/lower
 	cat src/upper src/selector $< src/lower > $@
 
 # And the rest of languages...
 define lang-def
-$(1): $(if $(wildcard src/selector-$(1)),$(call SRC2HTML, $(wildcard ../src/*.src.$(1)),-$(1)))
-$(call SRC2HTML, $(wildcard ../src/*.src.en),-$(1)): %-$(1).html : ../src/%.src.$(1) src/upper src/selector-$(1) src/lower
+$(1): $(if $(wildcard src/selector-$(1)),$(call SRC2HTML, $(wildcard ../src/*.src.$(1)) $(wildcard ../essays/src/*.src.$(1)),-$(1)))
+$(call SRC2HTML, $(PAGES),-$(1)): %-$(1).html : ../src/%.src.$(1) src/upper src/selector-$(1) src/lower
+	$(if $($(1)_ENCODING),\
+	sed -e '/text\/html/s/iso-8859-1/$($(1)_ENCODING)/' src/upper | \
+	cat - src/selector-$(1) $$< src/lower > $$@,\
+	cat src/upper src/selector-$(1) $$< src/lower > $$@)
+$(call SRC2HTML, $(ESSAYS),-$(1)): %-$(1).html : ../essays/src/%.src.$(1) src/upper src/selector-$(1) src/lower
 	$(if $($(1)_ENCODING),\
 	sed -e '/text\/html/s/iso-8859-1/$($(1)_ENCODING)/' src/upper | \
 	cat - src/selector-$(1) $$< src/lower > $$@,\
@@ -33,7 +42,7 @@
 all: $(DESIGNS)
 
 clean:
-	rm -f $(foreach des, $(DESIGNS), $(wildcard $(des)/*.html))
+	rm -f $(foreach des, $(DESIGNS), $(des)/*.html)
 
 $(DESIGNS):
 	make -C $@ -f $(if $(filter-out Makefile,$(MAKEFILE_LIST)), $(MAKEFILE_LIST), ../Makefile) INTERNAL=yes