gimp-help-2 r2640 - in trunk: . po/de po/es po/fi po/fr po/hr po/it po/ko po/lt po/nl po/no po/pl po/ru po/sv pot src

[ulfehlert svn gnome org]

Author: ulfehlert
Date: Wed Dec 24 13:05:17 2008
New Revision: 2640
URL: http://svn.gnome.org/viewvc/gimp-help-2?rev=2640&view=rev

Log:
2008-12-24  Ulf-D. Ehlert  <ulfehlert svn gnome org>

	* Makefile.GNU: added function "make_target_dir"; create
	'src/preface' if necessary; fixed making odf dir twice
	* Makefile.am: create 'src/preface' if necessary;
	fixed making odf dir twice

	* src/key-reference-fr.xml
	* src/key-reference-it.xml
	* pot/key-reference-fr.pot
	* pot/key-reference-it.pot
	* po/de/key-reference-fr.po
	* po/de/key-reference-it.po
	* po/es/key-reference-fr.po
	* po/es/key-reference-it.po
	* po/fi/key-reference-fr.po
	* po/fi/key-reference-it.po
	* po/fr/key-reference-fr.po
	* po/fr/key-reference-it.po
	* po/hr/key-reference-fr.po
	* po/hr/key-reference-it.po
	* po/it/key-reference-fr.po
	* po/it/key-reference-it.po
	* po/ko/key-reference-fr.po
	* po/ko/key-reference-it.po
	* po/lt/key-reference-fr.po
	* po/lt/key-reference-it.po
	* po/nl/key-reference-fr.po
	* po/nl/key-reference-it.po
	* po/no/key-reference-fr.po
	* po/no/key-reference-it.po
	* po/pl/key-reference-fr.po
	* po/pl/key-reference-it.po
	* po/ru/key-reference-fr.po
	* po/ru/key-reference-it.po
	* po/sv/key-reference-fr.po
	* po/sv/key-reference-it.po: removed

	* src/gimp.xml: removed key-reference-{fr,it}.xml

	* src/key-reference.xml: removed "Do not edit" warning


Removed:
   trunk/po/de/key-reference-fr.po
   trunk/po/de/key-reference-it.po
   trunk/po/es/key-reference-fr.po
   trunk/po/es/key-reference-it.po
   trunk/po/fi/key-reference-fr.po
   trunk/po/fi/key-reference-it.po
   trunk/po/fr/key-reference-fr.po
   trunk/po/fr/key-reference-it.po
   trunk/po/hr/key-reference-fr.po
   trunk/po/hr/key-reference-it.po
   trunk/po/it/key-reference-fr.po
   trunk/po/it/key-reference-it.po
   trunk/po/ko/key-reference-fr.po
   trunk/po/ko/key-reference-it.po
   trunk/po/lt/key-reference-fr.po
   trunk/po/lt/key-reference-it.po
   trunk/po/nl/key-reference-fr.po
   trunk/po/nl/key-reference-it.po
   trunk/po/no/key-reference-fr.po
   trunk/po/no/key-reference-it.po
   trunk/po/pl/key-reference-fr.po
   trunk/po/pl/key-reference-it.po
   trunk/po/ru/key-reference-fr.po
   trunk/po/ru/key-reference-it.po
   trunk/po/sv/key-reference-fr.po
   trunk/po/sv/key-reference-it.po
   trunk/pot/key-reference-fr.pot
   trunk/pot/key-reference-it.pot
   trunk/src/key-reference-fr.xml
   trunk/src/key-reference-it.xml
Modified:
   trunk/ChangeLog
   trunk/Makefile.GNU
   trunk/Makefile.am
   trunk/src/gimp.xml
   trunk/src/key-reference.xml

Modified: trunk/Makefile.GNU
==============================================================================
--- trunk/Makefile.GNU	(original)
+++ trunk/Makefile.GNU	Wed Dec 24 13:05:17 2008
@@ -86,7 +86,7 @@
 # list of authors and contributors
 AUTHORS_STYLESHEET_XML = stylesheets/authors.xml
 # automatically generated authors section (DocBook)
-AUTHORS_DOCBOOK_XML = src/preface/authors.xml
+AUTHORS_DOCBOOK_XML = $(xmldir)/preface/authors.xml
 
 # To talk or not to talk, that is the question!
 VERBOSE ?= 1
@@ -170,6 +170,14 @@
 endif
 
 
