trans-coord/gnun/prep/gnun GNUmakefile ChangeLog

[Kaloian Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Kaloian Doganov <kaloian>       08/02/06 15:57:18

Modified files:
        gnun/prep/gnun : GNUmakefile ChangeLog 

Log message:
        GNUMakefile (VALIDATESKIP): New variable.
        ($(rootdir)/po/home.proto, $(1).proto $(1).translinks): Introduce
        validation for original HMTL files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/prep/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/prep/gnun/ChangeLog?cvsroot=trans-coord&r1=1.32&r2=1.33

Patches:
Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/prep/gnun/GNUmakefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- GNUmakefile 6 Feb 2008 13:45:10 -0000       1.29
+++ GNUmakefile 6 Feb 2008 15:57:18 -0000       1.30
@@ -40,6 +40,13 @@
 CVSSKIP := echo "SKIP:"
 endif
 
+# Do not validate any files by default unless VALIDATE=yes
+ifeq (yes,$(VALIDATE))
+VALIDATESKIP :=
+else
+VALIDATESKIP := echo "SKIP:"
+endif
+
 # Email addresses for notifications.
 devel_addr := address@hidden
 
@@ -148,6 +155,7 @@
 # in order to prevent further messing up in the chain.  For
 # extra safety, exit with an error so that make does not
 # proceed to the next command.
+       $(VALIDATESKIP) $(VALIDATE-HTML) $<
        $(MAKE-PROTOTYPE) --home --input=$< --generic=generic.html --output=$@ 
|| ($(RM) $@ ; exit 1)
        $(SED) --in-place "s/\$$Date.*\$$/<gnun>\0<\/gnun>/g" $@
 
@@ -177,7 +185,7 @@
        [ ! -f $(rootdir)/gnusflashes.$(1).include ] || $(SED) --in-place 
"s/\(<!--#include file=\"gnusflashes*\)\(.include\" -->\)/\1.$(1)\2/g" 
$(rootdir)/po/home.$(1).m4
 endif
        $(M4) $(rootdir)/po/home.$(1).m4 > $$@
-       $(VALIDATE-HTML) $$@
+       $(VALIDATESKIP) $(VALIDATE-HTML) $$@
 endef
 
 $(foreach h_lang,$(HOME_LINGUAS),$(eval $(call home_rules,$(h_lang))))
@@ -187,6 +195,7 @@
 # FIXME: Consider using implicit rules, if at all possible.
 define article_pot_rules
 $(1).proto $(1).translinks: $(subst /po/,/,$(1).html)
+       $(VALIDATESKIP) $(VALIDATE-HTML) $$<
        $(MAKE-PROTOTYPE) --input=$$< --generic=generic.html 
--output=$(1).proto --translinks=$(1).translinks || \
          ($(RM) $(1).proto $(1).translinks ; exit 1)
        $(SED) --in-place "s/\$$$$Date.*\$$$$/<gnun>\0<\/gnun>/g" $(1).proto
@@ -211,7 +220,7 @@
                $(SED) --in-place "s/\(<!--#include 
virtual=\".*$$$$replaceable\)\(.html\" -->\)/\1.$(2)\2/g" $(1).m4; \
        done;
        $(M4) $(1).m4 > $$@
-       $(VALIDATE-HTML) $$@
+       $(VALIDATESKIP) $(VALIDATE-HTML) $$@
 endef
 
 $(foreach base,$(ALL_BASE),$(eval $(call article_pot_rules,$(base))))

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/prep/gnun/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- ChangeLog   6 Feb 2008 13:45:10 -0000       1.32
+++ ChangeLog   6 Feb 2008 15:57:18 -0000       1.33
@@ -4,7 +4,9 @@
        the system wide catalog.
        * README: Mention w3c-dtd-xhtml as a dependency.
 
-       * GNUmakefile (VALIDATE-HTML): New variable.
+       * GNUmakefile (VALIDATE-HTML, VALIDATESKIP): New variables.
+       ($(rootdir)/po/home.proto, $(1).proto $(1).translinks): Introduce
+       validation for original HMTL files.
        ($(rootdir)/home.$(1).shtml, $(subst /po/,/,$(1).html)): Introduce
        validation for generated HTML files.