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

[Torinthiel]

On Sat, May 14, 2005 at 05:03:14PM +0200, Diego Biurrun wrote:
> 
> On Sat, May 14, 2005 at 03:57:17PM +0200, Diego Biurrun wrote:
> > On Sat, May 14, 2005 at 03:51:21PM +0200, Diego Biurrun CVS wrote:
> > > 
> > > Modified Files:
> > > 	konf2002-Pontscho.src.en konf2002.src.en 
> > 
> > Updating web page ... 
> > make -C design7 -f   /home/diego/bin/Makefile.homepage INTERNAL=yes
> > make[1]: Entering directory `/var/www/htdocs/homepage/design7'
> > make[1]: *** virtual memory exhausted.  Stop.
> > make[1]: Leaving directory `/var/www/htdocs/homepage/design7'
> > make: *** [design7] Error 2
> > 
> > Lack of swap or something else?
> 
> No, it looks as though we hit a bug in GNU make:

Ah, so that's the reason I've been seeing mysterious errors.
To be honest it didn't work for me, but I thought it was my box's fault
and because the version with everything except translated essays worked
I've sent if for evaluation.

> Torinthiel, do you think you can work around this?

Attached version works for me (really this time)
Strangely if I remove the PAGES and ESSAYS declaration it (both, one is
not sufficient) (these are used now, but are not after the patch) it
fails. If I remove the comment it also fails.  I'm beginning to think
that the file needs to be big enough. Maybe adding a few lines of x's
will help.
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.2
diff -u -r1.2 Makefile
--- Makefile	14 May 2005 13:38:48 -0000	1.2
+++ Makefile	14 May 2005 21:06:47 -0000
@@ -1,5 +1,6 @@
 DESIGNS := design7 design6 design5 design4 design3
 TRANSLATIONS := es hu pl
+SRCDIRS=src essays/src
 pl_ENCODING := iso-8859-2
 hu_ENCODING := iso-8859-2
 
@@ -12,29 +13,36 @@
 all: en $(TRANSLATIONS)
 
 # The English homepage requires some special treatment
-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 > $@
+en: $(call SRC2HTML, $(foreach dir, $(SRCDIRS), $(wildcard ../$(dir)/*.src.en)))
 
+define en-dir-def
+$(call SRC2HTML, $(wildcard ../$(1)/*.src.en)):  %.html : ../$(1)/%.src.en src/upper src/selector src/lower
+	cat src/upper src/selector $$< src/lower > $$@
+endef
+	
 # And the rest of languages...
 define lang-def
-$(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
+#$(1): $(if $(wildcard src/selector-$(1)),$(call SRC2HTML, $(wildcard ../src/*.src.$(1)) $(wildcard ../essays/src/*.src.$(1)),-$(1)))
+$(1): $(if $(wildcard src/selector-$(1)),$(call SRC2HTML, $(foreach dir,$(SRCDIRS),$(wildcard ../$(dir)/*.src.$(1))),-$(1)))
+endef
+
+define lang-dir-def
+$(call SRC2HTML, $(wildcard ../$(2)/*.src.$(1)),-$(1)): %-$(1).html : ../$(2)/%.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 > $$@)
 endef
+
+#$(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 > $$@,\
+#	cat src/upper src/selector-$(1) $$< src/lower > $$@)
 endif
 $(foreach lang, $(TRANSLATIONS),$(eval $(call lang-def,$(lang))))
+$(foreach lang, $(TRANSLATIONS), $(foreach dir,$(SRCDIRS),$(eval $(call lang-dir-def,$(lang),$(dir)))))
+$(foreach dir, $(SRCDIRS),$(eval $(call en-dir-def,$(dir))))
 
 ifneq ($(INTERNAL),yes)
 
-------------- 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/2015897d/attachment.pgp>