GNOME.org
 

sawfish r4377 - in trunk: . lisp/sawfish/wm po

Author: chrisb
Date: Sun Feb  1 01:25:44 2009
New Revision: 4377
URL: http://svn.gnome.org/viewvc/sawfish?rev=4377&view=rev

Log:
* MAINTAINERS: updated my mail address

* autogen.sh
* configure.in: intltoolize sawfish

* po/LINGUAS: added

* po/POTFILES.in: updated
                                        
* po/Makefile.in
* po/make-pot
* po/sawfish.pot
* po/sawfish-xgettext
* po/update.sh
* po/README: removed


Added:
   trunk/po/LINGUAS
   trunk/po/Makefile.in.in
      - copied, changed from r4376, /trunk/po/Makefile.in
Removed:
   trunk/po/Makefile.in
   trunk/po/README
   trunk/po/make-pot
   trunk/po/sawfish-xgettext
   trunk/po/sawfish.pot
   trunk/po/update.sh
Modified:
   trunk/ChangeLog
   trunk/Makefile.in
   trunk/autogen.sh
   trunk/configure.in
   trunk/lisp/sawfish/wm/autoload.jl
   trunk/po/POTFILES.in

Modified: trunk/Makefile.in
==============================================================================
--- trunk/Makefile.in	(original)
+++ trunk/Makefile.in	Sun Feb  1 01:25:44 2009
@@ -86,7 +86,7 @@
 	done
 	rm -f *~ NEWS DOC* TAGS build.h
 
-realclean :
+distclean :
 	-for dir in $(SUBDIRS); do \
 	  [ -d $$dir ] && ( cd $$dir && $(MAKE) $@ ) || exit 1; \
 	done
@@ -94,8 +94,6 @@
 	rm -f *~ NEWS DOC* TAGS build.h sawfish.spec sawfish*.ebuild sawfish.pc
 	rm -rf aclocal.m4 autom4te.cache
 
-distclean : realclean
-
 TAGS :
 	etags --language=c `find $(srcdir) -name '*.[ch]' -print` \
 	      --language=lisp `find $(srcdir) -name '*.jl' -print`

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Sun Feb  1 01:25:44 2009
@@ -25,8 +25,10 @@
     else    libtoolize --force --copy --install || exit 1
     fi
   fi
+  echo "Running intltoolize"
+  intltoolize --force --copy
   echo "Running aclocal $ACLOCAL_FLAGS"
-  aclocal -I m4 $ACLOCAL_FLAGS || exit 1
+  aclocal -I m4 -I /usr/share/aclocal/ $ACLOCAL_FLAGS || exit 1
 
   echo "Running autoconf $AUTOCONF_FLAGS"
   autoconf $AUTOCONF_FLAGS || exit 1

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Feb  1 01:25:44 2009
@@ -26,6 +26,8 @@
 
 AM_PROG_LIBTOOL
 
+IT_PROG_INTLTOOL([0.35.0])
+
 dnl Release versioning info
 version="1.5.0"
 subversion=""
@@ -277,24 +279,14 @@
   CFLAGS="${CFLAGS} -Wall -Wmissing-prototypes -Wno-implicit-int"
 fi
 
-AC_MSG_CHECKING(for languages to install)
-AC_ARG_ENABLE(linguas,
-  [  --enable-linguas=LANGS... Install language catalogs for language codes LANGS],
-  [ LINGUAS="$enableval" ], [ LINGUAS="" ])
-if test "x$LINGUAS" = x; then
-  changequote({,})
-  LINGUAS="`echo $srcdir/po/*.po | sed -e 's/[^ ]*\/po\/\([^ ]*\)\.po/\1/g'`"
-  changequote([,])
-fi
-dnl too gross for words..
-if test $REP_MSGFMT = true; then
-  LINGUAS=""
-fi
-AC_MSG_RESULT($LINGUAS)
-AC_SUBST(LINGUAS)
-
 AC_PROG_INSTALL
 
+GETTEXT_PACKAGE=sawfish
+PACKAGE=sawfish
+VERSION=$version
+
+install_sh=../install-sh
+
 dnl Nonstandard exported symbols
 AC_SUBST(version)
 AC_SUBST(subversion)
@@ -302,6 +294,7 @@
 AC_SUBST(sawfishexecdir)
 AC_SUBST(lispdir)
 AC_SUBST(localedir)
+AC_SUBST(install_sh)
 AC_SUBST(HAVE_X11)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(CFLAGS)
@@ -338,6 +331,9 @@
 AC_SUBST(ESD_MIN_VER)
 AC_SUBST(ESD_LIBS)
 AC_SUBST(ESD_CFLAGS)
