merge libXpm 3.5.7

1 files changed, 16 insertions, 21 deletions

diff --git a/lib/libXpm/sxpm/Makefile.in b/lib/libXpm/sxpm/Makefile.in
index 12669baa2..4684a7748 100644
--- a/lib/libXpm/sxpm/Makefile.in
+++ b/lib/libXpm/sxpm/Makefile.in
@@ -38,10 +38,12 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @BUILD_SXPM_TRUE@bin_PROGRAMS = sxpm$(EXEEXT)
+@BUILD_SXPM_TRUE@@USE_GETTEXT_TRUE@am__append_1 = sxpm.po
 subdir = sxpm
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(install_sh) -d
@@ -51,7 +53,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am__sxpm_SOURCES_DIST = sxpm.c
-@BUILD_SXPM_TRUE@am_sxpm_OBJECTS = sxpm-sxpm.$(OBJEXT)
+@BUILD_SXPM_TRUE@am_sxpm_OBJECTS = sxpm.$(OBJEXT)
 sxpm_OBJECTS = $(am_sxpm_OBJECTS)
 am__DEPENDENCIES_1 =
 @BUILD_SXPM_TRUE@sxpm_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -77,7 +79,7 @@ am__vpath_adj = case $$p in \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 appmanDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(appman_DATA)
+DATA = $(appman_DATA) $(noinst_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -131,6 +133,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LN_S = @LN_S@
+LOCALEDIR = @LOCALEDIR@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
@@ -153,6 +156,8 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 SXPM_CFLAGS = @SXPM_CFLAGS@
 SXPM_LIBS = @SXPM_LIBS@
+USE_GETTEXT_FALSE = @USE_GETTEXT_FALSE@
+USE_GETTEXT_TRUE = @USE_GETTEXT_TRUE@
 VERSION = @VERSION@
 XPM_CFLAGS = @XPM_CFLAGS@
 XPM_LIBS = @XPM_LIBS@
@@ -200,8 +205,8 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-@BUILD_SXPM_TRUE@sxpm_CFLAGS = $(SXPM_CFLAGS)
-@BUILD_SXPM_TRUE@INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
+@BUILD_SXPM_TRUE@AM_CFLAGS = $(SXPM_CFLAGS)
+@BUILD_SXPM_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
 @BUILD_SXPM_TRUE@sxpm_SOURCES = sxpm.c
 @BUILD_SXPM_TRUE@sxpm_LDADD = $(XPM_LIBS) $(SXPM_LIBS) $(top_builddir)/src/libXpm.la
 
@@ -209,7 +214,7 @@ target_alias = @target_alias@
 @BUILD_SXPM_TRUE@appmandir = $(APP_MAN_DIR)
 @BUILD_SXPM_TRUE@appman_PRE = sxpm.man
 @BUILD_SXPM_TRUE@appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-@BUILD_SXPM_TRUE@CLEANFILES = $(appman_DATA)
+@BUILD_SXPM_TRUE@CLEANFILES = $(appman_DATA) $(am__append_1)
 @BUILD_SXPM_TRUE@SED = sed
 
 # Strings to replace in man pages
@@ -229,6 +234,7 @@ target_alias = @target_alias@
 @BUILD_SXPM_TRUE@	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' 
 
 @BUILD_SXPM_TRUE@SUFFIXES = .$(APP_MAN_SUFFIX) .man
+@BUILD_SXPM_TRUE@@USE_GETTEXT_TRUE@noinst_DATA = sxpm.po
 EXTRA_DIST = \
 	plaid_ext.xpm \
 	plaid_mask.xpm \
@@ -306,7 +312,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sxpm-sxpm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sxpm.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -329,20 +335,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-sxpm-sxpm.o: sxpm.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sxpm_CFLAGS) $(CFLAGS) -MT sxpm-sxpm.o -MD -MP -MF "$(DEPDIR)/sxpm-sxpm.Tpo" -c -o sxpm-sxpm.o `test -f 'sxpm.c' || echo '$(srcdir)/'`sxpm.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/sxpm-sxpm.Tpo" "$(DEPDIR)/sxpm-sxpm.Po"; else rm -f "$(DEPDIR)/sxpm-sxpm.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sxpm.c' object='sxpm-sxpm.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sxpm_CFLAGS) $(CFLAGS) -c -o sxpm-sxpm.o `test -f 'sxpm.c' || echo '$(srcdir)/'`sxpm.c
-
-sxpm-sxpm.obj: sxpm.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sxpm_CFLAGS) $(CFLAGS) -MT sxpm-sxpm.obj -MD -MP -MF "$(DEPDIR)/sxpm-sxpm.Tpo" -c -o sxpm-sxpm.obj `if test -f 'sxpm.c'; then $(CYGPATH_W) 'sxpm.c'; else $(CYGPATH_W) '$(srcdir)/sxpm.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/sxpm-sxpm.Tpo" "$(DEPDIR)/sxpm-sxpm.Po"; else rm -f "$(DEPDIR)/sxpm-sxpm.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sxpm.c' object='sxpm-sxpm.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sxpm_CFLAGS) $(CFLAGS) -c -o sxpm-sxpm.obj `if test -f 'sxpm.c'; then $(CYGPATH_W) 'sxpm.c'; else $(CYGPATH_W) '$(srcdir)/sxpm.c'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -544,6 +536,9 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
 
 @BUILD_SXPM_TRUE@.man.$(APP_MAN_SUFFIX):
 @BUILD_SXPM_TRUE@	sed $(MAN_SUBSTS) < $< > $@
+
+@BUILD_SXPM_TRUE@@USE_GETTEXT_TRUE@sxpm.po: $(sxpm_SOURCES:%=$(srcdir)/%)
+@BUILD_SXPM_TRUE@@USE_GETTEXT_TRUE@	xgettext -c"L10N_Comments" -d sxpm -n $(sxpm_SOURCES:%=$(srcdir)/%)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: