[MPlayer-DOCS] CVS: homepage/essays/src konf2002-arpi.src.en, NONE, 1.1

[Torinthiel]

On Sat, May 14, 2005 at 02:12:10PM +0200, Diego Biurrun wrote:
> 
> On Sat, May 14, 2005 at 02:07:55PM +0200, Torinthiel wrote:
> > On Sat, May 14, 2005 at 02:58:26AM +0200, Diego Biurrun CVS wrote:
> > > 
> > > Added Files:
> > > 	konf2002-arpi.src.en 
> > 
> > And where the *?# the .html is generated?
> 
> Good that you mention it, I was about to ask you to extend the Makefile
> so that it generates the files from the essays subdir as well :-)

I've asked for it. See if this works correctly.
Torinthiel

-- 
 Waclaw "Torinthiel" Schiller       GG#: 542916, 3073512
   torinthiel(at)megapolis(dot)pl
   gpg: 0906A2CE fpr: EE3E DFB4 C4D6 E22E 8999  D714 7CEB CDDC 0906 A2CE
 "No classmates may be used during this examination"
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/homepage/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile	13 Nov 2004 23:20:40 -0000	1.1
+++ Makefile	14 May 2005 12:34:38 -0000
@@ -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 > $$@,\
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-docs/attachments/20050514/c3f396f5/attachment.pgp>