From 0b18d62ab111589d42e250872b089839597c3732 Mon Sep 17 00:00:00 2001 From: wdlkmpx Date: Wed, 16 Jun 2021 22:17:09 -0500 Subject: [PATCH] add po/Makefile.in.in avoid these 2 obscure macros in configure.ac: - IT_PROG_INTLTOOL - AM_GLIB_GNU_GETTEXT --- .gitignore | 1 - autogen.sh | 10 --- configure.ac | 6 -- po/Makefile.in.in | 198 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 198 insertions(+), 17 deletions(-) create mode 100644 po/Makefile.in.in diff --git a/.gitignore b/.gitignore index 6620f4c..9ca4ee2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ *.so *.o ar-lib -po/Makefile.in.in po/POTFILES po/*.gmo stamp-it diff --git a/autogen.sh b/autogen.sh index 09c84b5..001c45b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -40,16 +40,6 @@ $AUTOHEADER ${verbose} --force || exit 1 # Generate Makefile.in's $AUTOMAKE ${verbose} --add-missing --copy --force || exit 1 -if grep "IT_PROG_INTLTOOL" configure.ac >/dev/null ; then - intltoolize ${verbose2} -c --automake --force || exit 1 - # po/Makefile.in.in has these lines: - # mostlyclean: - # rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp - # prevent $(GETTEXT_PACKAGE).pot from being deleted by `make clean` - sed 's/pox \$(GETTEXT_PACKAGE).pot/pox/' po/Makefile.in.in > po/Makefile.in.inx - mv -f po/Makefile.in.inx po/Makefile.in.in -fi - # generate configure $AUTOCONF ${verbose} --force || exit 1 diff --git a/configure.ac b/configure.ac index 92aad05..0039c72 100644 --- a/configure.ac +++ b/configure.ac @@ -9,14 +9,10 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_HEADER(config.h) AM_GNU_GETTEXT([external]) -m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) m4_ifdef([AM_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) LT_INIT -# Init intltool -IT_PROG_INTLTOOL - # Checks for programs. AC_PROG_CC AC_CHECK_HEADERS([sys/param.h signal.h]) @@ -66,8 +62,6 @@ GETTEXT_PACKAGE=gtkballs AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) -AM_GLIB_GNU_GETTEXT - case "$CC" in gcc*) CPPFLAGS="$CPPFLAGS -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers" ;; *) ;; diff --git a/po/Makefile.in.in b/po/Makefile.in.in new file mode 100644 index 0000000..1f4ab37 --- /dev/null +++ b/po/Makefile.in.in @@ -0,0 +1,198 @@ +# 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. +# +# - Modified by Owen Taylor to use GETTEXT_PACKAGE +# instead of PACKAGE and to look for po2tbl in ./ not in intl/ +# +# - Modified by jacob berkman to install +# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize + +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ + +SHELL = @SHELL@ +@SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +datarootdir = @datarootdir@ +datadir = @datadir@ +localedir = @localedir@ +subdir = po + +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ + +CC = @CC@ +GENCAT = gencat +GMSGFMT = @GMSGFMT@ +MSGFMT = @MSGFMT@ +#MSGFMT_OPTS = -c +XGETTEXT = @XGETTEXT@ +MSGMERGE = msgmerge + +POFILES = @POFILES@ +GMOFILES = @GMOFILES@ +DISTFILES = LINGUAS Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot $(POFILES) $(GMOFILES) + +POTFILES = \ + +CATALOGS = @CATALOGS@ + +.SUFFIXES: +.SUFFIXES: .po .pox .gmo .mo .msg .cat + +.po.pox: + $(MAKE) $(GETTEXT_PACKAGE).pot + $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox + +.po.mo: + $(MSGFMT) -o $@ $< + +.po.gmo: + $(AM_V_GEN) file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ + && rm -f $$file && $(GMSGFMT) $(MSGFMT_OPTS) -o $$file $< + +.po.cat: + sed -f ../intl/po2msg.sed < $< > $*.msg \ + && rm -f $@ && $(GENCAT) $@ $*.msg + + +all: all-@USE_NLS@ + +all-yes: $(CATALOGS) +all-no: + +$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) + $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) \ + --add-comments --keyword=_ --keyword=N_ \ + --keyword=C_:1c,2 \ + --keyword=NC_:1c,2 \ + --keyword=g_dcgettext:2 \ + --keyword=g_dngettext:2,3 \ + --keyword=g_dpgettext2:2c,3 \ + --flag=N_:1:pass-c-format \ + --flag=C_:2:pass-c-format \ + --flag=NC_:2:pass-c-format \ + --flag=g_dngettext:2:pass-c-format \ + --flag=g_strdup_printf:1:c-format \ + --flag=g_string_printf:2:c-format \ + --flag=g_string_append_printf:2:c-format \ + --flag=g_error_new:3:c-format \ + --flag=g_set_error:4:c-format \ + --flag=g_markup_printf_escaped:1:c-format \ + --flag=g_log:3:c-format \ + --flag=g_print:1:c-format \ + --flag=g_printerr:1:c-format \ + --flag=g_printf:1:c-format \ + --flag=g_fprintf:2:c-format \ + --flag=g_sprintf:2:c-format \ + --flag=g_snprintf:3:c-format \ + --flag=g_scanner_error:2:c-format \ + --flag=g_scanner_warn:2:c-format \ + $(POTFILES) \ + && test ! -f $(GETTEXT_PACKAGE).po \ + || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \ + && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot ) + +install: install-exec install-data +install-exec: +install-data: install-data-@USE_NLS@ +install-data-no: all +install-data-yes: all + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + destdir=$(localedir); \ + lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + 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 + +uninstall: + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + done + +check: all + +dvi info ctags tags CTAGS TAGS ID: + +mostlyclean: + rm -f core core.* *.pox *.old.po cat-id-tbl.tmp + +clean: mostlyclean + +distclean: clean + rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m $(GMOFILES) + +update-po: Makefile + rm -f $(GETTEXT_PACKAGE).pot + $(MAKE) $(GETTEXT_PACKAGE).pot + tmpdir=`pwd`; \ + cd $(srcdir); \ + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + printf " %s " "$$lang"; \ + if $(MSGMERGE) $$lang.po $(GETTEXT_PACKAGE).pot -o $$tmpdir/$$lang.new.po; then \ + if cmp $$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 + +# POTFILES.in: ./autogen.sh linguas +POTFILES: + cp POTFILES.in POTFILES + +Makefile: Makefile.in.in ../config.status POTFILES + cd .. \ + && $(SHELL) ./config.status $(subdir)/$@.in