appres/ChangeLog | 79 appres/Makefile.am | 15 appres/Makefile.in | 545 +- appres/aclocal.m4 | 1655 ++++-- appres/appres.c | 19 appres/appres.man | 89 appres/autogen.sh | 13 appres/config.guess | 307 - appres/config.sub | 237 appres/configure | 6365 ++++++++++++++++++++++++- appres/configure.ac | 9 appres/depcomp | 530 +- appres/install-sh | 35 appres/man/Makefile.am | 12 appres/man/Makefile.in | 483 + appres/man/appres.man | 91 appres/missing | 461 - debian/changelog | 14 editres/ChangeLog | 63 editres/Makefile.am | 20 editres/Makefile.in | 347 - editres/aclocal.m4 | 1143 +++- editres/actions.c | 2 editres/app-defaults/Editres | 7 editres/app-defaults/Editres-color | 2 editres/autogen.sh | 13 editres/comm.c | 2 editres/config.guess | 233 editres/config.sub | 134 editres/configure | 5878 +++++++++++++++++++++++ editres/configure.ac | 11 editres/depcomp | 74 editres/editres.c | 2 editres/editres.man | 423 - editres/editresP.h | 2 editres/geometry.c | 2 editres/handler.c | 2 editres/install-sh | 29 editres/man/Makefile.am | 12 editres/man/Makefile.in | 426 + editres/man/editres.man | 421 + editres/setvalues.c | 2 editres/svpopup.c | 2 editres/utils.c | 2 editres/widgets.c | 2 editres/wtree.c | 2 viewres/ChangeLog | 63 viewres/Makefile.am | 17 viewres/Makefile.in | 349 - viewres/aclocal.m4 | 1143 +++- viewres/config.guess | 233 viewres/config.sub | 134 viewres/configure | 5878 +++++++++++++++++++++++ viewres/configure.ac | 11 viewres/depcomp | 74 viewres/install-sh | 29 viewres/man/Makefile.am | 12 viewres/man/Makefile.in | 424 + viewres/man/viewres.man | 217 viewres/viewres.man | 216 xev/ChangeLog | 56 xev/Makefile.in | 96 xev/aclocal.m4 | 5376 ++++++++++----------- xev/config.guess | 259 - xev/config.h.in | 32 xev/config.sub | 156 xev/configure | 5143 +++++++++++--------- xev/configure.ac | 3 xev/depcomp | 74 xev/install-sh | 29 xev/man/Makefile.in | 39 xev/man/xev.man | 9 xev/missing | 53 xev/xev.c | 129 xfontsel/ChangeLog | 61 xfontsel/Makefile.in | 450 + xfontsel/aclocal.m4 | 591 +- xfontsel/config.guess | 307 - xfontsel/config.sub | 237 xfontsel/configure | 468 + xfontsel/configure.ac | 2 xfontsel/depcomp | 530 +- xfontsel/install-sh | 35 xfontsel/man/Makefile.in | 131 xfontsel/missing | 461 - xfontsel/xfontsel.c | 56 xmessage/ChangeLog | 135 xmessage/Makefile.am | 34 xmessage/Makefile.in | 369 - xmessage/aclocal.m4 | 1809 +++++-- xmessage/config.guess | 235 xmessage/config.sub | 184 xmessage/configure | 7397 ++++++++++++++++++++++++----- xmessage/configure.ac | 28 xmessage/depcomp | 74 xmessage/install-sh | 29 xmessage/man/Makefile.am | 12 xmessage/man/Makefile.in | 426 + xmessage/man/xmessage.man | 180 xmessage/xmessage.man | 178 xvinfo/ChangeLog | 87 xvinfo/Makefile.am | 15 xvinfo/Makefile.in | 354 - xvinfo/aclocal.m4 | 1143 +++- xvinfo/config.guess | 233 xvinfo/config.sub | 134 xvinfo/configure | 5906 +++++++++++++++++++++++ xvinfo/configure.ac | 17 xvinfo/depcomp | 74 xvinfo/install-sh | 29 xvinfo/man/Makefile.am | 12 xvinfo/man/Makefile.in | 423 + xvinfo/man/xvinfo.man | 33 xvinfo/xvinfo.c | 516 +- xvinfo/xvinfo.man | 30 xwininfo/ChangeLog | 206 xwininfo/Makefile.am | 6 xwininfo/Makefile.in | 443 + xwininfo/aclocal.m4 | 2345 +++++++-- xwininfo/config.guess | 307 - xwininfo/config.h.in | 5 xwininfo/config.rpath | 690 ++ xwininfo/config.sub | 237 xwininfo/configure | 9365 +++++++++++++++++++++++++++++++------ xwininfo/configure.ac | 30 xwininfo/depcomp | 530 +- xwininfo/dsimple.c | 69 xwininfo/dsimple.h | 4 xwininfo/install-sh | 35 xwininfo/man/Makefile.in | 134 xwininfo/missing | 461 - xwininfo/xwininfo.c | 150 132 files changed, 62766 insertions(+), 16147 deletions(-)
New commits: commit 88af4dad56217ee7cfce6cfe840acff41ff5adb3 Author: Robert Hooker <[email protected]> Date: Mon May 20 12:14:44 2013 -0400 Update xwininfo to 1.1.3 diff --git a/debian/changelog b/debian/changelog index dfeecb6..f641795 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ x11-utils (7.7+1) UNRELEASED; urgency=low * xfontsel 1.0.5 * xmessage 1.0.4 * xvinfo 1.1.2 + * xwininfo 1.1.3 -- Robert Hooker <[email protected]> Mon, 20 May 2013 12:01:44 -0400 diff --git a/xwininfo/ChangeLog b/xwininfo/ChangeLog index 797f1a6..1b2abfa 100644 --- a/xwininfo/ChangeLog +++ b/xwininfo/ChangeLog @@ -1,3 +1,209 @@ +commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13 +Author: Alan Coopersmith <[email protected]> +Date: Fri May 17 21:04:26 2013 -0700 + + xwininfo 1.1.3 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 3e60a26559221e561770710a8c4ed0b8ebc31afb +Author: Alan Coopersmith <[email protected]> +Date: Sat Jan 12 13:52:08 2013 -0800 + + Quiet some clang warnings about implicit int <-> size_t conversions + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit f7b55bdf674fc790e879a2e25ef83925dd8379d6 +Author: Pierre-Loup A. Griffais <[email protected]> +Date: Tue Oct 9 20:33:10 2012 -0700 + + xwininfo: report the Visual class of the selected Window + + Not of the root window. + + Signed-off-by: Pierre-Loup A. Griffais <[email protected]> + Signed-off-by: Julien Cristau <[email protected]> + +commit aedc2ecc4de61211f5f6b8f27bd8681d0ab744dc +Author: Alan Coopersmith <[email protected]> +Date: Sat Aug 25 14:05:18 2012 -0700 + + Print more detailed error messages when xcb_connect fails + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Jeremy Huddleston Sequoia <[email protected]> + +commit 4176bffd0261d7734617dc73ae6013e86dbb841d +Author: David Venz <[email protected]> +Date: Sat Aug 25 12:06:22 2012 -0700 + + Bug 53242 - xwininfo segfaults on invalid screen + + Check number of screen entries before iterating past the end of the list + + Reviewed-by: Jeremy Huddleston Sequoia <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 53564df46e7f8e443c46b00080ea46c878c34263 +Author: Thomas Klausner <[email protected]> +Date: Sun Aug 26 00:07:52 2012 +0200 + + Get rid of a number of warnings. + + Signed-off-by: Thomas Klausner <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 1279ed652f9f3408211c78b7bf8a0aef6b8488df +Author: Jeremy Huddleston Sequoia <[email protected]> +Date: Sat Aug 25 12:16:29 2012 -0700 + + Remove dead code (size_t is always >= 0) + + xwininfo.c:1886:15: warning: comparison of unsigned expression < 0 is always false [-Wtautological-compare] + if (inlen < 0) { + ~~~~~ ^ ~ + + Signed-off-by: Jeremy Huddleston Sequoia <[email protected]> + +commit fa40ecdfb5cd068ba531b4439df5bbf660469d3a +Author: Jeremy Huddleston Sequoia <[email protected]> +Date: Sat Aug 25 12:15:02 2012 -0700 + + Declare usage() as _X_NORETURN + + Signed-off-by: Jeremy Huddleston Sequoia <[email protected]> + +commit 5037f79e8f6a36d3c524a2dd8150cf96c31b7106 +Author: Gaetan Nadon <[email protected]> +Date: Wed Jan 25 09:48:54 2012 -0500 + + configure.ac: regroup statements and comment + + Add missing AC_CONFIG_SRCDIR([Makefile.am]) + + Move AC_USE_SYSTEM_EXTENSIONS higher up in Autoconf init section + which must come before XORG_DEFAULT_OPTIONS + + Move XORG_DEFAULT_OPTIONS to its usual place with X.Org macros + Note that AC_FUNC_STRNLEN calls AC_REQUIRE(AC_USE_SYSTEM_EXTENSIONS) + + Comment the strnlen function replacement. + http://pubs.opengroup.org/onlinepubs/9699919799/functions/strlen.html + + No functional changes. Following the layout in + http://www.x.org/wiki/NewModuleGuidelines + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 19a7184f76ee3c17586ad65a8424966dde5b91c3 +Author: Gaetan Nadon <[email protected]> +Date: Fri Jan 20 20:14:05 2012 -0500 + + Revert "make: remove $(LIBOBJS) dead code" + + AC_FUNC_STRLEN is one of the functions that call AC_LIBOBJ + which sets $LIBOBJ. + + This reverts commit 3f3606b0e8de8f38f467126f07277e33a9285e53. + +commit 3f3606b0e8de8f38f467126f07277e33a9285e53 +Author: Gaetan Nadon <[email protected]> +Date: Fri Jan 20 15:10:15 2012 -0500 + + make: remove $(LIBOBJS) dead code + + Starting at Autoconf 2.53, the use of LIBOBJS is an error. + http://www.gnu.org/software/autoconf/manual/autoconf.html# + AC_005fLIBOBJ-vs-LIBOBJS + + There are no system functions to override in this module. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 42d2c1e32167a33c0f2de04cea0c7bb8001dbe43 +Author: Guillem Jover <[email protected]> +Date: Tue Oct 4 07:04:38 2011 +0200 + + Use format string literals instead of variables to print atom names + + This allows the compiler to check the format against the argument types. + + Signed-off-by: Guillem Jover <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + +commit 8ce8a54e75248164e17626c0866adbd636e42a7b +Author: Guillem Jover <[email protected]> +Date: Tue Oct 4 07:03:30 2011 +0200 + + Refactor atom name printing into a new Display_Atom_Name function + + Signed-off-by: Guillem Jover <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + +commit c1b6da1bc7e5ba715bbea52a24449cc91c26dfb3 +Author: Guillem Jover <[email protected]> +Date: Tue Oct 4 07:04:38 2011 +0200 + + Use format string literals instead of variables to print window ids + + This allows the compiler to check the format against the argument types. + + Signed-off-by: Guillem Jover <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + +commit d11e467728a7c7cb7b5b7a8e07cd543172c20aa1 +Author: Guillem Jover <[email protected]> +Date: Tue Oct 4 05:40:45 2011 +0200 + + Move leading ": " out from buffer to the error string printer + + Besides slightly reducing the binary size, this will be helpful when/if + i18n support is added to translate the strings. + + Signed-off-by: Guillem Jover <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + +commit 73bb1135d599d8a55e883bd61619707ede658717 +Author: Alan Coopersmith <[email protected]> +Date: Wed Sep 28 21:16:52 2011 -0700 + + Add const attributes to fix gcc -Wwrite-strings warnings + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 23fc2d9c1cc91ac902ebf05dcbaa6062ff8f0dcc +Author: Alan Coopersmith <[email protected]> +Date: Wed Sep 28 21:14:37 2011 -0700 + + Strip trailing whitespace + + Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}' + git diff -w & git diff -b show no diffs from this change + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 1410b0f0a9d50973ebfdcc696994ccbd91cea3ae +Author: Yaakov Selkowitz <[email protected]> +Date: Wed Aug 24 23:08:58 2011 -0500 + + Use AM_ICONV + + AC_SEARCH_LIBS does not detect GNU libiconv because its symbols are + exported in the "libiconv" namespace instead of "iconv". The AM_ICONV + macro correctly detects both glibc and GNU libiconv, defines HAVE_ICONV, + ICONV_CONST, and LIBICONV depending on the system. The config.rpath + file is required by this macro. + + This adds a dependency on the aclocal macros from gettext (gettext-devel + in some distros) when building from git, but not when building from a + tarball. + + Signed-off-by: Yaakov Selkowitz <[email protected]> + Reviewed-by: Gaetan Nadon <[email protected]> + commit 1c58b461a84a8e75c53ce863470a5c8d8201261b Author: Alan Coopersmith <[email protected]> Date: Wed Jun 29 21:25:38 2011 -0700 diff --git a/xwininfo/Makefile.am b/xwininfo/Makefile.am index 1bb0664..79ef7d6 100644 --- a/xwininfo/Makefile.am +++ b/xwininfo/Makefile.am @@ -1,6 +1,6 @@ -# +# # Copyright 2005 Red Hat, Inc. -# +# # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that @@ -10,7 +10,7 @@ # specific, written prior permission. Red Hat makes no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. -# +# # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR diff --git a/xwininfo/Makefile.in b/xwininfo/Makefile.in index 0871296..2eea658 100644 --- a/xwininfo/Makefile.in +++ b/xwininfo/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.13.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,9 +14,9 @@ @SET_MAKE@ -# +# # Copyright 2005 Red Hat, Inc. -# +# # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that @@ -27,7 +26,7 @@ # specific, written prior permission. Red Hat makes no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. -# +# # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -37,6 +36,51 @@ # PERFORMANCE OF THIS SOFTWARE. VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -57,10 +101,11 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = xwininfo$(EXEEXT) subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure COPYING ChangeLog INSTALL config.guess \ - config.sub depcomp install-sh missing strnlen.c +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in strnlen.c depcomp COPYING ChangeLog \ + INSTALL README config.guess config.rpath config.sub install-sh \ + missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -78,50 +123,89 @@ am_xwininfo_OBJECTS = clientwin.$(OBJEXT) dsimple.$(OBJEXT) \ xwininfo_OBJECTS = $(am_xwininfo_OBJECTS) am__DEPENDENCIES_1 = xwininfo_DEPENDENCIES = $(am__DEPENDENCIES_1) $(LIBOBJS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(xwininfo_SOURCES) DIST_SOURCES = $(xwininfo_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -149,7 +233,10 @@ am__relativize = \ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best +DIST_TARGETS = dist-bzip2 dist-gzip distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ @@ -162,6 +249,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -189,10 +277,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ @@ -288,7 +378,7 @@ all: config.h .SUFFIXES: .SUFFIXES: .c .o .obj -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -324,10 +414,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -341,14 +429,18 @@ distclean-hdr: -rm -f config.h stamp-h1 install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -369,14 +461,16 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -xwininfo$(EXEEXT): $(xwininfo_OBJECTS) $(xwininfo_DEPENDENCIES) + +xwininfo$(EXEEXT): $(xwininfo_OBJECTS) $(xwininfo_DEPENDENCIES) $(EXTRA_xwininfo_DEPENDENCIES) @rm -f xwininfo$(EXEEXT) $(AM_V_CCLD)$(LINK) $(xwininfo_OBJECTS) $(xwininfo_LDADD) $(LIBS) @@ -394,36 +488,37 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -438,57 +533,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -504,12 +554,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -521,15 +566,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -538,9 +579,31 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -576,13 +639,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -614,36 +674,35 @@ distdir: $(DISTFILES) || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -654,8 +713,8 @@ distcheck: dist GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -665,9 +724,9 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ @@ -675,6 +734,7 @@ distcheck: dist && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -698,13 +758,21 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