+#--------------------------------------------------------------#
+#       Helper functions                                       #
+#--------------------------------------------------------------#
+
+make_target_dir = \
+	f=$(1); d=$${f%/*}; test -d $$d || $(mkdir_p) $$d;
+
+
 ########################################################################
 ####            Main targets                                        ####
 ########################################################################
@@ -199,7 +207,7 @@
 
 # xmldir/path/to/file.xml --> potdir/path/to/file.pot
 $(POT_FILES): $(potdir)/%.pot : $(xmldir)/%.xml
-	$(cmd) f=$@; d=$${f%/*}; test -d $$d || $(mkdir_p) $$d
+	$(cmd) $(call make_target_dir,$@)
 	$(msg) "[POT] $@"
 	$(cmd) if test -s $<; then $(call xml2pot,$<,$@); else touch $@; fi
 
@@ -216,7 +224,7 @@
 define MAKE_PO_RULES
 $(1)_PO_FILES = $$(patsubst $$(potdir)/%.pot, $$(podir)/$(1)/%.po, $$(POT_FILES))
 $$($(1)_PO_FILES): $$(podir)/$(1)/%.po : $$(potdir)/%.pot
-	$$(cmd) f=$$@; d=$$$${f%/*}; test -d $$$$d || $$(mkdir_p) $$$$d
+	$$(cmd) $$(call make_target_dir,$$@)
 	$$(msg) "[PO]  $$@"
 	$$(cmd) if test -s $$<; then $$(call pot2po,$$<,$(1),$$@); else touch $$@; fi
 # Debugging
@@ -242,7 +250,7 @@
 define MAKE_XML_RULES
 $(1)_XML_FILES = $$(XML_FILES:$$(xmldir)/%=$$(xmlpodir)/$(1)/%)
 $$($(1)_XML_FILES): $$(xmlpodir)/$(1)/%.xml : $$(podir)/$(1)/%.po
-	$$(cmd) f=$$@; d=$$$${f%/*}; test -d $$$$d || $$(mkdir_p) $$$$d
+	$$(cmd) $$(call make_target_dir,$$@)
 	$$(msg) "[XML] $$@"
 	$$(cmd) if test -s $$(@:$$(xmlpodir)/$(1)/%=$$(xmldir)/%); then \
 		$$(call po2xml,$$(@:$$(xmlpodir)/$(1)/%=$$(xmldir)/%),$$<,$(1),$$@); \
@@ -435,7 +443,6 @@
 
 odf/%.odt: $(xmlpodir)/%/gimp-alldocs.xml
 	$(cmd) test -d $(odfdir) || $(mkdir_p) $(odfdir)
-	$(cmd) $(mkdir_p) odf
 	$(cmd) $(DOCBOOK2ODF) $(DOCBOOK2ODFFLAGS) \
 	    --debug -v \
 	    --output-dir=`pwd` \
@@ -467,6 +474,7 @@
 	
 $(AUTHORS_DOCBOOK_XML): $(AUTHORS_STYLESHEET_XML) stylesheets/authors_*.xsl
 	$(msg) "**** Making $@ ... "
+	$(cmd) $(call make_target_dir,$@)
 	$(cmd) $(XSLTPROC) \
 	  $(XSLTFLAGS) $(XSLTEXTRAFLAGS) \
 	  $(srcdir)/stylesheets/authors_docbook.xsl \

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed Dec 24 13:05:17 2008
@@ -194,6 +194,7 @@
 	
 $(AUTHORS_DOCBOOK_XML): $(AUTHORS_STYLESHEET_XML) stylesheets/authors_*.xsl
 	@echo "Creating $@"
+	$(cmd) f=$@; d=$${f%/*}; test -d $$d || $(mkdir_p) $$d
 	$(cmd) $(XSLTPROC) \
 	  $(XSLTFLAGS) \
 	  $(srcdir)/stylesheets/authors_docbook.xsl \
@@ -464,7 +465,6 @@
 
 $(odfdir)/%.odt: $(xmlpodir)/%/gimp-alldocs.xml
 	$(cmd) test -d $(odfdir) || $(mkdir_p) $(odfdir)
-	$(cmd) $(mkdir_p) odf
 	$(cmd) $(DOCBOOK2ODF) $(DOCBOOK2ODFFLAGS) \
 	    --debug -v \
 	    --output-dir=`pwd` \

Modified: trunk/src/gimp.xml
==============================================================================
--- trunk/src/gimp.xml	(original)
+++ trunk/src/gimp.xml	Wed Dec 24 13:05:17 2008
@@ -250,8 +250,6 @@
       <xi:include href="filters/filters_decor.xml"/>
     </chapter>
     <xi:include href="key-reference.xml"/>
-    <xi:include href="key-reference-fr.xml"/>
-    <xi:include href="key-reference-it.xml"/>
   </part>
   <xi:include href="glossary/glossary.xml"/>
   <xi:include href="dictionary/dictionary.xml"/>

Modified: trunk/src/key-reference.xml
==============================================================================
--- trunk/src/key-reference.xml	(original)
+++ trunk/src/key-reference.xml	Wed Dec 24 13:05:17 2008
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
-<!--
-      Do not edit this file.  It is generated automatically from
-      docs/gimp-keys.xml.
-    -->
+
 <reference id="key-reference">
   <title>Keys and Mouse Reference</title>
   <refentry>