diff --git a/Makefile.am b/Makefile.amindex a8a74e2..a3890f7 100644--- a/Makefile.am+++ b/Makefile.am@@ -1,8 +1,7 @@ # Daniel Stone disowns all copyright on this file; no warranty is given as to its # suitability or otherwise.-SUBDIRS = intl po src sxpm cxpm-ACLOCAL_AMFLAGS = -I m4 --install+SUBDIRS = src sxpm cxpm pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xpm.pcdiff --git a/configure.ac b/configure.acindex 3f920c6..2f56e4d 100644--- a/configure.ac+++ b/configure.ac@@ -1,17 +1,14 @@ # $Id$-AC_PREREQ([2.57])+AC_PREREQ(2.57) AC_INIT([libXpm], 3.5.7, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXpm) AC_CONFIG_SRCDIR([Makefile.am])-AC_CONFIG_HEADER([config.h])-AM_INIT_AUTOMAKE([-Wall -Werror dist-bzip2 no-dist-gzip])--AC_GNU_SOURCE-AM_GNU_GETTEXT-AM_GNU_GETTEXT_VERSION([0.16])+AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE+AM_CONFIG_HEADER([config.h])+ # Checks for programs. AC_PROG_LIBTOOL AC_PROG_CC@@ -73,5 +70,8 @@ AM_CONDITIONAL(BUILD_SXPM, test x$build_sxpm = xtrue) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION-AC_CONFIG_FILES([Makefile src/Makefile sxpm/Makefile cxpm/Makefile])-AC_OUTPUT([intl/Makefile po/Makefile.in xpm.pc])+AC_OUTPUT([Makefile+ src/Makefile+ sxpm/Makefile+ cxpm/Makefile+ xpm.pc])diff --git a/cxpm/Makefile.am b/cxpm/Makefile.amindex 408bd4e..097a640 100644--- a/cxpm/Makefile.am+++ b/cxpm/Makefile.am@@ -1,12 +1,9 @@ bin_PROGRAMS = cxpm-AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include/X11 \- -DLOCALEDIR=\"$(localedir)\" -I../intl -I$(top_srcdir)/intl-+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include/X11 AM_CFLAGS = $(XPM_CFLAGS) cxpm_SOURCES = cxpm.c-cxpm_LDADD = $(LIBINTL) # Man page appmandir = $(APP_MAN_DIR)diff --git a/cxpm/cxpm.c b/cxpm/cxpm.cindex 1adb0c0..3b5e603 100644--- a/cxpm/cxpm.c+++ b/cxpm/cxpm.c@@ -50,15 +50,15 @@ #define Getc sGetc #define Ungetc sUngetc-/* forward declarations */-void ErrorMessage (int ErrorStatus, xpmData *data); /* * special getc and ungetc counting read lines and characters * note that 's' could stand both for "special" and "slow" ;-) */ static int-sGetc (xpmData *data, FILE *file)+sGetc(data, file)+ xpmData *data;+ FILE *file; { int c = getc(data->stream.file); if (c == '\n') {@@ -71,7 +71,10 @@ sGetc (xpmData *data, FILE *file) } static void-sUngetc (xpmData *data, int c, FILE *file)+sUngetc(data, c, file)+ xpmData *data;+ int c;+ FILE *file; { ungetc(c, data->stream.file); if (c == '\n') {@@ -92,7 +95,10 @@ sUngetc (xpmData *data, int c, FILE *file) #include "Image.c" void-ErrorMessage (int ErrorStatus, xpmData *data)+ErrorMessage(+ int ErrorStatus,+ xpmData *data)+ { char *error = NULL;@@ -137,7 +143,9 @@ ErrorMessage (int ErrorStatus, xpmData *data) } int-main (int argc, char **argv)+main(argc, argv)+ int argc;+ char **argv; { XpmImage image; char *filename;diff --git a/po/LINGUAS b/po/LINGUASdeleted file mode 100644index e69de29..0000000diff --git a/po/Makefile.in.in b/po/Makefile.in.indeleted file mode 100644index 5022b8b..0000000--- a/po/Makefile.in.in+++ /dev/null@@ -1,403 +0,0 @@-# Makefile for PO directory in any package using GNU gettext.-# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper@gnu.ai.mit.edu>-#-# This file can be copied and used freely without restrictions. It can-# be used in projects which are not available under the GNU General Public-# License but which still want to provide support for the GNU gettext-# functionality.-# Please note that the actual code of GNU gettext is covered by the GNU-# General Public License and is *not* in the public domain.-#-# Origin: gettext-0.16--PACKAGE = @PACKAGE@-VERSION = @VERSION@-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@--SHELL = /bin/sh-@SET_MAKE@--srcdir = @srcdir@-top_srcdir = @top_srcdir@-VPATH = @srcdir@--prefix = @prefix@-exec_prefix = @exec_prefix@-datarootdir = @datarootdir@-datadir = @datadir@-localedir = @localedir@-gettextsrcdir = $(datadir)/gettext/po--INSTALL = @INSTALL@-INSTALL_DATA = @INSTALL_DATA@--# We use $(mkdir_p).-# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as-# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,-# @install_sh@ does not start with $(SHELL), so we add it.-# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined-# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake-# versions, $(mkinstalldirs) and $(install_sh) are unused.-mkinstalldirs = $(SHELL) @install_sh@ -d-install_sh = $(SHELL) @install_sh@-MKDIR_P = @MKDIR_P@-mkdir_p = @mkdir_p@--GMSGFMT_ = @GMSGFMT@-GMSGFMT_no = @GMSGFMT@-GMSGFMT_yes = @GMSGFMT_015@-GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))-MSGFMT_ = @MSGFMT@-MSGFMT_no = @MSGFMT@-MSGFMT_yes = @MSGFMT_015@-MSGFMT = $(MSGFMT_$(USE_MSGCTXT))-XGETTEXT_ = @XGETTEXT@-XGETTEXT_no = @XGETTEXT@-XGETTEXT_yes = @XGETTEXT_015@-XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))-MSGMERGE = msgmerge-MSGMERGE_UPDATE = @MSGMERGE@ --update-MSGINIT = msginit-MSGCONV = msgconv-MSGFILTER = msgfilter--POFILES = @POFILES@-GMOFILES = @GMOFILES@-UPDATEPOFILES = @UPDATEPOFILES@-DUMMYPOFILES = @DUMMYPOFILES@-DISTFILES.common = Makefile.in.in remove-potcdate.sin \-$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)-DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \-$(POFILES) $(GMOFILES) \-$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)--POTFILES = \--CATALOGS = @CATALOGS@--# Makevars gets inserted here. (Don't remove this line!)--.SUFFIXES:-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update--.po.mo:- @echo "$(MSGFMT) -c -o $@ $<"; \- $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@--.po.gmo:- @lang=`echo $* | sed -e 's,.*/,,'`; \- test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \- echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \- cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo--.sin.sed:- sed -e '/^#/d' $< > t-$@- mv t-$@ $@---all: all-@USE_NLS@--all-yes: stamp-po-all-no:--# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no-# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because-# we don't want to bother translators with empty POT files). We assume that-# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.-# In this case, stamp-po is a nop (i.e. a phony target).--# stamp-po is a timestamp denoting the last time at which the CATALOGS have-# been loosely updated. Its purpose is that when a developer or translator-# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,-# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent-# invocations of "make" will do nothing. This timestamp would not be necessary-# if updating the $(CATALOGS) would always touch them; however, the rule for-# $(POFILES) has been designed to not touch files that don't need to be-# changed.-stamp-po: $(srcdir)/$(DOMAIN).pot- test ! -f $(srcdir)/$(DOMAIN).pot || \- test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)- @test ! -f $(srcdir)/$(DOMAIN).pot || { \- echo "touch stamp-po" && \- echo timestamp > stamp-poT && \- mv stamp-poT stamp-po; \- }--# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',-# otherwise packages like GCC can not be built if only parts of the source-# have been downloaded.--# This target rebuilds $(DOMAIN).pot; it is an expensive operation.-# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.-$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed- if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \- msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \- else \- msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \- fi; \- $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \- --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \- --files-from=$(srcdir)/POTFILES.in \- --copyright-holder='$(COPYRIGHT_HOLDER)' \- --msgid-bugs-address="$$msgid_bugs_address"- test ! -f $(DOMAIN).po || { \- if test -f $(srcdir)/$(DOMAIN).pot; then \- sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \- sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \- if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \- rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \- else \- rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \- mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \- fi; \- else \- mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \- fi; \- }--# This rule has no dependencies: we don't need to update $(DOMAIN).pot at-# every "make" invocation, only create it when it is missing.-# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.-$(srcdir)/$(DOMAIN).pot:- $(MAKE) $(DOMAIN).pot-update--# This target rebuilds a PO file if $(DOMAIN).pot has changed.-# Note that a PO file is not touched if it doesn't need to be changed.-$(POFILES): $(srcdir)/$(DOMAIN).pot- @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \- if test -f "$(srcdir)/$${lang}.po"; then \- test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \- echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \- cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \- else \- $(MAKE) $${lang}.po-create; \- fi---install: install-exec install-data-install-exec:-install-data: install-data-@USE_NLS@- if test "$(PACKAGE)" = "gettext-tools"; then \- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \- for file in $(DISTFILES.common) Makevars.template; do \- $(INSTALL_DATA) $(srcdir)/$$file \- $(DESTDIR)$(gettextsrcdir)/$$file; \- done; \- for file in Makevars; do \- rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \- done; \- else \- : ; \- fi-install-data-no: all-install-data-yes: all- $(mkdir_p) $(DESTDIR)$(datadir)- @catalogs='$(CATALOGS)'; \- for cat in $$catalogs; do \- cat=`basename $$cat`; \- lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \- dir=$(localedir)/$$lang/LC_MESSAGES; \- $(mkdir_p) $(DESTDIR)$$dir; \- if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \- $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \- echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \- for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \- if test -n "$$lc"; then \- if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \- link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \- mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \- mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \- (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \- for file in *; do \- if test -f $$file; then \- ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \- fi; \- done); \- rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \- else \- if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \- :; \- else \- rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \- mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \- fi; \- fi; \- rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \- ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \- ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \- cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \- echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \- fi; \- done; \- done--install-strip: install--installdirs: installdirs-exec installdirs-data-installdirs-exec:-installdirs-data: installdirs-data-@USE_NLS@- if test "$(PACKAGE)" = "gettext-tools"; then \- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \- else \- : ; \- fi-installdirs-data-no:-installdirs-data-yes:- $(mkdir_p) $(DESTDIR)$(datadir)- @catalogs='$(CATALOGS)'; \- for cat in $$catalogs; do \- cat=`basename $$cat`; \- lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \- dir=$(localedir)/$$lang/LC_MESSAGES; \- $(mkdir_p) $(DESTDIR)$$dir; \- for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \- if test -n "$$lc"; then \- if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \- link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \- mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \- mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \- (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \- for file in *; do \- if test -f $$file; then \- ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \- fi; \- done); \- rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \- else \- if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \- :; \- else \- rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \- mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \- fi; \- fi; \- fi; \- done; \- done--# Define this as empty until I found a useful application.-installcheck:--uninstall: uninstall-exec uninstall-data-uninstall-exec:-uninstall-data: uninstall-data-@USE_NLS@- if test "$(PACKAGE)" = "gettext-tools"; then \- for file in $(DISTFILES.common) Makevars.template; do \- rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \- done; \- else \- : ; \- fi-uninstall-data-no:-uninstall-data-yes:- catalogs='$(CATALOGS)'; \- for cat in $$catalogs; do \- cat=`basename $$cat`; \- lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \- for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \- rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \- done; \- done--check: all--info dvi ps pdf html tags TAGS ctags CTAGS ID:--mostlyclean:- rm -f remove-potcdate.sed- rm -f stamp-poT- rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po- rm -fr *.o--clean: mostlyclean--distclean: clean- rm -f Makefile Makefile.in POTFILES *.mo--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 stamp-po $(GMOFILES)--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)-dist distdir:- $(MAKE) update-po- @$(MAKE) dist2-# This is a separate target because 'update-po' must be executed before.-dist2: stamp-po $(DISTFILES)- dists="$(DISTFILES)"; \- if test "$(PACKAGE)" = "gettext-tools"; then \- dists="$$dists Makevars.template"; \- fi; \- if test -f $(srcdir)/$(DOMAIN).pot; then \- dists="$$dists $(DOMAIN).pot stamp-po"; \- fi; \- if test -f $(srcdir)/ChangeLog; then \- dists="$$dists ChangeLog"; \- fi; \- for i in 0 1 2 3 4 5 6 7 8 9; do \- if test -f $(srcdir)/ChangeLog.$$i; then \- dists="$$dists ChangeLog.$$i"; \- fi; \- done; \- if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \- for file in $$dists; do \- if test -f $$file; then \- cp -p $$file $(distdir) || exit 1; \- else \- cp -p $(srcdir)/$$file $(distdir) || exit 1; \- fi; \- done--update-po: Makefile- $(MAKE) $(DOMAIN).pot-update- test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)- $(MAKE) update-gmo--# General rule for creating PO files.--.nop.po-create:- @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \- echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \- exit 1--# General rule for updating PO files.--.nop.po-update:- @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \- if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \- tmpdir=`pwd`; \- echo "$$lang:"; \- test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \- echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \- cd $(srcdir); \- if $(MSGMERGE) $$lang.po $(DOMAIN).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; \- exit 1; \- fi; \- fi; \- else \- echo "msgmerge for $$lang.po failed!" 1>&2; \- rm -f $$tmpdir/$$lang.new.po; \- fi--$(DUMMYPOFILES):--update-gmo: Makefile $(GMOFILES)- @:--Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@- cd $(top_builddir) \- && $(SHELL) ./config.status $(subdir)/$@.in po-directories--force:--# 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:diff --git a/po/Makevars b/po/Makevarsdeleted file mode 100644index 32692ab..0000000--- a/po/Makevars+++ /dev/null@@ -1,41 +0,0 @@-# Makefile variables for PO directory in any package using GNU gettext.--# Usually the message domain is the same as the package name.-DOMAIN = $(PACKAGE)--# These two variables depend on the location of this directory.-subdir = po-top_builddir = ..--# These options get passed to xgettext.-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_--# This is the copyright holder that gets inserted into the header of the-# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding-# package. (Note that the msgstr strings, extracted from the package's-# sources, belong to the copyright holder of the package.) Translators are-# expected to transfer the copyright for their translations to this person-# or entity, or to disclaim their copyright. The empty string stands for-# the public domain; in this case the translators are expected to disclaim-# their copyright.-COPYRIGHT_HOLDER = Free Software Foundation, Inc.--# This is the email address or URL to which the translators shall report-# bugs in the untranslated strings:-# - Strings which are not entire sentences, see the maintainer guidelines-# in the GNU gettext documentation, section 'Preparing Strings'.-# - Strings which use unclear terms or require additional context to be-# understood.-# - Strings which make invalid assumptions about notation of date, time or-# money.-# - Pluralisation problems.-# - Incorrect English spelling.-# - Incorrect formatting.-# It can be your email address, or a mailing list address where translators-# can write to without being subscribed, or the URL of a web page through-# which the translators can contact you.-MSGID_BUGS_ADDRESS =--# This is the list of locale categories, beyond LC_MESSAGES, for which the-# message catalogs shall be used. It is usually empty.-EXTRA_LOCALE_CATEGORIES =diff --git a/po/Makevars.template b/po/Makevars.templatedeleted file mode 100644index 32692ab..0000000--- a/po/Makevars.template+++ /dev/null@@ -1,41 +0,0 @@-# Makefile variables for PO directory in any package using GNU gettext.--# Usually the message domain is the same as the package name.-DOMAIN = $(PACKAGE)--# These two variables depend on the location of this directory.-subdir = po-top_builddir = ..--# These options get passed to xgettext.-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_--# This is the copyright holder that gets inserted into the header of the-# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding-# package. (Note that the msgstr strings, extracted from the package's-# sources, belong to the copyright holder of the package.) Translators are-# expected to transfer the copyright for their translations to this person-# or entity, or to disclaim their copyright. The empty string stands for-# the public domain; in this case the translators are expected to disclaim-# their copyright.-COPYRIGHT_HOLDER = Free Software Foundation, Inc.--# This is the email address or URL to which the translators shall report-# bugs in the untranslated strings:-# - Strings which are not entire sentences, see the maintainer guidelines-# in the GNU gettext documentation, section 'Preparing Strings'.-# - Strings which use unclear terms or require additional context to be-# understood.-# - Strings which make invalid assumptions about notation of date, time or-# money.-# - Pluralisation problems.-# - Incorrect English spelling.-# - Incorrect formatting.-# It can be your email address, or a mailing list address where translators-# can write to without being subscribed, or the URL of a web page through-# which the translators can contact you.-MSGID_BUGS_ADDRESS =--# This is the list of locale categories, beyond LC_MESSAGES, for which the-# message catalogs shall be used. It is usually empty.-EXTRA_LOCALE_CATEGORIES =diff --git a/po/POTFILES.in b/po/POTFILES.indeleted file mode 100644index 3fa7632..0000000--- a/po/POTFILES.in+++ /dev/null@@ -1,36 +0,0 @@-src/amigax.c-src/amigax.h-src/Attrib.c-src/CrBufFrI.c-src/CrBufFrP.c-src/CrDatFrI.c-src/CrDatFrP.c-src/create.c-src/CrIFrBuf.c-src/CrIFrDat.c-src/CrIFrP.c-src/CrPFrBuf.c-src/CrPFrDat.c-src/CrPFrI.c-src/data.c-src/hashtab.c-src/Image.c-src/Info.c-src/misc.c-src/parse.c-src/RdFToBuf.c-src/RdFToDat.c-src/RdFToI.c-src/RdFToP.c-src/rgb.c-src/rgbtab.h-src/scan.c-src/simx.c-src/simx.h-src/WrFFrBuf.c-src/WrFFrDat.c-src/WrFFrI.c-src/WrFFrP.c-src/XpmI.h-cxpm/cxpm.c-sxpm/sxpm.cdiff --git a/po/Rules-quot b/po/Rules-quotdeleted file mode 100644index 9c2a995..0000000--- a/po/Rules-quot+++ /dev/null@@ -1,47 +0,0 @@-# Special Makefile rules for English message catalogs with quotation marks.--DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot--.SUFFIXES: .insert-header .po-update-en--en@quot.po-create:- $(MAKE) en@quot.po-update-en@boldquot.po-create:- $(MAKE) en@boldquot.po-update--en@quot.po-update: en@quot.po-update-en-en@boldquot.po-update: en@boldquot.po-update-en--.insert-header.po-update-en:- @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \- if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \- tmpdir=`pwd`; \- echo "$$lang:"; \- ll=`echo $$lang | sed -e 's/@.*//'`; \- LC_ALL=C; export LC_ALL; \- cd $(srcdir); \- if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$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 "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \- exit 1; \- fi; \- fi; \- else \- echo "creation of $$lang.po failed!" 1>&2; \- rm -f $$tmpdir/$$lang.new.po; \- fi--en@quot.insert-header: insert-header.sin- sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header--en@boldquot.insert-header: insert-header.sin- sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header--mostlyclean: mostlyclean-quot-mostlyclean-quot:- rm -f *.insert-headerdiff --git a/po/boldquot.sed b/po/boldquot.seddeleted file mode 100644index 4b937aa..0000000--- a/po/boldquot.sed+++ /dev/null@@ -1,10 +0,0 @@-s/"\([^"]*\)"/\1/g-s/`\([^`']*\)'/\1/g-s/ '\([^`']*\)' / \1 /g-s/ '\([^`']*\)'$/ \1/g-s/^'\([^`']*\)' /\1 /g-s//""/g-s//[1m/g-s//[0m/g-s//[1m/g-s//[0m/gdiff --git a/po/en@boldquot.header b/po/en@boldquot.headerdeleted file mode 100644index fedb6a0..0000000--- a/po/en@boldquot.header+++ /dev/null@@ -1,25 +0,0 @@-# All this catalog "translates" are quotation characters.-# The msgids must be ASCII and therefore cannot contain real quotation-# characters, only substitutes like grave accent (0x60), apostrophe (0x27)-# and double quote (0x22). These substitutes look strange; see-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html-#-# This catalog translates grave accent (0x60) and apostrophe (0x27) to-# left single quotation mark (U+2018) and right single quotation mark (U+2019).-# It also translates pairs of apostrophe (0x27) to-# left single quotation mark (U+2018) and right single quotation mark (U+2019)-# and pairs of quotation mark (0x22) to-# left double quotation mark (U+201C) and right double quotation mark (U+201D).-#-# When output to an UTF-8 terminal, the quotation characters appear perfectly.-# When output to an ISO-8859-1 terminal, the single quotation marks are-# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to-# grave/acute accent (by libiconv), and the double quotation marks are-# transliterated to 0x22.-# When output to an ASCII terminal, the single quotation marks are-# transliterated to apostrophes, and the double quotation marks are-# transliterated to 0x22.-#-# This catalog furthermore displays the text between the quotation marks in-# bold face, assuming the VT100/XTerm escape sequences.-#diff --git a/po/en@quot.header b/po/en@quot.headerdeleted file mode 100644index a9647fc..0000000--- a/po/en@quot.header+++ /dev/null@@ -1,22 +0,0 @@-# All this catalog "translates" are quotation characters.-# The msgids must be ASCII and therefore cannot contain real quotation-# characters, only substitutes like grave accent (0x60), apostrophe (0x27)-# and double quote (0x22). These substitutes look strange; see-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html-#-# This catalog translates grave accent (0x60) and apostrophe (0x27) to-# left single quotation mark (U+2018) and right single quotation mark (U+2019).-# It also translates pairs of apostrophe (0x27) to-# left single quotation mark (U+2018) and right single quotation mark (U+2019)-# and pairs of quotation mark (0x22) to-# left double quotation mark (U+201C) and right double quotation mark (U+201D).-#-# When output to an UTF-8 terminal, the quotation characters appear perfectly.-# When output to an ISO-8859-1 terminal, the single quotation marks are-# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to-# grave/acute accent (by libiconv), and the double quotation marks are-# transliterated to 0x22.-# When output to an ASCII terminal, the single quotation marks are-# transliterated to apostrophes, and the double quotation marks are-# transliterated to 0x22.-#diff --git a/po/insert-header.sin b/po/insert-header.sindeleted file mode 100644index b26de01..0000000--- a/po/insert-header.sin+++ /dev/null@@ -1,23 +0,0 @@-# Sed script that inserts the file called HEADER before the header entry.-#-# At each occurrence of a line starting with "msgid ", we execute the following-# commands. At the first occurrence, insert the file. At the following-# occurrences, do nothing. The distinction between the first and the following-# occurrences is achieved by looking at the hold space.-/^msgid /{-x-# Test if the hold space is empty.-s/m/m/-ta-# Yes it was empty. First occurrence. Read the file.-r HEADER-# Output the file's contents by reading the next line. But don't lose the-# current line while doing this.-g-N-bb-:a-# The hold space was nonempty. Following occurrences. Do nothing.-x-:b-}diff --git a/po/quot.sed b/po/quot.seddeleted file mode 100644index 0122c46..0000000--- a/po/quot.sed+++ /dev/null@@ -1,6 +0,0 @@-s/"\([^"]*\)"/\1/g-s/`\([^`']*\)'/\1/g-s/ '\([^`']*\)' / \1 /g-s/ '\([^`']*\)'$/ \1/g-s/^'\([^`']*\)' /\1 /g-s//""/gdiff --git a/po/remove-potcdate.sin b/po/remove-potcdate.sindeleted file mode 100644index 2436c49..0000000--- a/po/remove-potcdate.sin+++ /dev/null@@ -1,19 +0,0 @@-# Sed script that remove the POT-Creation-Date line in the header entry-# from a POT file.-#-# The distinction between the first and the following occurrences of the-# pattern is achieved by looking at the hold space.-/^"POT-Creation-Date: .*"$/{-x-# Test if the hold space is empty.-s/P/P/-ta-# Yes it was empty. First occurrence. Remove the line.-g-d-bb-:a-# The hold space was nonempty. Following occurrences. Do nothing.-x-:b-}diff --git a/src/Makefile.am b/src/Makefile.amindex fa5e2cf..5dcdf03 100644--- a/src/Makefile.am+++ b/src/Makefile.am@@ -2,13 +2,11 @@ lib_LTLIBRARIES=libXpm.la-AM_CPPFLAGS = -I. -I$(top_srcdir)/include/X11/ \- -DLOCALEDIR=\"$(localedir)\" -I../intl -I$(top_srcdir)/intl-+AM_CPPFLAGS = -I. -I$(top_srcdir)/include/X11/ AM_CFLAGS = $(XPM_CFLAGS) libXpm_la_LDFLAGS = -version-number 4:11:0 -no-undefined-libXpm_la_LIBADD = $(LIBINTL) $(XPM_LIBS)+libXpm_la_LIBADD = $(XPM_LIBS) libXpm_la_SOURCES = \ Attrib.c \diff --git a/src/RdFToI.c b/src/RdFToI.cindex 4ce32e2..60db54a 100644--- a/src/RdFToI.c+++ b/src/RdFToI.c@@ -53,10 +53,6 @@ LFUNC(OpenReadFile, int, (char *filename, xpmData *mdata)); LFUNC(xpmDataClose, void, (xpmData *mdata));-/* forward declarations */-FILE *-xpmPipeThrough (int fd, const char *cmd, const char *arg1, const char *mode);- #ifndef CXPMPROG int XpmReadFileToImage(display, filename,@@ -131,8 +127,12 @@ XpmReadFileToXpmImage(filename, image, info) #ifndef NO_ZPIPE /* Do not depend on errno after read_through */-FILE *-xpmPipeThrough (int fd, const char *cmd, const char *arg1, const char *mode)+FILE*+xpmPipeThrough(fd, cmd, arg1, mode)+ int fd;+ const char* cmd;+ const char* arg1;+ const char* mode; { FILE* fp; int status, fds[2], in = 0, out = 1;diff --git a/sxpm/Makefile.am b/sxpm/Makefile.amindex c4a551d..7780bd8 100644--- a/sxpm/Makefile.am+++ b/sxpm/Makefile.am@@ -4,12 +4,11 @@ bin_PROGRAMS = sxpm AM_CFLAGS = $(SXPM_CFLAGS)-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include \- -DLOCALEDIR=\"$(localedir)\" -I../intl -I$(top_srcdir)/intl+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include sxpm_SOURCES = sxpm.c-sxpm_LDADD = $(LIBINTL) $(XPM_LIBS) $(SXPM_LIBS) $(top_builddir)/src/libXpm.la+sxpm_LDADD = $(XPM_LIBS) $(SXPM_LIBS) $(top_builddir)/src/libXpm.la # Man page appmandir = $(APP_MAN_DIR)diff --git a/sxpm/sxpm.c b/sxpm/sxpm.cindex a067eb2..a43d441 100644--- a/sxpm/sxpm.c+++ b/sxpm/sxpm.c@@ -110,13 +110,10 @@ static char *plaid[] = { #define xrdb XtDatabase(dpy) static Colormap colormap;-/* forward declarations */-void Usage (void);-void ErrorMessage (int ErrorStatus, char *tag);-void Punt (int i);-void VersionInfo (void);-void GetNumbers (int num, int *format_return, int *libmajor_return,- char *libminor_return);+void Usage();+void ErrorMessage();+void Punt();+void VersionInfo(); #ifdef __STDC__ void kinput(Widget widget, char *tag, XEvent *xe, Boolean *b);@@ -142,7 +139,9 @@ static XrmOptionDescRec options[] = { }; int-main (int argc, char **argv)+main(argc, argv)+ int argc;+ char **argv; { int ErrorStatus; unsigned int verbose = 0; /* performs verbose output */@@ -579,7 +578,7 @@ main (int argc, char **argv) } void-Usage (void)+Usage() { /* L10N_Comments : Usage message (sxpm -h) in two parts. In the first part %s is replaced by the command name. */@@ -617,7 +616,9 @@ if no input is specified sxpm reads from standard input.\n\ void-ErrorMessage (int ErrorStatus, char *tag)+ErrorMessage(ErrorStatus, tag)+ int ErrorStatus;+ char *tag; { char *error = NULL; char *warning = NULL;@@ -673,7 +674,8 @@ ErrorMessage (int ErrorStatus, char *tag) } void-Punt (int i)+Punt(i)+ int i; { if (icon.pixmap) { XFreePixmap(dpy, icon.pixmap);@@ -719,8 +721,11 @@ kinput(widget, tag, xe, b) * number (following the rule described in xpm.h). */ void-GetNumbers (int num, int *format_return, int *libmajor_return,- char *libminor_return)+GetNumbers(num, format_return, libmajor_return, libminor_return)+ int num;+ int *format_return;+ int *libmajor_return;+ char *libminor_return; { *format_return = num / 10000; *libmajor_return = (num % 10000) / 100;@@ -728,7 +733,7 @@ GetNumbers (int num, int *format_return, int *libmajor_return, } void-VersionInfo (void)+VersionInfo() { int format, libmajor; char libminor;