[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Refactor locale targets into separate Makefile

From: Erik Huelsmann <e.huelsmann_at_gmx.net>
Date: 2004-06-21 22:30:39 CEST

Hi,

The patch below refactors the locale targets into their own Makefile. That
way translators aren't required to know about building Subversion. To
prevent duplication of functionality I included the file into the main
Makefile. That way all targets remain available to the main build system.

The Makefile - if used stand alone - assumes the availability of msgfmt,
msgmerge and xgettext in $PATH. Although probably not the nicest way of
coding it, we do require those programs, so I did not see any harm assuming
them to be there. The change is effectively a no-op for the main build
system in terms of functionality.

Comments?

bye,

Erik.

Log
[[[
Refactor locale targets into a separate Makefile.

* subversion/po/Makefile: New file. Standalone makefile for building
  locale targets.

* Makefile.in: remove locale relates targets and SUFFIXES; include the
  new subversion/po/Makefile to compensate.
]]]
Index: Makefile.in
===================================================================
--- Makefile.in (revision 10046)
+++ Makefile.in (working copy)
@@ -258,24 +258,6 @@
                                                                            
   
 local-all: @BUILD_RULES@
                                                                            
   
-locale-gnu-pot:
- (cd $(abs_srcdir)/subversion/ ; \
- find . \
- -name .svn -prune -or \
- -name tests -prune -or \
- -name bindings -prune -or \
- -name "*.c" -print -or \
- -name "svn_error_codes.h" -print | \
- $(XGETTEXT) --sort-by-file -k_ -kN_ -kSVN_ERRDEF:3 \
- --msgid-bugs-address=dev@subversion.tigris.org \
- --add-comments --files-from=- -o po/subversion.pot )
-
-locale-gnu-po-update: locale-gnu-pot
- (cd $(abs_srcdir)/subversion/po ; \
- for i in *.po ; do \
- $(MSGMERGE) --sort-by-file --update $$i subversion.pot ; \
- done )
-
 # clean everything but the bulky test output, returning the system back
 # to before 'make' was run.
 fast-clean: doc-clean
@@ -491,8 +473,7 @@
 # Implicit rules for creating outputs from input files
 #
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .la-a .la .texi .info .dvi .txt .html .ps .pdf \
- .po .spo .mo
+.SUFFIXES: .c .lo .o .la-a .la .texi .info .dvi .txt .html .ps .pdf
  
 .c.o:
        $(COMPILE) -o $@ -c $<
@@ -522,12 +503,10 @@
 .dvi.pdf:
        $(DVIPDF) $< $@
  
-.po.spo:
- sed '/^"Content-Type: text\/plain; charset=UTF-8\\n"$$/d' $< > $@
  
-.spo.mo:
- $(MSGFMT) -o $@ $<
+include subversion/po/Makefile
  
+
 install-docs: install-man @INSTALL_INFO@
  
 manroot = $(mandir)/man
Index: subversion/po/Makefile
===================================================================
--- subversion/po/Makefile (revision 0)
+++ subversion/po/Makefile (revision 0)
@@ -0,0 +1,35 @@
+
+abs_srcdir ?= ../..
+MSGFMT ?= msgfmt
+MSGMERGE ?= msgmerge
+XGETTEXT ?= xgettext
+
+locale-gnu-pot:
+ (cd $(abs_srcdir)/subversion/ ; \
+ find . \
+ -name .svn -prune -or \
+ -name tests -prune -or \
+ -name bindings -prune -or \
+ -name "*.c" -print -or \
+ -name "svn_error_codes.h" -print | \
+ $(XGETTEXT) --sort-by-file -k_ -kN_ -kSVN_ERRDEF:3 \
+ --msgid-bugs-address=dev@subversion.tigris.org \
+ --add-comments --files-from=- -o po/subversion.pot )
+
+locale-gnu-po-update: locale-gnu-pot
+ (cd $(abs_srcdir)/subversion/po ; \
+ for i in *.po ; do \
+ $(MSGMERGE) --sort-by-file --update $$i subversion.pot ; \
+ done )
+
+
+
+.SUFFIXES: .po .spo .mo
+
+
+.po.spo:
+ sed '/^"Content-Type: text\/plain; charset=UTF-8\\n"$$/d' $< > $@
+
+.spo.mo:
+ $(MSGFMT) -o $@ $<
+

-- 
"Sie haben neue Mails!" - Die GMX Toolbar informiert Sie beim Surfen!
Jetzt aktivieren unter http://www.gmx.net/info
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jun 21 22:31:15 2004

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.