Update
svn: r6152
This commit is contained in:
		@@ -1,3 +1,7 @@
 | 
			
		||||
2006-03-16  Alex Roitman  <shura@gramps-project.org>
 | 
			
		||||
	* po/Makefile.in.in: Remove as it is autogenerated.
 | 
			
		||||
	* po/*po: Remove and re-add from old src/po to keep history.
 | 
			
		||||
 | 
			
		||||
2006-03-15  Alex Roitman  <shura@gramps-project.org>
 | 
			
		||||
	* various: intltoolize and gettextize properly.
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -225,7 +225,8 @@ AC_SUBST(SCROLLKEEPER_BUILD_REQUIRED)
 | 
			
		||||
AC_SUBST(GNOMEHELP)
 | 
			
		||||
AC_SUBST(GPREFIX)
 | 
			
		||||
 | 
			
		||||
AC_CONFIG_FILES([ po/Makefile.in
 | 
			
		||||
AC_CONFIG_FILES([
 | 
			
		||||
po/Makefile.in
 | 
			
		||||
Makefile 
 | 
			
		||||
src/Makefile
 | 
			
		||||
src/RelLib/Makefile
 | 
			
		||||
 
 | 
			
		||||
@@ -1,244 +0,0 @@
 | 
			
		||||
# Makefile for program source directory in GNU NLS utilities package.
 | 
			
		||||
# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 | 
			
		||||
#
 | 
			
		||||
# This file file be copied and used freely without restrictions.  It can
 | 
			
		||||
# be used in projects which are not available under the GNU Public License
 | 
			
		||||
# but which still want to provide support for the GNU gettext functionality.
 | 
			
		||||
# Please note that the actual code is *not* freely available.
 | 
			
		||||
#
 | 
			
		||||
# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
 | 
			
		||||
#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
 | 
			
		||||
#
 | 
			
		||||
# - Modified by jacob berkman <jacob@ximian.com> to install
 | 
			
		||||
#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
 | 
			
		||||
#
 | 
			
		||||
# - Modified by Rodney Dawes <dobey@novell.com> for use with intltool
 | 
			
		||||
#
 | 
			
		||||
# We have the following line for use by intltoolize:
 | 
			
		||||
# INTLTOOL_MAKEFILE
 | 
			
		||||
 | 
			
		||||
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 | 
			
		||||
PACKAGE = @PACKAGE@
 | 
			
		||||
VERSION = @VERSION@
 | 
			
		||||
 | 
			
		||||
SHELL = /bin/sh
 | 
			
		||||
@SET_MAKE@
 | 
			
		||||
 | 
			
		||||
srcdir = @srcdir@
 | 
			
		||||
top_srcdir = @top_srcdir@
 | 
			
		||||
top_builddir = ..
 | 
			
		||||
VPATH = @srcdir@
 | 
			
		||||
 | 
			
		||||
prefix = @prefix@
 | 
			
		||||
exec_prefix = @exec_prefix@
 | 
			
		||||
datadir = @datadir@
 | 
			
		||||
datarootdir = @datarootdir@
 | 
			
		||||
libdir = @libdir@
 | 
			
		||||
localedir = $(libdir)/locale
 | 
			
		||||
gnulocaledir = $(datadir)/locale
 | 
			
		||||
gettextsrcdir = $(datadir)/glib-2.0/gettext/po
 | 
			
		||||
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@
 | 
			
		||||
 | 
			
		||||
CC = @CC@
 | 
			
		||||
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
 | 
			
		||||
 | 
			
		||||
DEFS = @DEFS@
 | 
			
		||||
CFLAGS = @CFLAGS@
 | 
			
		||||
CPPFLAGS = @CPPFLAGS@
 | 
			
		||||
 | 
			
		||||
INCLUDES = -I.. -I$(top_srcdir)/intl
 | 
			
		||||
 | 
			
		||||
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
 | 
			
		||||
 | 
			
		||||
SOURCES = 
 | 
			
		||||
POFILES = @POFILES@
 | 
			
		||||
GMOFILES = @GMOFILES@
 | 
			
		||||
DISTFILES = ChangeLog Makefile.in.in POTFILES.in \
 | 
			
		||||
$(POFILES) $(SOURCES)
 | 
			
		||||
EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
 | 
			
		||||
 | 
			
		||||
POTFILES = \
 | 
			
		||||
 | 
			
		||||
CATALOGS = @CATALOGS@
 | 
			
		||||
CATOBJEXT = @CATOBJEXT@
 | 
			
		||||
 | 
			
		||||
.SUFFIXES:
 | 
			
		||||
.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
 | 
			
		||||
 | 
			
		||||
.c.o:
 | 
			
		||||
	$(COMPILE) $<
 | 
			
		||||
 | 
			
		||||
.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-exec install-data
 | 
			
		||||
install-exec:
 | 
			
		||||
install-data: install-data-@USE_NLS@
 | 
			
		||||
install-data-no: all
 | 
			
		||||
install-data-yes: all
 | 
			
		||||
	$(mkdir_p) $(DESTDIR)$(datadir)
 | 
			
		||||
	@catalogs='$(CATALOGS)'; \
 | 
			
		||||
	for cat in $$catalogs; do \
 | 
			
		||||
	  cat=`basename $$cat`; \
 | 
			
		||||
	  case "$$cat" in \
 | 
			
		||||
	    *.gmo) destdir=$(gnulocaledir);; \
 | 
			
		||||
	    *)     destdir=$(localedir);; \
 | 
			
		||||
	  esac; \
 | 
			
		||||
	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 | 
			
		||||
	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
 | 
			
		||||
	  $(mkdir_p) $$dir; \
 | 
			
		||||
	  if test -r $$cat; then \
 | 
			
		||||
	    $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE).mo; \
 | 
			
		||||
	    echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE).mo"; \
 | 
			
		||||
	  else \
 | 
			
		||||
	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE).mo; \
 | 
			
		||||
	    echo "installing $(srcdir)/$$cat as" \
 | 
			
		||||
		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
 | 
			
		||||
	  fi; \
 | 
			
		||||
	  if test -r $$cat.m; then \
 | 
			
		||||
	    $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
 | 
			
		||||
	    echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
 | 
			
		||||
	  else \
 | 
			
		||||
	    if test -r $(srcdir)/$$cat.m ; then \
 | 
			
		||||
	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
 | 
			
		||||
		$$dir/$(GETTEXT_PACKAGE).mo.m; \
 | 
			
		||||
	      echo "installing $(srcdir)/$$cat as" \
 | 
			
		||||
		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
 | 
			
		||||
	    else \
 | 
			
		||||
	      true; \
 | 
			
		||||
	    fi; \
 | 
			
		||||
	  fi; \
 | 
			
		||||
	done
 | 
			
		||||
	if test "$(PACKAGE)" = "glib"; then \
 | 
			
		||||
	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
 | 
			
		||||
	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
 | 
			
		||||
			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
 | 
			
		||||
	else \
 | 
			
		||||
	  : ; \
 | 
			
		||||
	fi
 | 
			
		||||
 | 
			
		||||
# Define this as empty until I found a useful application.
 | 
			
		||||
installcheck:
 | 
			
		||||
 | 
			
		||||
uninstall:
 | 
			
		||||
	catalogs='$(CATALOGS)'; \
 | 
			
		||||
	for cat in $$catalogs; do \
 | 
			
		||||
	  cat=`basename $$cat`; \
 | 
			
		||||
	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 | 
			
		||||
	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
 | 
			
		||||
	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
 | 
			
		||||
	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
 | 
			
		||||
	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
 | 
			
		||||
	done
 | 
			
		||||
	if test "$(PACKAGE)" = "glib"; then \
 | 
			
		||||
	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
 | 
			
		||||
	fi
 | 
			
		||||
 | 
			
		||||
check: all $(GETTEXT_PACKAGE).pot
 | 
			
		||||
 | 
			
		||||
dvi info tags TAGS ID:
 | 
			
		||||
 | 
			
		||||
mostlyclean:
 | 
			
		||||
	rm -f core core.* *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
 | 
			
		||||
	rm -fr *.o
 | 
			
		||||
	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 = ../$(GETTEXT_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`; \
 | 
			
		||||
	catalogs='$(CATALOGS)'; \
 | 
			
		||||
	for cat in $$catalogs; do \
 | 
			
		||||
	  cat=`basename $$cat`; \
 | 
			
		||||
	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 | 
			
		||||
	  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 $$cat failed!"; \
 | 
			
		||||
	    rm -f $$tmpdir/$$lang.new.po; \
 | 
			
		||||
	  fi; \
 | 
			
		||||
	done
 | 
			
		||||
 | 
			
		||||
Makefile POTFILES: stamp-it
 | 
			
		||||
	@if test ! -f $@; then \
 | 
			
		||||
	  rm -f stamp-it; \
 | 
			
		||||
	  $(MAKE) stamp-it; \
 | 
			
		||||
	fi
 | 
			
		||||
 | 
			
		||||
stamp-it: Makefile.in.in ../config.status POTFILES.in
 | 
			
		||||
	cd .. \
 | 
			
		||||
	  && 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:
 | 
			
		||||
		Reference in New Issue
	
	Block a user