gEDA-cvs: gaf.git: branch: master updated (1.6.0-20091004-35-gb50377f)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  b50377f6c0438e49b9dff0a2be8dc01df51dfd55 (commit)
       via  7cf778da5905cf4189eeb043c1b98cb0efa2b305 (commit)
      from  39209cd034abc4059e4cda6590be158dc366e787 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 gattrib/po/Makevars             |    2 +-
 gschem/po/Makevars              |    2 +-
 libgeda/docs/images/Makefile.am |    6 ++++--
 libgeda/po/Makevars             |    2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)


=================
 Commit Messages
=================

commit b50377f6c0438e49b9dff0a2be8dc01df51dfd55
Author: Peter Brett <ptbb2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Don't use %-style patterns in Makefiles.
    
    %-style patterns are a GNU make extension.

:100644 100644 b50c4d4... 14538fc... M	libgeda/docs/images/Makefile.am

commit 7cf778da5905cf4189eeb043c1b98cb0efa2b305
Author: Peter Brett <ptbb2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Add --from-code=UTF-8 to XGETTEXT_OPTIONS.
    
    Some of the translatable strings in the source code contain UTF-8
    encoded characters.  Without setting the --from-code argument
    appropriately, xgettext chokes on these strings, which can result in
    an infinitely-recursing build.
    
    Reported-by: Peter <link@xxxxxxxxxxxxxxxxxxxxxx>

:100644 100644 b0f4372... c1ae12e... M	gattrib/po/Makevars
:100644 100644 18ccd7f... 3fc8d67... M	gschem/po/Makevars
:100644 100644 52d8132... 81ec2f6... M	libgeda/po/Makevars

=========
 Changes
=========

commit b50377f6c0438e49b9dff0a2be8dc01df51dfd55
Author: Peter Brett <ptbb2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Don't use %-style patterns in Makefiles.
    
    %-style patterns are a GNU make extension.

diff --git a/libgeda/docs/images/Makefile.am b/libgeda/docs/images/Makefile.am
index b50c4d4..14538fc 100644
--- a/libgeda/docs/images/Makefile.am
+++ b/libgeda/docs/images/Makefile.am
@@ -21,12 +21,14 @@ images: $(png_images) $(pdf_images)
 clean:
 	rm -rf $(png_images) $(pdf_images)
 
-%.png: %.svg
+.svg.png:
 	inkscape -e $@ $<  ||  convert $< $@
 
-%.pdf: %.svg
+.svg.pdf:
 	inkscape -A $@ $<  ||  convert $< $@
 
+SUFFIXES = .svg .pdf .png
+
 MOSTLYCLEANFILES = *~ $(png_images) $(pdf_images)
 CLEANFILES = *~ $(png_images) $(pdf_images)
 DISTCLEANFILES = *~ $(png_images) $(pdf_images)

commit 7cf778da5905cf4189eeb043c1b98cb0efa2b305
Author: Peter Brett <ptbb2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Add --from-code=UTF-8 to XGETTEXT_OPTIONS.
    
    Some of the translatable strings in the source code contain UTF-8
    encoded characters.  Without setting the --from-code argument
    appropriately, xgettext chokes on these strings, which can result in
    an infinitely-recursing build.
    
    Reported-by: Peter <link@xxxxxxxxxxxxxxxxxxxxxx>

diff --git a/gattrib/po/Makevars b/gattrib/po/Makevars
index b0f4372..c1ae12e 100644
--- a/gattrib/po/Makevars
+++ b/gattrib/po/Makevars
@@ -8,7 +8,7 @@ subdir = gattrib/po
 top_builddir = ../..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
diff --git a/gschem/po/Makevars b/gschem/po/Makevars
index 18ccd7f..3fc8d67 100644
--- a/gschem/po/Makevars
+++ b/gschem/po/Makevars
@@ -8,7 +8,7 @@ subdir = gschem/po
 top_builddir = ../..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+XGETTEXT_OPTIONS = --keyword=_ --keyword=_N --from-code=UTF-8
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
diff --git a/libgeda/po/Makevars b/libgeda/po/Makevars
index 52d8132..81ec2f6 100644
--- a/libgeda/po/Makevars
+++ b/libgeda/po/Makevars
@@ -15,7 +15,7 @@ subdir = libgeda/po
 top_builddir = ../..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs