continuing ...

This commit is contained in:
Sven Neumann
2001-09-27 15:34:48 +00:00
parent a56949222f
commit 9ebe622eb1
21 changed files with 1860 additions and 1574 deletions

View File

@ -16,7 +16,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

View File

@ -20,7 +20,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

View File

@ -22,7 +22,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

View File

@ -1,6 +1,12 @@
2001-09-27 Sven Neumann <sven@gimp.org>
* Makefile.in.in: different version for AM_GLIB_GNU_GETTEXT.
* update.sh: changed package name to gimp14-libgimp.
2001-09-17 Andras Timar <timar@gnome.hu> 2001-09-17 Andras Timar <timar@gnome.hu>
* hu.po: converted to UTF-8. * hu.po: converted to UTF-8.
2001-08-29 Sven Neumann <sven@gimp.org> 2001-08-29 Sven Neumann <sven@gimp.org>

View File

@ -1,12 +1,16 @@
# Makefile for program source directory in GNU NLS utilities package. # Makefile for program source directory in GNU NLS utilities package.
# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper <drepper@gnu.ai.mit.edu> # 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 # 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 # 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. # but which still want to provide support for the GNU gettext functionality.
# Please note that the actual code is *not* freely available. # 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/
#
PACKAGE = gimp-libgimp GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-libgimp
VERSION = @VERSION@ VERSION = @VERSION@
SHELL = /bin/sh SHELL = /bin/sh
@ -14,26 +18,26 @@ SHELL = /bin/sh
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ..
VPATH = @srcdir@ VPATH = @srcdir@
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
datadir = @datadir@ datadir = $(prefix)/@DATADIRNAME@
localedir = $(datadir)/locale localedir = $(datadir)/locale
gettextsrcdir = $(datadir)/gettext/po gnulocaledir = $(prefix)/share/locale
subdir = po-libgimp gettextsrcdir = $(prefix)/share/gettext/po
subdir = po
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS = @MKINSTALLDIRS@ MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
CC = @CC@ CC = @CC@
GMSGFMT = @GMSGFMT@ GENCAT = @GENCAT@
GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@ XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
MSGMERGE = msgmerge MSGMERGE = PATH=../src:$$PATH msgmerge
DEFS = @DEFS@ DEFS = @DEFS@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
@ -43,79 +47,125 @@ INCLUDES = -I.. -I$(top_srcdir)/intl
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
SOURCES = cat-id-tbl.c
POFILES = @POFILES@ POFILES = @POFILES@
GMOFILES = @GMOFILES@ GMOFILES = @GMOFILES@
DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \ DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
$(POFILES) $(GMOFILES) stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
POTFILES = \ POTFILES = \
CATALOGS = @CATALOGS@ CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
INSTOBJEXT = @INSTOBJEXT@
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .c .o .po .pox .gmo .mo .SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
.c.o: .c.o:
$(COMPILE) $< $(COMPILE) $<
.po.pox: .po.pox:
$(MAKE) $(PACKAGE).pot $(MAKE) $(GETTEXT_PACKAGE).pot
$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox
.po.mo: .po.mo:
$(MSGFMT) -o $@ $< $(MSGFMT) -o $@ $<
.po.gmo: .po.gmo:
file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
&& rm -f $$file && $(GMSGFMT) --statistics -o $$file $< && rm -f $$file && $(GMSGFMT) -o $$file $<
.po.cat:
sed -f ../intl/po2msg.sed < $< > $*.msg \
&& rm -f $@ && $(GENCAT) $@ $*.msg
all: all-@USE_NLS@ all: all-@USE_NLS@
all-yes: $(CATALOGS) all-yes: cat-id-tbl.c $(CATALOGS)
all-no: all-no:
# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot', $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
# otherwise packages like GCC can not be built if only parts of the source $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
# have been downloaded.
$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in
$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
--add-comments --keyword=_ --keyword=N_ \ --add-comments --keyword=_ --keyword=N_ \
--files-from=$(srcdir)/POTFILES.in \ --files-from=$(srcdir)/POTFILES.in \
&& test ! -f $(PACKAGE).po \ && test ! -f $(GETTEXT_PACKAGE).po \
|| ( rm -f $(srcdir)/$(PACKAGE).pot \ || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot ) && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot )
$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
$(srcdir)/stamp-cat-id: $(GETTEXT_PACKAGE).pot
rm -f cat-id-tbl.tmp
sed -f ../po/po2tbl.sed $(srcdir)/$(GETTEXT_PACKAGE).pot \
| sed -e "s/@GETTEXT_PACKAGE NAME@/$(GETTEXT_PACKAGE)/" > cat-id-tbl.tmp
if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
rm cat-id-tbl.tmp; \
else \
echo cat-id-tbl.c changed; \
rm -f $(srcdir)/cat-id-tbl.c; \
mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
fi
cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
install: install-exec install-data install: install-exec install-data
install-exec: install-exec:
install-data: install-data-@USE_NLS@ install-data: install-data-@USE_NLS@
if test "$(PACKAGE)" = "gettext"; then \ install-data-no: all
$(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ install-data-yes: all
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
fi
@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; \
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
fi; \
if test -r $$cat; then \
$(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
else \
$(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
echo "installing $(srcdir)/$$cat as" \
"$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
fi; \
if test -r $$cat.m; then \
$(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
else \
if test -r $(srcdir)/$$cat.m ; then \
$(INSTALL_DATA) $(srcdir)/$$cat.m \
$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
echo "installing $(srcdir)/$$cat as" \
"$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
else \
true; \
fi; \
fi; \
done
if test "$(GETTEXT_PACKAGE)" = "gettext"; then \
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \ $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \ else \
: ; \ : ; \
fi fi
install-data-no: all
install-data-yes: all
$(mkinstalldirs) $(DESTDIR)$(datadir)
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\.gmo$$//'`; \
dir=$(localedir)/$$lang/LC_MESSAGES; \
$(mkinstalldirs) $(DESTDIR)$$dir; \
if test -r $$cat; then \
$(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \
else \
$(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
echo "installing $(srcdir)/$$cat as" \
"$(DESTDIR)$$dir/$(PACKAGE).mo"; \
fi; \
done
# Define this as empty until I found a useful application. # Define this as empty until I found a useful application.
installcheck: installcheck:
@ -124,64 +174,60 @@ uninstall:
catalogs='$(CATALOGS)'; \ catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \ for cat in $$catalogs; do \
cat=`basename $$cat`; \ cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\.gmo$$//'`; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
done done
if test "$(PACKAGE)" = "gettext"; then \ rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi
check: all check: all
cat-id-tbl.o: ../intl/libgettext.h
dvi info tags TAGS ID: dvi info tags TAGS ID:
mostlyclean: mostlyclean:
rm -f core core.* *.pox $(PACKAGE).po *.new.po rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp
rm -fr *.o rm -fr *.o
clean: mostlyclean clean: mostlyclean
distclean: clean distclean: clean
rm -f Makefile Makefile.in POTFILES *.mo rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
maintainer-clean: distclean maintainer-clean: distclean
@echo "This command is intended for maintainers to use;" @echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
rm -f $(GMOFILES) rm -f $(GMOFILES)
distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
dist distdir: dist distdir: update-po $(DISTFILES)
$(MAKE) update-po
@$(MAKE) dist2
# This is a separate target because 'update-po' must be executed before.
dist2: $(DISTFILES)
dists="$(DISTFILES)"; \ dists="$(DISTFILES)"; \
for file in $$dists; do \ for file in $$dists; do \
cp -p $(srcdir)/$$file $(distdir); \ ln $(srcdir)/$$file $(distdir) 2> /dev/null \
|| cp -p $(srcdir)/$$file $(distdir); \
done done
update-po: Makefile update-po: Makefile
$(MAKE) $(PACKAGE).pot $(MAKE) $(GETTEXT_PACKAGE).pot
if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \ PATH=`pwd`/../src:$$PATH; \
cd $(srcdir); \ cd $(srcdir); \
catalogs='$(GMOFILES)'; \ catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \ for cat in $$catalogs; do \
cat=`basename $$cat`; \ cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\.gmo$$//'`; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
mv $$lang.po $$lang.old.po; \
echo "$$lang:"; \ echo "$$lang:"; \
if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \ if $(MSGMERGE) $$lang.old.po $(GETTEXT_PACKAGE).pot -o $$lang.po; then \
mv -f $$lang.new.po $$lang.po; \ rm -f $$lang.old.po; \
else \ else \
echo "msgmerge for $$cat failed!"; \ echo "msgmerge for $$cat failed!"; \
rm -f $$lang.new.po; \ rm -f $$lang.po; \
mv $$lang.old.po $$lang.po; \
fi; \ fi; \
done done
$(MAKE) update-gmo
update-gmo: Makefile $(GMOFILES)
@:
POTFILES: POTFILES.in POTFILES: POTFILES.in
( if test 'x$(srcdir)' != 'x.'; then \ ( if test 'x$(srcdir)' != 'x.'; then \

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
PACKAGE="gimp-libgimp" PACKAGE="gimp14-libgimp"
if [ "x$1" = "x--help" ]; then if [ "x$1" = "x--help" ]; then

View File

@ -1,6 +1,12 @@
2001-09-27 Sven Neumann <sven@gimp.org>
* Makefile.in.in: different version for AM_GLIB_GNU_GETTEXT.
* update.sh: changed package name to gimp14-std-plugins.
2001-09-17 Andras Timar <timar@gnome.hu> 2001-09-17 Andras Timar <timar@gnome.hu>
* hu.po: converted to UTF-8. * hu.po: converted to UTF-8.
2001-08-29 Sven Neumann <sven@gimp.org> 2001-08-29 Sven Neumann <sven@gimp.org>

View File

@ -1,12 +1,16 @@
# Makefile for program source directory in GNU NLS utilities package. # Makefile for program source directory in GNU NLS utilities package.
# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper <drepper@gnu.ai.mit.edu> # 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 # 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 # 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. # but which still want to provide support for the GNU gettext functionality.
# Please note that the actual code is *not* freely available. # 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/
#
PACKAGE = gimp-std-plugins GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-std-plug-ins
VERSION = @VERSION@ VERSION = @VERSION@
SHELL = /bin/sh SHELL = /bin/sh
@ -14,26 +18,26 @@ SHELL = /bin/sh
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ..
VPATH = @srcdir@ VPATH = @srcdir@
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
datadir = @datadir@ datadir = $(prefix)/@DATADIRNAME@
localedir = $(datadir)/locale localedir = $(datadir)/locale
gettextsrcdir = $(datadir)/gettext/po gnulocaledir = $(prefix)/share/locale
subdir = po-plug-ins gettextsrcdir = $(prefix)/share/gettext/po
subdir = po
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS = @MKINSTALLDIRS@ MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
CC = @CC@ CC = @CC@
GMSGFMT = @GMSGFMT@ GENCAT = @GENCAT@
GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@ XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
MSGMERGE = msgmerge MSGMERGE = PATH=../src:$$PATH msgmerge
DEFS = @DEFS@ DEFS = @DEFS@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
@ -43,79 +47,125 @@ INCLUDES = -I.. -I$(top_srcdir)/intl
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
SOURCES = cat-id-tbl.c
POFILES = @POFILES@ POFILES = @POFILES@
GMOFILES = @GMOFILES@ GMOFILES = @GMOFILES@
DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \ DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
$(POFILES) $(GMOFILES) stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
POTFILES = \ POTFILES = \
CATALOGS = @CATALOGS@ CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
INSTOBJEXT = @INSTOBJEXT@
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .c .o .po .pox .gmo .mo .SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
.c.o: .c.o:
$(COMPILE) $< $(COMPILE) $<
.po.pox: .po.pox:
$(MAKE) $(PACKAGE).pot $(MAKE) $(GETTEXT_PACKAGE).pot
$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox
.po.mo: .po.mo:
$(MSGFMT) -o $@ $< $(MSGFMT) -o $@ $<
.po.gmo: .po.gmo:
file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
&& rm -f $$file && $(GMSGFMT) --statistics -o $$file $< && rm -f $$file && $(GMSGFMT) -o $$file $<
.po.cat:
sed -f ../intl/po2msg.sed < $< > $*.msg \
&& rm -f $@ && $(GENCAT) $@ $*.msg
all: all-@USE_NLS@ all: all-@USE_NLS@
all-yes: $(CATALOGS) all-yes: cat-id-tbl.c $(CATALOGS)
all-no: all-no:
# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot', $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
# otherwise packages like GCC can not be built if only parts of the source $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
# have been downloaded.
$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in
$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
--add-comments --keyword=_ --keyword=N_ \ --add-comments --keyword=_ --keyword=N_ \
--files-from=$(srcdir)/POTFILES.in \ --files-from=$(srcdir)/POTFILES.in \
&& test ! -f $(PACKAGE).po \ && test ! -f $(GETTEXT_PACKAGE).po \
|| ( rm -f $(srcdir)/$(PACKAGE).pot \ || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot ) && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot )
$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
$(srcdir)/stamp-cat-id: $(GETTEXT_PACKAGE).pot
rm -f cat-id-tbl.tmp
sed -f ../po/po2tbl.sed $(srcdir)/$(GETTEXT_PACKAGE).pot \
| sed -e "s/@GETTEXT_PACKAGE NAME@/$(GETTEXT_PACKAGE)/" > cat-id-tbl.tmp
if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
rm cat-id-tbl.tmp; \
else \
echo cat-id-tbl.c changed; \
rm -f $(srcdir)/cat-id-tbl.c; \
mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
fi
cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
install: install-exec install-data install: install-exec install-data
install-exec: install-exec:
install-data: install-data-@USE_NLS@ install-data: install-data-@USE_NLS@
if test "$(PACKAGE)" = "gettext"; then \ install-data-no: all
$(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ install-data-yes: all
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
fi
@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; \
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
fi; \
if test -r $$cat; then \
$(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
else \
$(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
echo "installing $(srcdir)/$$cat as" \
"$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
fi; \
if test -r $$cat.m; then \
$(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
else \
if test -r $(srcdir)/$$cat.m ; then \
$(INSTALL_DATA) $(srcdir)/$$cat.m \
$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
echo "installing $(srcdir)/$$cat as" \
"$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
else \
true; \
fi; \
fi; \
done
if test "$(GETTEXT_PACKAGE)" = "gettext"; then \
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \ $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \ else \
: ; \ : ; \
fi fi
install-data-no: all
install-data-yes: all
$(mkinstalldirs) $(DESTDIR)$(datadir)
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\.gmo$$//'`; \
dir=$(localedir)/$$lang/LC_MESSAGES; \
$(mkinstalldirs) $(DESTDIR)$$dir; \
if test -r $$cat; then \
$(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \
else \
$(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
echo "installing $(srcdir)/$$cat as" \
"$(DESTDIR)$$dir/$(PACKAGE).mo"; \
fi; \
done
# Define this as empty until I found a useful application. # Define this as empty until I found a useful application.
installcheck: installcheck:
@ -124,64 +174,60 @@ uninstall:
catalogs='$(CATALOGS)'; \ catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \ for cat in $$catalogs; do \
cat=`basename $$cat`; \ cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\.gmo$$//'`; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
done done
if test "$(PACKAGE)" = "gettext"; then \ rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi
check: all check: all
cat-id-tbl.o: ../intl/libgettext.h
dvi info tags TAGS ID: dvi info tags TAGS ID:
mostlyclean: mostlyclean:
rm -f core core.* *.pox $(PACKAGE).po *.new.po rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp
rm -fr *.o rm -fr *.o
clean: mostlyclean clean: mostlyclean
distclean: clean distclean: clean
rm -f Makefile Makefile.in POTFILES *.mo rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
maintainer-clean: distclean maintainer-clean: distclean
@echo "This command is intended for maintainers to use;" @echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
rm -f $(GMOFILES) rm -f $(GMOFILES)
distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
dist distdir: dist distdir: update-po $(DISTFILES)
$(MAKE) update-po
@$(MAKE) dist2
# This is a separate target because 'update-po' must be executed before.
dist2: $(DISTFILES)
dists="$(DISTFILES)"; \ dists="$(DISTFILES)"; \
for file in $$dists; do \ for file in $$dists; do \
cp -p $(srcdir)/$$file $(distdir); \ ln $(srcdir)/$$file $(distdir) 2> /dev/null \
|| cp -p $(srcdir)/$$file $(distdir); \
done done
update-po: Makefile update-po: Makefile
$(MAKE) $(PACKAGE).pot $(MAKE) $(GETTEXT_PACKAGE).pot
if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \ PATH=`pwd`/../src:$$PATH; \
cd $(srcdir); \ cd $(srcdir); \
catalogs='$(GMOFILES)'; \ catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \ for cat in $$catalogs; do \
cat=`basename $$cat`; \ cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\.gmo$$//'`; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
mv $$lang.po $$lang.old.po; \
echo "$$lang:"; \ echo "$$lang:"; \
if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \ if $(MSGMERGE) $$lang.old.po $(GETTEXT_PACKAGE).pot -o $$lang.po; then \
mv -f $$lang.new.po $$lang.po; \ rm -f $$lang.old.po; \
else \ else \
echo "msgmerge for $$cat failed!"; \ echo "msgmerge for $$cat failed!"; \
rm -f $$lang.new.po; \ rm -f $$lang.po; \
mv $$lang.old.po $$lang.po; \
fi; \ fi; \
done done
$(MAKE) update-gmo
update-gmo: Makefile $(GMOFILES)
@:
POTFILES: POTFILES.in POTFILES: POTFILES.in
( if test 'x$(srcdir)' != 'x.'; then \ ( if test 'x$(srcdir)' != 'x.'; then \

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
VERSION="1.2.5" VERSION="1.2.5"
PACKAGE="gimp-std-plugins" PACKAGE="gimp14-std-plugins"
if [ "x$1" = "x--help" ]; then if [ "x$1" = "x--help" ]; then

View File

@ -1,6 +1,12 @@
2001-09-27 Sven Neumann <sven@gimp.org>
* Makefile.in.in: different version for AM_GLIB_GNU_GETTEXT.
* update.sh: changed package name to gimp14-script-fu.
2001-09-17 Andras Timar <timar@gnome.hu> 2001-09-17 Andras Timar <timar@gnome.hu>
* hu.po: converted to UTF-8. * hu.po: converted to UTF-8.
2001-08-29 Sven Neumann <sven@gimp.org> 2001-08-29 Sven Neumann <sven@gimp.org>

View File

@ -1,12 +1,16 @@
# Makefile for program source directory in GNU NLS utilities package. # Makefile for program source directory in GNU NLS utilities package.
# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper <drepper@gnu.ai.mit.edu> # 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 # 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 # 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. # but which still want to provide support for the GNU gettext functionality.
# Please note that the actual code is *not* freely available. # 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/
#
PACKAGE = gimp-script-fu GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-script-fu
VERSION = @VERSION@ VERSION = @VERSION@
SHELL = /bin/sh SHELL = /bin/sh
@ -14,27 +18,27 @@ SHELL = /bin/sh
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ..
VPATH = @srcdir@ VPATH = @srcdir@
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
datadir = @datadir@ datadir = $(prefix)/@DATADIRNAME@
localedir = $(datadir)/locale localedir = $(datadir)/locale
gettextsrcdir = $(datadir)/gettext/po gnulocaledir = $(prefix)/share/locale
subdir = po-script-fu gettextsrcdir = $(prefix)/share/gettext/po
subdir = po
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS = @MKINSTALLDIRS@ MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
CC = @CC@ CC = @CC@
GMSGFMT = @GMSGFMT@ GENCAT = @GENCAT@
GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@ XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
SXGETTEXT = $(srcdir)/script-fu-xgettext SXGETTEXT = $(srcdir)/script-fu-xgettext
MSGMERGE = msgmerge MSGMERGE = PATH=../src:$$PATH msgmerge
DEFS = @DEFS@ DEFS = @DEFS@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
@ -44,79 +48,131 @@ INCLUDES = -I.. -I$(top_srcdir)/intl
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
SOURCES = cat-id-tbl.c
POFILES = @POFILES@ POFILES = @POFILES@
GMOFILES = @GMOFILES@ GMOFILES = @GMOFILES@
DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \ DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
$(POFILES) $(GMOFILES) stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
POTFILES = \ POTFILES = \
POTSCRIPTS = \
$(top_srcdir)/plug-ins/script-fu/scripts/*.scm \
$(top_srcdir)/plug-ins/gap/sel-to-anim-img.scm \
$(top_srcdir)/plug-ins/webbrowser/web-browser.scm
CATALOGS = @CATALOGS@ CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
INSTOBJEXT = @INSTOBJEXT@
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .c .o .po .pox .gmo .mo .SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
.c.o: .c.o:
$(COMPILE) $< $(COMPILE) $<
.po.pox: .po.pox:
$(MAKE) $(PACKAGE).pot $(MAKE) $(GETTEXT_PACKAGE).pot
$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox
.po.mo: .po.mo:
$(MSGFMT) -o $@ $< $(MSGFMT) -o $@ $<
.po.gmo: .po.gmo:
file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
&& rm -f $$file && $(GMSGFMT) --statistics -o $$file $< && rm -f $$file && $(GMSGFMT) -o $$file $<
.po.cat:
sed -f ../intl/po2msg.sed < $< > $*.msg \
&& rm -f $@ && $(GENCAT) $@ $*.msg
all: all-@USE_NLS@ all: all-@USE_NLS@
all-yes: $(CATALOGS) all-yes: cat-id-tbl.c $(CATALOGS)
all-no: all-no:
# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot', $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) $(POTSCRIPTS)
# otherwise packages like GCC can not be built if only parts of the source $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
# have been downloaded. --add-comments --keyword=_ --keyword=N_ \
--files-from=$(srcdir)/POTFILES.in \
&& $(SXGETTEXT) $(POTSCRIPTS) >> $(PACKAGE).po \
&& test ! -f $(GETTEXT_PACKAGE).po \
|| ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
&& mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot )
$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in $(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
$(SXGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ $(srcdir)/stamp-cat-id: $(GETTEXT_PACKAGE).pot
--add-comments --keyword=_ --keyword=N_ \ rm -f cat-id-tbl.tmp
--files-from=$(srcdir)/POTFILES.in \ sed -f ../po/po2tbl.sed $(srcdir)/$(GETTEXT_PACKAGE).pot \
&& test ! -f $(PACKAGE).po \ | sed -e "s/@GETTEXT_PACKAGE NAME@/$(GETTEXT_PACKAGE)/" > cat-id-tbl.tmp
|| ( rm -f $(srcdir)/$(PACKAGE).pot \ if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot ) rm cat-id-tbl.tmp; \
else \
echo cat-id-tbl.c changed; \
rm -f $(srcdir)/cat-id-tbl.c; \
mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
fi
cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
install: install-exec install-data install: install-exec install-data
install-exec: install-exec:
install-data: install-data-@USE_NLS@ install-data: install-data-@USE_NLS@
if test "$(PACKAGE)" = "gettext"; then \ install-data-no: all
$(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ install-data-yes: all
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
fi
@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; \
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
fi; \
if test -r $$cat; then \
$(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
else \
$(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
echo "installing $(srcdir)/$$cat as" \
"$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
fi; \
if test -r $$cat.m; then \
$(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
else \
if test -r $(srcdir)/$$cat.m ; then \
$(INSTALL_DATA) $(srcdir)/$$cat.m \
$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
echo "installing $(srcdir)/$$cat as" \
"$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
else \
true; \
fi; \
fi; \
done
if test "$(GETTEXT_PACKAGE)" = "gettext"; then \
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \ $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \ else \
: ; \ : ; \
fi fi
install-data-no: all
install-data-yes: all
$(mkinstalldirs) $(DESTDIR)$(datadir)
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\.gmo$$//'`; \
dir=$(localedir)/$$lang/LC_MESSAGES; \
$(mkinstalldirs) $(DESTDIR)$$dir; \
if test -r $$cat; then \
$(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \
else \
$(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
echo "installing $(srcdir)/$$cat as" \
"$(DESTDIR)$$dir/$(PACKAGE).mo"; \
fi; \
done
# Define this as empty until I found a useful application. # Define this as empty until I found a useful application.
installcheck: installcheck:
@ -125,64 +181,60 @@ uninstall:
catalogs='$(CATALOGS)'; \ catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \ for cat in $$catalogs; do \
cat=`basename $$cat`; \ cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\.gmo$$//'`; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
done done
if test "$(PACKAGE)" = "gettext"; then \ rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi
check: all check: all
cat-id-tbl.o: ../intl/libgettext.h
dvi info tags TAGS ID: dvi info tags TAGS ID:
mostlyclean: mostlyclean:
rm -f core core.* *.pox $(PACKAGE).po *.new.po rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp
rm -fr *.o rm -fr *.o
clean: mostlyclean clean: mostlyclean
distclean: clean distclean: clean
rm -f Makefile Makefile.in POTFILES *.mo rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
maintainer-clean: distclean maintainer-clean: distclean
@echo "This command is intended for maintainers to use;" @echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
rm -f $(GMOFILES) rm -f $(GMOFILES)
distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
dist distdir: dist distdir: update-po $(DISTFILES)
$(MAKE) update-po
@$(MAKE) dist2
# This is a separate target because 'update-po' must be executed before.
dist2: $(DISTFILES)
dists="$(DISTFILES)"; \ dists="$(DISTFILES)"; \
for file in $$dists; do \ for file in $$dists; do \
cp -p $(srcdir)/$$file $(distdir); \ ln $(srcdir)/$$file $(distdir) 2> /dev/null \
|| cp -p $(srcdir)/$$file $(distdir); \
done done
update-po: Makefile update-po: Makefile
$(MAKE) $(PACKAGE).pot $(MAKE) $(GETTEXT_PACKAGE).pot
if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \ PATH=`pwd`/../src:$$PATH; \
cd $(srcdir); \ cd $(srcdir); \
catalogs='$(GMOFILES)'; \ catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \ for cat in $$catalogs; do \
cat=`basename $$cat`; \ cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\.gmo$$//'`; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
mv $$lang.po $$lang.old.po; \
echo "$$lang:"; \ echo "$$lang:"; \
if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \ if $(MSGMERGE) $$lang.old.po $(GETTEXT_PACKAGE).pot -o $$lang.po; then \
mv -f $$lang.new.po $$lang.po; \ rm -f $$lang.old.po; \
else \ else \
echo "msgmerge for $$cat failed!"; \ echo "msgmerge for $$cat failed!"; \
rm -f $$lang.new.po; \ rm -f $$lang.po; \
mv $$lang.old.po $$lang.po; \
fi; \ fi; \
done done
$(MAKE) update-gmo
update-gmo: Makefile $(GMOFILES)
@:
POTFILES: POTFILES.in POTFILES: POTFILES.in
( if test 'x$(srcdir)' != 'x.'; then \ ( if test 'x$(srcdir)' != 'x.'; then \

View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: GIMP 1.2.2\n" "Project-Id-Version: GIMP 1.2.2\n"
"POT-Creation-Date: 2001-08-29 22:51+0200\n" "POT-Creation-Date: 2001-09-27 16:28+0200\n"
"PO-Revision-Date: 2001-06-22 14:41+0200\n" "PO-Revision-Date: 2001-06-22 14:41+0200\n"
"Last-Translator: Sven Neumann <sven@gimp.org>\n" "Last-Translator: Sven Neumann <sven@gimp.org>\n"
"Language-Team: German <de@li.org>\n" "Language-Team: German <de@li.org>\n"
@ -849,7 +849,8 @@ msgid "Base Color"
msgstr "Grundfarbe" msgstr "Grundfarbe"
#: plug-ins/script-fu/scripts/trochoid.scm:0 #: plug-ins/script-fu/scripts/trochoid.scm:0
msgid "Base Radius (pixel)" #, fuzzy
msgid "Base Radius (pixels)"
msgstr "Grundradius (Pixel)" msgstr "Grundradius (Pixel)"
#: plug-ins/script-fu/scripts/rendermap.scm:0 #: plug-ins/script-fu/scripts/rendermap.scm:0

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
PACKAGE="gimp-script-fu" PACKAGE="gimp14-script-fu"
if [ "x$1" = "x--help" ]; then if [ "x$1" = "x--help" ]; then

View File

@ -8,3 +8,4 @@ cat-id-tbl.c
*.pot *.pot
stamp-cat-id stamp-cat-id
messages messages
po2tbl.sed

View File

@ -1,3 +1,12 @@
2001-09-27 Sven Neumann <sven@gimp.org>
* Makefile.in.in: different version for AM_GLIB_GNU_GETTEXT.
* POTFILES.in: resync with new file locations.
* update.pl
* update.sh: changed package name to gimp14.
2001-09-17 Sven Neumann <sven@gimp.org> 2001-09-17 Sven Neumann <sven@gimp.org>
* fr.po: changed gimp_conseils.fr.txt to gimp_tips.fr.txt. * fr.po: changed gimp_conseils.fr.txt to gimp_tips.fr.txt.

View File

@ -3,18 +3,14 @@
app/app_procs.c app/app_procs.c
app/devices.c app/devices.c
app/disp_callbacks.c
app/docindex.c app/docindex.c
app/file-open.c app/file-open.c
app/file-save.c app/file-save.c
app/floating_sel.c app/floating_sel.c
app/gdisplay.c
app/gdisplay_color_ui.c app/gdisplay_color_ui.c
app/gdisplay_ops.c
app/gimphelp.c app/gimphelp.c
app/gimpprogress.c app/gimpprogress.c
app/gimprc.c app/gimprc.c
app/interface.c
app/main.c app/main.c
app/module_db.c app/module_db.c
app/nav_window.c app/nav_window.c
@ -41,6 +37,11 @@ app/core/gimppalette.c
app/core/gimppattern.c app/core/gimppattern.c
app/core/gimpunit.c app/core/gimpunit.c
app/display/gimpdisplay-callbacks.c
app/display/gimpdisplay-ops.c
app/display/gimpdisplay.c
app/display/gimpdisplayshell.c
app/gui/about-dialog.c app/gui/about-dialog.c
app/gui/brush-editor.c app/gui/brush-editor.c
app/gui/brush-select.c app/gui/brush-select.c

2144
po/de.po

File diff suppressed because it is too large Load Diff

102
po/po2tbl.sed.in Normal file
View File

@ -0,0 +1,102 @@
# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets
# Copyright (C) 1995 Free Software Foundation, Inc.
# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
#
# This program 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.
#
# This program 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.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
1 {
i\
/* Automatically generated by po2tbl.sed from @GETTEXT_PACKAGE NAME@.pot. */\
\
#if HAVE_CONFIG_H\
# include <config.h>\
#endif\
\
#include "libgettext.h"\
\
const struct _msg_ent _msg_tbl[] = {
h
s/.*/0/
x
}
#
# Write msgid entries in C array form.
#
/^msgid/ {
s/msgid[ ]*\(".*"\)/ {\1/
tb
# Append the next line
:b
N
# Look whether second part is continuation line.
s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/
# Yes, then branch.
ta
# Because we assume that the input file correctly formed the line
# just read cannot be again be a msgid line. So it's safe to ignore
# it.
s/\(.*\)\n.*/\1/
bc
# We found a continuation line. But before printing insert '\'.
:a
s/\(.*\)\(\n.*\)/\1\\\2/
P
# We cannot use D here.
s/.*\n\(.*\)/\1/
# Some buggy seds do not clear the `successful substitution since last ``t'''
# flag on `N', so we do a `t' here to clear it.
tb
# Not reached
:c
x
# The following nice solution is by
# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
td
# Increment a decimal number in pattern space.
# First hide trailing `9' digits.
:d
s/9\(_*\)$/_\1/
td
# Assure at least one digit is available.
s/^\(_*\)$/0\1/
# Increment the last digit.
s/8\(_*\)$/9\1/
s/7\(_*\)$/8\1/
s/6\(_*\)$/7\1/
s/5\(_*\)$/6\1/
s/4\(_*\)$/5\1/
s/3\(_*\)$/4\1/
s/2\(_*\)$/3\1/
s/1\(_*\)$/2\1/
s/0\(_*\)$/1\1/
# Convert the hidden `9' digits to `0's.
s/_/0/g
x
G
s/\(.*\)\n\([0-9]*\)/\1, \2},/
s/\(.*\)"$/\1/
p
}
#
# Last line.
#
$ {
i\
};\
g
s/0*\(.*\)/int _msg_tbl_length = \1;/p
}
d

View File

@ -8,7 +8,7 @@
$VERSION = "1.2.5 beta 2"; $VERSION = "1.2.5 beta 2";
$LANG = $ARGV[0]; $LANG = $ARGV[0];
$PACKAGE = "gimp"; $PACKAGE = "gimp14";
if (! $LANG){ if (! $LANG){
print "update.pl: missing file arguments\n"; print "update.pl: missing file arguments\n";

View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
VERSION="1.2.5" VERSION="1.2.5"
PACKAGE="gimp" PACKAGE="gimp14"
if [ "x$1" = "x--help" ]; then if [ "x$1" = "x--help" ]; then