trans-coord/gnun/prep/gnun ChangeLog GNUmakefile

[Yavor Doganov]

CVSROOT:        /cvsroot/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   08/01/28 17:43:47

Modified files:
        gnun/prep/gnun : ChangeLog GNUmakefile 

Log message:
        * GNUmakefile (addfile_dbl): Delete and use double escaped
        `$(addfile)' instead.  All uses changed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/prep/gnun/ChangeLog?cvsroot=trans-coord&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/prep/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/trans-coord/trans-coord/gnun/prep/gnun/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ChangeLog   28 Jan 2008 15:44:47 -0000      1.9
+++ ChangeLog   28 Jan 2008 17:43:46 -0000      1.10
@@ -1,3 +1,8 @@
+2008-01-28  Yavor Doganov  <address@hidden>
+
+       * GNUmakefile (addfile_dbl): Delete and use double escaped
+       `$(addfile)' instead.  All uses changed.
+
 2008-01-28  Kaloian Doganov <address@hidden>
 
        Ignore POT-Creation-Date changes when they are the only changes in
@@ -22,7 +27,7 @@
        ($(rootdir)/po/home.pot, $(rootdir)/home.$(1).shtml): Adjust as
        above.
        ($(template_dir)/po/%.pot, $(template_dir)/%.$(1).html, $(1).pot)
-       ($(subst /po/,/,$(1).html)): Add ($addfile) or$(addfile_dbl) as
+       ($(subst /po/,/,$(1).html)): Add ($addfile) or $(addfile_dbl) as
        first command to the recipe, where appropriate. 
        (sync): Use the CVS variable for consistency.
 

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/trans-coord/trans-coord/gnun/prep/gnun/GNUmakefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- GNUmakefile 28 Jan 2008 15:44:47 -0000      1.12
+++ GNUmakefile 28 Jan 2008 17:43:47 -0000      1.13
@@ -90,11 +90,6 @@
 [ -f $@ ] || ($(TOUCH) $@ ; $(CVS) $(CVSOPTS) add $@)
 endef
 
-# This is the same as `addfile', but with double expansion.
-define addfile_dbl
-[ -f $$@ ] || ( $(TOUCH) $$@ ; $(CVS) $(CVSOPTS) add $$@ )
-endef
-
 # The command to generate pot file which perform additional checks
 # whether the changes are not trivial (regarding only
 # POT-Creation-Date), in which case the changes are ignored.
@@ -110,7 +105,7 @@
 # articles' generation.
 define generic_rules
 generic.$(1).html:
-       $(addfile_dbl)
+       $$(addfile)
 endef
 
 $(foreach h_lang,$(HOME_LINGUAS),$(eval $(call generic_rules,$(h_lang))))
@@ -128,7 +123,7 @@
        $(MSGMERGE) --update $$@ $$< && $(TOUCH) $$@
 
 $(template_dir)/%.$(1).html: $(template_dir)/%.html 
$(template_dir)/po/%.$(1).po
-       $(addfile_dbl)
+       $$(addfile)
        @echo Generating the translated article...
        $(PO4A-TRANSLATE) $(PO4A_XHTMLFLAGS) $(PO4A-TRANSLATEFLAGS) --master 
$$< --po \
                $(template_dir)/po/$$(*F).$(1).po --localized $$@
@@ -157,7 +152,7 @@
        $(TOUCH) $$@
 
 $(rootdir)/home.$(1).shtml: $(rootdir)/po/home.proto 
$(rootdir)/po/home.$(1).po generic.$(1).html
-       $(addfile_dbl)
+       $$(addfile)
        $(PO4A-TRANSLATE) $(PO4A_XHTMLFLAGS) $(PO4A-TRANSLATEFLAGS) --master 
$$< --po $(rootdir)/po/home.$(1).po --localized $(rootdir)/po/home.$(1).m4
        $(SED) --in-place 
"s/\(<gnu.org-i18n>include(\`.*\)\([.]html')<\/gnu.org-i18n>\)/\1.$(1)\2/g" 
$(rootdir)/po/home.$(1).m4
        $(SED) --in-place "s/<gnu.org-i18n>\(.*\)<\/gnu.org-i18n>/\1/g" 
$(rootdir)/po/home.$(1).m4
@@ -187,7 +182,7 @@
        $(SED) --in-place 
"s/\$$$$Date.*\$$$$/<gnu.org-i18n>\0<\/gnu.org-i18n>/g" $(1).proto
 
 $(1).pot: $(1).proto
-       $(addfile_dbl)
+       $$(addfile)
        $$(generate-pot)
 endef
 
@@ -197,7 +192,7 @@
        $(TOUCH) $$@
 
 $(subst /po/,/,$(1).html): $(basename $(1)).proto $(basename $(1)).translinks 
$(1).po generic.$(2).html
-       $(addfile_dbl)
+       $$(addfile)
        $(PO4A-TRANSLATE) $(PO4A_XHTMLFLAGS) $(PO4A-TRANSLATEFLAGS) --master 
$$< --po $(1).po --localized $(1).m4
        $(SED) --in-place 
"s/\(<gnu.org-i18n>include(\`.*\)\([.]html')<\/gnu.org-i18n>\)/\1.$(2)\2/g" 
$(1).m4
        $(SED) --in-place "s/<gnu.org-i18n>\(.*\)<\/gnu.org-i18n>/\1/g" $(1).m4