+AC_SUBST(GETTEXT_PACKAGE)
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
 
 dnl Build all files
 AC_CONFIG_FILES([
@@ -351,7 +347,7 @@
 lisp/sawfish/gtk/Makefile
 lisp/sawfish/gtk/widgets/font.jl
 man/Makefile
-po/Makefile
+po/Makefile.in
 scripts/Makefile
 sounds/Makefile
 src/Makefile

Modified: trunk/lisp/sawfish/wm/autoload.jl
==============================================================================
--- trunk/lisp/sawfish/wm/autoload.jl	(original)
+++ trunk/lisp/sawfish/wm/autoload.jl	Sun Feb  1 01:25:44 2009
@@ -131,7 +131,7 @@
 (autoload-command (quote 3d-hack) (quote sawfish.wm.ext.3d-hack) #:class 'default)
 (defgroup audio "Sound" :require sawfish.wm.ext.audio-events)
 (defgroup match-window "Matched Windows" :layout single :require sawfish.wm.ext.match-window)
-(defgroup tooltips "Tooltips" :group misc :require sawfish.wm.ext.tooltips)
+(defgroup tooltips "Tooltips" :group appearance :require sawfish.wm.ext.tooltips)
 (autoload-placement-mode 'first-fit 'sawfish.wm.placement.smart #:for-normal t)
 (autoload-placement-mode 'best-fit 'sawfish.wm.placement.smart #:for-normal t)
 (autoload-placement-mode 'best-fit-group 'sawfish.wm.placement.smart #:for-normal t)

Added: trunk/po/LINGUAS
==============================================================================
--- (empty file)
+++ trunk/po/LINGUAS	Sun Feb  1 01:25:44 2009
@@ -0,0 +1,52 @@
+am
+ar
+az
+be
+bg
+bs
+ca
+cs
+da
+de
+dz
+el
+en_CA
+en_GB
+es
+et
+eu
+fi
+fr
+ga
+gl
+hu
+it
+ja
+ko
+lv
+mk
+ms
+nb
+ne
+nl
+nn
+no
+oc
+pa
+pl
+pt_BR
+pt
+ro
+ru
+rw
+sk
+sl
+sr Latn
+sr
+sv
+tr
+uk
+vi
+wa
+zh_CN
+zh_TW

Copied: trunk/po/Makefile.in.in (from r4376, /trunk/po/Makefile.in)
==============================================================================
--- /trunk/po/Makefile.in	(original)
+++ trunk/po/Makefile.in.in	Sun Feb  1 01:25:44 2009
@@ -1,87 +1,217 @@
-# Makefile.in for sawmill's message catalogues
-# $Id: Makefile.in,v 1.7 2000/07/06 13:30:07 john Exp $
+# Makefile for program source directory in GNU NLS utilities package.
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper gnu ai mit edu>
+# Copyright (C) 2004-2008 Rodney Dawes <dobey pwns gmail com>
 #
-# Copyright (C) 1999 John Harper <john dcs warwick ac uk>
+# This file may be copied and used freely without restrictions.  It may
+# be used in projects which are not available under a GNU Public License,
+# but which still want to provide support for the GNU gettext functionality.
 #
-# This file is part of sawmill.
+# - Modified by Owen Taylor <otaylor redhat com> to use GETTEXT_PACKAGE
+#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
 #
-# sawmill is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# - Modified by jacob berkman <jacob ximian com> to install
+#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
 #
-# sawmill is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# - Modified by Rodney Dawes <dobey pwns gmail com> for use with intltool
 #
-# You should have received a copy of the GNU General Public License
-# along with sawmill; see the file COPYING.  If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-include ../Makedefs
-top_srcdir= top_srcdir@
-top_builddir=..
-srcdir= srcdir@
-VPATH= srcdir@:@top_srcdir@
-
-PACKAGE=sawfish
-MSGMERGE=msgmerge
-CATOBJEXT=.mo
-
-POFILES=$(LINGUAS:%=%.po)
-CATALOGS=$(LINGUAS:%=%$(CATOBJEXT))
-
-all : $(CATALOGS) $(PACKAGE).pot
-
-$(PACKAGE).pot :
-	./make-pot
-
-ifneq ($(CATALOGS),)
-install : $(CATALOGS) installdirs
-	for f in $(CATALOGS); do \
-	  st=`basename $$f .mo`; \
-	  if test '!' -d $(DESTDIR)$(localedir)/$$st/LC_MESSAGES/; then \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(localedir)/$$st/LC_MESSAGES; \
-	  fi; \
-	  $(INSTALL_DATA) $$f $(DESTDIR)$(localedir)/$$st/LC_MESSAGES/$(PACKAGE).mo; \
-	done
-else
-install : $(CATALOGS) installdirs
+# We have the following line for use by intltoolize:
+# INTLTOOL_MAKEFILE
 
-endif
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
 
-update-po:
-	$(MAKE) $(PACKAGE).pot
-	cd $(srcdir); \
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  mv $$lang.po $$lang.old.po; \
-	  echo "$$lang:"; \
-	  if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po.x; then \
-	    if grep -v "^# \.\." $$lang.po.x >$$lang.po; then \
-	      rm -f $$lang.po.x; \
-	    fi; \
-	    rm -f $$lang.old.po; \
+SHELL = /bin/sh
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datadir = @datadir@
+datarootdir = @datarootdir@
+libdir = @libdir@
+DATADIRNAME = @DATADIRNAME@
+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+subdir = po
+install_sh = @install_sh@
+# Automake >= 1.8 provides @mkdir_p  
+# Until it can be supposed, use the safe fallback:
+mkdir_p = $(install_sh) -d
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+GMSGFMT = @GMSGFMT@
+MSGFMT = @MSGFMT@
+XGETTEXT = @XGETTEXT@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+
+ALL_LINGUAS = @ALL_LINGUAS@
+
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
+
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+
+POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+
+DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
+EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
+
+POTFILES = \
+# This comment gets stripped out
+
+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
+
+.SUFFIXES:
+.SUFFIXES: .po .pox .gmo .mo .msg .cat
+
+.po.pox:
+	$(MAKE) $(GETTEXT_PACKAGE).pot
+	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+
+.po.mo:
+	$(MSGFMT) -o $@ $<
+
+.po.gmo:
+	file=`echo $* | sed 's,.*/,,'`.gmo \
+	  && rm -f $$file && $(GMSGFMT) -o $$file $<
+
+.po.cat:
+	sed -f ../intl/po2msg.sed < $< > $*.msg \
+	  && rm -f $@ && gencat $@ $*.msg
+
+
+all: all- USE_NLS@
+
+all-yes: $(CATALOGS)
+all-no:
+
+$(GETTEXT_PACKAGE).pot: $(POTFILES)
+	$(GENPOT)
+
+install: install-data
+install-data: install-data- USE_NLS@
+install-data-no: all
+install-data-yes: all
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $$dir; \
+	  if test -r $$lang.gmo; then \
+	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
+	  else \
+	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $(srcdir)/$$lang.gmo as" \
+		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
+	  fi; \
+	  if test -r $$lang.gmo.m; then \
+	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
+	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
 	  else \
-	    echo "msgmerge for $$cat failed!"; \
-	    rm -f $$lang.po; \
-	    mv $$lang.old.po $$lang.po; \
+	    if test -r $(srcdir)/$$lang.gmo.m ; then \
+	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
+		$$dir/$(GETTEXT_PACKAGE).mo.m; \
+	      echo "installing $(srcdir)/$$lang.gmo.m as" \
+		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
+	    else \
+	      true; \
+	    fi; \
 	  fi; \
 	done
 
-installdirs : $(top_srcdir)/mkinstalldirs
-	$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(localedir)
+# Empty stubs to satisfy archaic automake needs
+dvi info tags TAGS ID:
 
-uninstall :
-	rm -f $(DESTDIR)$(localedirdir)
+# Define this as empty until I found a useful application.
+install-exec installcheck:
 
-clean :
-	rm -f core *~ *.mo
+uninstall:
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+	done
 
-realclean : clean
-	rm -f Makefile $(PACKAGE).pot
+check: all $(GETTEXT_PACKAGE).pot
+	rm -f missing notexist
+	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
+	if [ -r missing -o -r notexist ]; then \
+	  exit 1; \
+	fi
+
+mostlyclean:
+	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
+	rm -f .intltool-merge-cache
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile Makefile.in POTFILES stamp-it
+	rm -f *.mo *.msg *.cat *.cat.m *.gmo
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f Makefile.in.in
+
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir: $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	extra_dists="$(EXTRA_DISTFILES)"; \
+	for file in $$extra_dists; do \
+	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
+	done; \
+	for file in $$dists; do \
+	  test -f $$file || file="$(srcdir)/$$file"; \
+	  ln $$file $(distdir) 2> /dev/null \
+	    || cp -p $$file $(distdir); \
+	done
+
+update-po: Makefile
+	$(MAKE) $(GETTEXT_PACKAGE).pot
+	tmpdir=`pwd`; \
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  echo "$$lang:"; \
+	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
+	  if $$result; then \
+	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	      rm -f $$tmpdir/$$lang.new.po; \
+            else \
+	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	        :; \
+	      else \
+	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	        rm -f $$tmpdir/$$lang.new.po; \
+	        exit 1; \
+	      fi; \
+	    fi; \
+	  else \
+	    echo "msgmerge for $$lang.gmo failed!"; \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  fi; \
+	done
 
-.PHONY : all install uninstall clean realclean
+Makefile POTFILES: stamp-it
+	@if test ! -f $@; then \
+	  rm -f stamp-it; \
+	  $(MAKE) stamp-it; \
+	fi
+
+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
+	       $(SHELL) ./config.status
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Sun Feb  1 01:25:44 2009
@@ -76,4 +76,5 @@
 themes/mono/theme.jl
 themes/simple/theme.jl
 themes/smaker/theme.jl
+themes/mxflat/theme.jl
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]