From 992e06495266de37c0ffefdd51e633fef7aa54df Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Sun, 16 Jan 2000 00:48:08 +0000 Subject: [PATCH] We now use `@LIBGTOP_PACKAGE@' as the translation domain so installed 2000-01-16 Martin Baulig We now use `@LIBGTOP_PACKAGE@' as the translation domain so installed `libgtop-1.1.mo' files won't conflict with the ones from LibGTop 1.0 and you can keep both versions installed. * po/Makefile.in.in.in: New file. This is a modified version of the usual `Makefile.in.in' which is created by gettextize; we copy this over `Makefile.in.in' in autogen.sh after gettextize'ing. * autogen.sh: Copy `po/Makefile.in.in.in' over `po/Makefile.in.in' after running `macros/autogen.sh'. * configure.in (LIBGTOP_PACKAGE): AC_SUBST and AC_DEFINE this. * include/glibtop/global.h (_): Use `LIBGTOP_PACKAGE' as our translation domain. 2000-01-16 Martin Baulig * LIBGTOP-VERSION (LIBGTOP_VERSION_SUFFIX): Added this so you can have your tarballs called `libgtop-1.x.y-snap.tar.gz' or whatever. This only affects the `VERSION' variable and thus how the resulting tarball will be called, but not `LIBGTOP_VERSION_CODE' etc. * Makefile.am: Make `aclocal.m4' also depend on `LIBGTOP-VERSION' when in maintainer-mode. --- ChangeLog | 28 +++++ LIBGTOP-VERSION | 9 +- Makefile.am | 3 +- acconfig.h | 1 + autogen.sh | 1 + configure.in | 4 + include/glibtop/global.h | 2 +- libgtopConf.sh.in | 2 + po/.cvsignore | 2 +- po/Makefile.in.in.in | 248 +++++++++++++++++++++++++++++++++++++++ 10 files changed, 296 insertions(+), 4 deletions(-) create mode 100644 po/Makefile.in.in.in diff --git a/ChangeLog b/ChangeLog index ce7b2004..7281ed3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +2000-01-16 Martin Baulig + + We now use `@LIBGTOP_PACKAGE@' as the translation domain so + installed `libgtop-1.1.mo' files won't conflict with the ones + from LibGTop 1.0 and you can keep both versions installed. + + * po/Makefile.in.in.in: New file. This is a modified version of + the usual `Makefile.in.in' which is created by gettextize; we + copy this over `Makefile.in.in' in autogen.sh after gettextize'ing. + + * autogen.sh: Copy `po/Makefile.in.in.in' over `po/Makefile.in.in' + after running `macros/autogen.sh'. + + * configure.in (LIBGTOP_PACKAGE): AC_SUBST and AC_DEFINE this. + + * include/glibtop/global.h (_): Use `LIBGTOP_PACKAGE' as our + translation domain. + +2000-01-16 Martin Baulig + + * LIBGTOP-VERSION (LIBGTOP_VERSION_SUFFIX): Added this so you can + have your tarballs called `libgtop-1.x.y-snap.tar.gz' or whatever. + This only affects the `VERSION' variable and thus how the resulting + tarball will be called, but not `LIBGTOP_VERSION_CODE' etc. + + * Makefile.am: Make `aclocal.m4' also depend on `LIBGTOP-VERSION' + when in maintainer-mode. + 2000-01-15 Martin Baulig * LIBGTOP-VERSION: Set version number to 1.1.5, binary age 0, diff --git a/LIBGTOP-VERSION b/LIBGTOP-VERSION index c4852016..1a0ef265 100644 --- a/LIBGTOP-VERSION +++ b/LIBGTOP-VERSION @@ -10,6 +10,10 @@ LIBGTOP_MAJOR_VERSION=1 LIBGTOP_MINOR_VERSION=1 LIBGTOP_MICRO_VERSION=5 +# you can set this to `-snap' for instance to create +# a `libgtop-1.x.y-snap.tar.gz' tarball. +LIBGTOP_VERSION_SUFFIX= + LIBGTOP_INTERFACE_AGE=0 LIBGTOP_BINARY_AGE=0 @@ -21,5 +25,8 @@ LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VER LIBGTOP_VERSION_CODE=`echo "$LIBGTOP_MAJOR_VERSION 1000000 * $LIBGTOP_MINOR_VERSION 1000 * + $LIBGTOP_MICRO_VERSION + p q" | dc` # For automake. -VERSION=$LIBGTOP_VERSION +VERSION=$LIBGTOP_VERSION$LIBGTOP_VERSION_SUFFIX PACKAGE=libgtop + +# This is the default translation domain for LibGTop +LIBGTOP_PACKAGE=libgtop-$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION diff --git a/Makefile.am b/Makefile.am index acb0539e..19c05438 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,7 +50,7 @@ bin_SCRIPTS = $(top_builddir)/libgtop-config @MAINT@macros/macros.dep: macros/Makefile.am @MAINT@ cd macros && $(MAKE) macros.dep -@MAINT@$(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4 +@MAINT@$(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4 LIBGTOP-VERSION ## We create libgtopConf.sh here and not from configure because we want ## to get the paths expanded correctly. Macros like srcdir are given @@ -75,6 +75,7 @@ libgtopConf.sh: libgtopConf.sh.in Makefile -e 's#\@LIBGTOP_VERSION\@#$(LIBGTOP_VERSION)#g' \ -e 's#\@LIBGTOP_VERSION_CODE\@#$(LIBGTOP_VERSION_CODE)#g' \ -e 's#\@LIBGTOP_SERVER_VERSION\@#$(LIBGTOP_SERVER_VERSION)#g' \ + -e 's#\@LIBGTOP_PACKAGE\@#$(LIBGTOP_PACKAGE)#g' \ -e 's#\@libgtop_sysdeps_dir\@#$(libgtop_sysdeps_dir)#g' \ -e 's#\@libgtop_need_server\@#$(libgtop_need_server)#g' \ -e 's#\@libgtop_use_machine_h\@#$(libgtop_use_machine_h)#g' \ diff --git a/acconfig.h b/acconfig.h index 15752af1..4aba52fe 100644 --- a/acconfig.h +++ b/acconfig.h @@ -24,6 +24,7 @@ #undef HAVE_LC_MESSAGES #undef HAVE_STPCPY #undef HAVE_STRUCT_OSOCKADDR +#undef LIBGTOP_PACKAGE #undef PACKAGE #undef VERSION #undef HAVE_LIBSM diff --git a/autogen.sh b/autogen.sh index 732d32ab..9aec4f55 100755 --- a/autogen.sh +++ b/autogen.sh @@ -15,6 +15,7 @@ PKG_NAME="Gnome Top Library" } . $srcdir/macros/autogen.sh +cp -f $srcdir/po/Makefile.in.in.in $srcdir/po/Makefile.in.in echo "" echo " *** IMPORTANT *** " diff --git a/configure.in b/configure.in index d132654c..83fecbf7 100644 --- a/configure.in +++ b/configure.in @@ -33,6 +33,10 @@ AC_SUBST(LIBGTOP_BINARY_AGE) AC_SUBST(LIBGTOP_SERVER_VERSION) AC_SUBST(LIBGTOP_VERSION) AC_SUBST(LIBGTOP_VERSION_CODE) +AC_SUBST(LIBGTOP_VERSION_SUFFIX) + +AC_SUBST(LIBGTOP_PACKAGE) +AC_DEFINE_UNQUOTED(LIBGTOP_PACKAGE, "$LIBGTOP_PACKAGE") # libtool versioning LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION diff --git a/include/glibtop/global.h b/include/glibtop/global.h index 998cf3f6..e26c7796 100644 --- a/include/glibtop/global.h +++ b/include/glibtop/global.h @@ -129,7 +129,7 @@ BEGIN_LIBGTOP_DECLS #ifndef _ -#define _(String) dgettext (PACKAGE, String) +#define _(String) dgettext (LIBGTOP_PACKAGE, String) #define N_(String) (String) #endif diff --git a/libgtopConf.sh.in b/libgtopConf.sh.in index 08e850e3..9dd4f242 100644 --- a/libgtopConf.sh.in +++ b/libgtopConf.sh.in @@ -29,6 +29,8 @@ LIBGTOP_VERSION_CODE="@LIBGTOP_VERSION_CODE@" MODULE_VERSION="libgtop-@LIBGTOP_VERSION@" +LIBGTOP_PACKAGE="@LIBGTOP_PACKAGE@" + LIBGTOP_SERVER_VERSION="@LIBGTOP_SERVER_VERSION@" libgtop_sysdeps_dir="@libgtop_sysdeps_dir@" diff --git a/po/.cvsignore b/po/.cvsignore index 4d39fec6..961459e8 100644 --- a/po/.cvsignore +++ b/po/.cvsignore @@ -3,5 +3,5 @@ Makefile.in POTFILES cat-id-tbl.c *.gmo *.mo -libgtop.pot +libgtop-1.1.pot Makefile.in.in diff --git a/po/Makefile.in.in.in b/po/Makefile.in.in.in new file mode 100644 index 00000000..354d7595 --- /dev/null +++ b/po/Makefile.in.in.in @@ -0,0 +1,248 @@ +# Makefile for program source directory in GNU NLS utilities package. +# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper +# +# 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. + +PACKAGE = @LIBGTOP_PACKAGE@ +VERSION = @VERSION@ + +SHELL = /bin/sh +@SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +datadir = $(prefix)/@DATADIRNAME@ +localedir = $(datadir)/locale +gnulocaledir = $(prefix)/share/locale +gettextsrcdir = $(prefix)/share/gettext/po +subdir = po + +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@ + +CC = @CC@ +GENCAT = @GENCAT@ +GMSGFMT = PATH=../src:$$PATH @GMSGFMT@ +MSGFMT = @MSGFMT@ +XGETTEXT = PATH=../src:$$PATH @XGETTEXT@ +MSGMERGE = PATH=../src:$$PATH msgmerge + +DEFS = @DEFS@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ + +INCLUDES = -I.. -I$(top_srcdir)/intl + +COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) + +SOURCES = cat-id-tbl.c +POFILES = @POFILES@ +GMOFILES = @GMOFILES@ +DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \ +stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES) + +POTFILES = \ + +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +INSTOBJEXT = @INSTOBJEXT@ + +.SUFFIXES: +.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat + +.c.o: + $(COMPILE) $< + +.po.pox: + $(MAKE) $(PACKAGE).pot + $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox + +.po.mo: + $(MSGFMT) -o $@ $< + +.po.gmo: + file=$(srcdir)/`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: cat-id-tbl.c $(CATALOGS) +all-no: + +$(srcdir)/$(PACKAGE).pot: $(POTFILES) + $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ + --add-comments --keyword=_ --keyword=N_ \ + --files-from=$(srcdir)/POTFILES.in \ + && test ! -f $(PACKAGE).po \ + || ( rm -f $(srcdir)/$(PACKAGE).pot \ + && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot ) + +$(srcdir)/cat-id-tbl.c: stamp-cat-id; @: +$(srcdir)/stamp-cat-id: $(PACKAGE).pot + rm -f cat-id-tbl.tmp + sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \ + | sed -e "s/@PACKAGE NAME@/$(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-exec: +install-data: install-data-@USE_NLS@ +install-data-no: all +install-data-yes: all + if test -r "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $(datadir); \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(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/$$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/$(PACKAGE)$(INSTOBJEXT); \ + echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \ + else \ + $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ + echo "installing $(srcdir)/$$cat as" \ + "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ + fi; \ + if test -r $$cat.m; then \ + $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ + else \ + if test -r $(srcdir)/$$cat.m ; then \ + $(INSTALL_DATA) $(srcdir)/$$cat.m \ + $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $(srcdir)/$$cat as" \ + "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ + else \ + true; \ + fi; \ + fi; \ + done + if test "$(PACKAGE)" = "gettext"; then \ + if test -r "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $(gettextsrcdir); \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \ + fi; \ + $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ + $(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 $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ + rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \ + rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ + rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \ + done + rm -f $(gettextsrcdir)/po-Makefile.in.in + +check: all + +cat-id-tbl.o: ../intl/libgettext.h + +dvi info tags TAGS ID: + +mostlyclean: + rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp + rm -fr *.o + +clean: mostlyclean + +distclean: clean + rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m + +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 $(GMOFILES) + +distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) +dist distdir: update-po $(DISTFILES) + dists="$(DISTFILES)"; \ + for file in $$dists; do \ + ln $(srcdir)/$$file $(distdir) 2> /dev/null \ + || cp -p $(srcdir)/$$file $(distdir); \ + done + +update-po: Makefile + $(MAKE) $(PACKAGE).pot + PATH=`pwd`/../src:$$PATH; \ + 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; then \ + rm -f $$lang.old.po; \ + else \ + echo "msgmerge for $$cat failed!"; \ + rm -f $$lang.po; \ + mv $$lang.old.po $$lang.po; \ + fi; \ + done + +POTFILES: POTFILES.in + ( if test 'x$(srcdir)' != 'x.'; then \ + posrcprefix='$(top_srcdir)/'; \ + else \ + posrcprefix="../"; \ + fi; \ + rm -f $@-t $@ \ + && (sed -e '/^#/d' -e '/^[ ]*$$/d' \ + -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ + | sed -e '$$s/\\$$//') > $@-t \ + && chmod a-w $@-t \ + && mv $@-t $@ ) + +Makefile: Makefile.in.in ../config.status POTFILES + cd .. \ + && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ + $(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: