x11-utils: Changes to 'debian-unstable'
debian/changelog | 13
debian/rules | 2
listres/ChangeLog | 150
listres/Makefile.am | 36
listres/Makefile.in | 316 +
listres/aclocal.m4 | 1890 ++++++++---
listres/config.guess | 18
listres/config.sub | 76
listres/configure | 7009 ++++++++++++++++++++++++++++++++++-------
listres/configure.ac | 26
listres/listres.c | 25
listres/listres.man | 83
listres/man/Makefile.am | 12
listres/man/Makefile.in | 414 ++
listres/man/listres.man | 83
luit/ChangeLog | 122
luit/Makefile.in | 2
luit/aclocal.m4 | 1168 +++++-
luit/charset.c | 2
luit/charset.h | 1
luit/config.h.in | 6
luit/configure | 6140 ++++++++++++++++++++++++++++++++++-
luit/configure.ac | 10
luit/iso2022.c | 19
luit/luit.c | 4
luit/luit.h | 20
luit/man/Makefile.in | 2
luit/man/luit.man | 4
luit/sys.c | 16
xdpyinfo/ChangeLog | 122
xdpyinfo/Makefile.am | 23
xdpyinfo/Makefile.in | 300 +
xdpyinfo/aclocal.m4 | 514 ++-
xdpyinfo/configure | 121
xdpyinfo/configure.ac | 41
xdpyinfo/man/Makefile.am | 12
xdpyinfo/man/Makefile.in | 439 ++
xdpyinfo/man/xdpyinfo.man | 69
xdpyinfo/xdpyinfo.c | 196 -
xdpyinfo/xdpyinfo.man | 72
xev/ChangeLog | 130
xev/Makefile.am | 23
xev/Makefile.in | 302 +
xev/aclocal.m4 | 984 ++++-
xev/configure | 5517 +++++++++++++++++++++++++++++++-
xev/configure.ac | 21
xev/man/Makefile.am | 12
xev/man/Makefile.in | 414 ++
xev/man/xev.man | 61
xev/xev.c | 308 +
xev/xev.man | 61
xfd/ChangeLog | 111
xfd/Makefile.am | 32
xfd/Makefile.in | 293 +
xfd/aclocal.m4 | 1075 ++++--
xfd/config.h.in | 3
xfd/configure | 5730 ++++++++++++++++++++++++++++++++-
xfd/configure.ac | 20
xfd/grid.c | 108
xfd/grid.h | 2
xfd/gridP.h | 6
xfd/m4/ax_define_dir.m4 | 49
xfd/man/Makefile.am | 12
xfd/man/Makefile.in | 418 ++
xfd/man/xfd.man | 201 +
xfd/xfd.c | 72
xfd/xfd.man | 201 -
xfontsel/COPYING | 8
xfontsel/ChangeLog | 102
xfontsel/Makefile.am | 23
xfontsel/Makefile.in | 285 +
xfontsel/ULabel.c | 33
xfontsel/ULabel.h | 11
xfontsel/ULabelP.h | 18
xfontsel/aclocal.m4 | 1168 +++++-
xfontsel/app-defaults/XFontSel | 8
xfontsel/configure | 5873 ++++++++++++++++++++++++++++++++++
xfontsel/configure.ac | 15
xfontsel/man/Makefile.am | 12
xfontsel/man/Makefile.in | 417 ++
xfontsel/man/xfontsel.man | 227 +
xfontsel/xfontsel.c | 48
xfontsel/xfontsel.man | 229 -
83 files changed, 39380 insertions(+), 4841 deletions(-)
New commits:
commit da37dee89380963a9d43dd7548e26a75cdc4d27c
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Fri Mar 23 17:19:41 2012 -0400
debian/rules: Pass --disable-selective-werror to configure to work around util-macros craziness.
Needed for luit 1.1.1.
diff --git a/debian/changelog b/debian/changelog
index 06e9369..e546a34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ x11-utils (7.7~1) UNRELEASED; urgency=low
* xev 1.2.0
* xfd 1.1.1
* xfontsel 1.0.4
+ * Build with --disable-selective-werror to work around build problems
+ caused by excessive -Werror's set in new xutils-dev.
- -- Robert Hooker <sarvatt@ubuntu.com> Fri, 23 Mar 2012 17:09:24 -0400
+ -- Robert Hooker <sarvatt@ubuntu.com> Fri, 23 Mar 2012 17:17:03 -0400
x11-utils (7.6+4) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index cc5e74e..65f3350 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,7 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
cd $*-build && \
../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
- CFLAGS="$(CFLAGS)"
+ --disable-selective-werror CFLAGS="$(CFLAGS)"
cd $*-build && $(MAKE)
>$@
commit 4af862516db3724751c6f43f7b4c77ad429b094c
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Fri Mar 23 17:09:38 2012 -0400
xfontsel 1.0.4
diff --git a/debian/changelog b/debian/changelog
index c3d666e..06e9369 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ x11-utils (7.7~1) UNRELEASED; urgency=low
* xdpyinfo 1.3.0
* xev 1.2.0
* xfd 1.1.1
+ * xfontsel 1.0.4
- -- Robert Hooker <sarvatt@ubuntu.com> Fri, 23 Mar 2012 17:08:35 -0400
+ -- Robert Hooker <sarvatt@ubuntu.com> Fri, 23 Mar 2012 17:09:24 -0400
x11-utils (7.6+4) unstable; urgency=low
diff --git a/xfontsel/COPYING b/xfontsel/COPYING
index 5fcc3a7..4a1e6f2 100644
--- a/xfontsel/COPYING
+++ b/xfontsel/COPYING
@@ -26,13 +26,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/xfontsel/ChangeLog b/xfontsel/ChangeLog
index 3c0a2c9..d591856 100644
--- a/xfontsel/ChangeLog
+++ b/xfontsel/ChangeLog
@@ -1,3 +1,105 @@
+commit 67309809fee4ea1b7b4334d6245788ddea626dcf
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Mar 22 22:30:31 2012 -0700
+
+ xfontsel 1.0.4
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 5815b461672845cf6de179f04c778354139f7834
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Sep 28 22:05:41 2011 -0700
+
+ Add const attribute to fieldP fix a gcc -Wwrite-strings warning
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d9200f965f056d3da49476dd9b8333ff47265f30
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Sep 28 22:00:50 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 <alan.coopersmith@oracle.com>
+
+commit 561085a83a777fec4b42cfa16a8ba80e971d86fb
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Sep 16 19:04:30 2011 -0700
+
+ Convert sprintf calls to snprintf
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 1d6970a838d4ed42a8c91a10cb5311f98ba959c3
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Tue Oct 26 16:06:24 2010 -0700
+
+ Remove USE_TEXT_WIDGET (bug 8966)
+
+ It was included in the initial revision. The bug dates back to 2006, so I
+ think it's safe to say that this never worked.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 19bcefb4c89e02833cb7fcffeb7fd3f7224db1c4
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jan 19 10:06:56 2011 -0500
+
+ config: move man pages into their own directory
+
+ Use services provided by XORG_MANPAGE_SECTIONS.
+ Use standard Makefile for man pages.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit f68420e9698d9a3b3e18cbefb96a3ccf9d555c65
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Jan 13 17:15:36 2011 -0500
+
+ man: replace hard coded man page section with substitution strings
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 63f5e107b12fb8a78946e54e36e99f2ec64a5bac
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Jan 13 11:15:47 2011 -0500
+
+ man: remove trailing spaces and tabs
+
+ Using s/[ \t]*$//
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 1fe1686bbe8d3830a3e7531dda4318c81f6d7405
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jan 12 16:28:02 2011 -0500
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ This silences an Autoconf warning
+
+commit 284bc2ff3e5a852f44ca08cb4fcab5ee64a08e54
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jan 12 15:29:50 2011 -0500
+
+ config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
+
+ This silences an Automake warning.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 0799a10d39b4240bdc043a5fcdd25f571338be24
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Tue Sep 28 13:29:49 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+
commit 3aaccefa18e0eb37393642823b2e8454b1de20fd
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Sep 26 17:24:50 2010 -0700
diff --git a/xfontsel/Makefile.am b/xfontsel/Makefile.am
index c030c97..9421d38 100644
--- a/xfontsel/Makefile.am
+++ b/xfontsel/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
@@ -19,6 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
+SUBDIRS = man
bin_PROGRAMS = xfontsel
AM_CFLAGS = $(XFONTSEL_CFLAGS) $(CWARNFLAGS)
@@ -30,9 +31,6 @@ xfontsel_SOURCES = \
ULabelP.h \
xfontsel.c
-appman_PRE = \
- xfontsel.man
-
# App default files
DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
@@ -41,20 +39,7 @@ appdefaultdir = @appdefaultdir@
dist_appdefault_DATA = \
app-defaults/XFontSel
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-EXTRA_DIST = $(appman_PRE)
MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = $(appman_DATA)
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-.man.$(APP_MAN_SUFFIX):
- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
.PHONY: ChangeLog INSTALL
diff --git a/xfontsel/Makefile.in b/xfontsel/Makefile.in
index 97046e2..ad5598b 100644
--- a/xfontsel/Makefile.in
+++ b/xfontsel/Makefile.in
@@ -15,9 +15,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 +27,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
@@ -73,8 +73,7 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" \
- "$(DESTDIR)$(appdefaultdir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)"
PROGRAMS = $(bin_PROGRAMS)
am_xfontsel_OBJECTS = ULabel.$(OBJEXT) xfontsel.$(OBJEXT)
xfontsel_OBJECTS = $(am_xfontsel_OBJECTS)
@@ -102,6 +101,13 @@ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(xfontsel_SOURCES)
DIST_SOURCES = $(xfontsel_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
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -123,9 +129,15 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-DATA = $(appman_DATA) $(dist_appdefault_DATA)
+DATA = $(dist_appdefault_DATA)
+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
ETAGS = etags
CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -133,6 +145,31 @@ am__remove_distdir = \
{ test ! -d "$(distdir)" \
|| { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
&& rm -fr "$(distdir)"; }; }
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
@@ -150,6 +187,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -201,6 +239,7 @@ PKG_CONFIG = @PKG_CONFIG@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@
VERSION = @VERSION@
XFONTSEL_CFLAGS = @XFONTSEL_CFLAGS@
@@ -257,6 +296,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+SUBDIRS = man
AM_CFLAGS = $(XFONTSEL_CFLAGS) $(CWARNFLAGS)
xfontsel_LDADD = $(XFONTSEL_LIBS)
xfontsel_SOURCES = \
@@ -265,26 +305,18 @@ xfontsel_SOURCES = \
ULabelP.h \
xfontsel.c
-appman_PRE = \
- xfontsel.man
-
# App default files
DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
dist_appdefault_DATA = \
app-defaults/XFontSel
-appmandir = $(APP_MAN_DIR)
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE)
MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = $(appman_DATA)
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-am
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-.SUFFIXES: .$(APP_MAN_SUFFIX) .man .c .o .obj
+.SUFFIXES: .c .o .obj
am--refresh:
@:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@@ -401,26 +433,6 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-install-appmanDATA: $(appman_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(appmandir)" || $(MKDIR_P) "$(DESTDIR)$(appmandir)"
- @list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appmandir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(appmandir)" || exit $$?; \
- done
-
-uninstall-appmanDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(appmandir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(appmandir)" && rm -f $$files
install-dist_appdefaultDATA: $(dist_appdefault_DATA)
@$(NORMAL_INSTALL)
test -z "$(appdefaultdir)" || $(MKDIR_P) "$(DESTDIR)$(appdefaultdir)"
@@ -442,6 +454,76 @@ uninstall-dist_appdefaultDATA:
echo " ( cd '$(DESTDIR)$(appdefaultdir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(appdefaultdir)" && rm -f $$files
+# 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; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(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: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -452,10 +534,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
mkid -fID $$unique
tags: TAGS
-TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ 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; \
@@ -474,7 +569,7 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
fi; \
fi
ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+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 \
@@ -526,6 +621,34 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
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 \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
@@ -645,21 +768,22 @@ distcleancheck: distclean
$(distcleancheck_listfiles) ; \
exit 1; } >&2
check-am: all-am
-check: check-am
+check: check-recursive
all-am: Makefile $(PROGRAMS) $(DATA) config.h
-installdirs:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(appdefaultdir)"; do \
+installdirs: installdirs-recursive
+installdirs-am:
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-installcheck: installcheck-am
+installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -668,7 +792,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -678,103 +801,99 @@ maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
+clean: clean-recursive
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
-distclean: distclean-am
+distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-tags
-dvi: dvi-am
+dvi: dvi-recursive
dvi-am:
-html: html-am
+html: html-recursive
html-am:
-info: info-am
+info: info-recursive
info-am:
-install-data-am: install-appmanDATA install-dist_appdefaultDATA
+install-data-am: install-dist_appdefaultDATA
-install-dvi: install-dvi-am
+install-dvi: install-dvi-recursive
install-dvi-am:
install-exec-am: install-binPROGRAMS
-install-html: install-html-am
+install-html: install-html-recursive
install-html-am:
-install-info: install-info-am
+install-info: install-info-recursive
install-info-am:
install-man:
-install-pdf: install-pdf-am
+install-pdf: install-pdf-recursive
install-pdf-am:
-install-ps: install-ps-am
+install-ps: install-ps-recursive
install-ps-am:
installcheck-am:
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
-rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-pdf: pdf-am
+pdf: pdf-recursive
pdf-am:
-ps: ps-am
+ps: ps-recursive
ps-am:
-uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
- uninstall-dist_appdefaultDATA
+uninstall-am: uninstall-binPROGRAMS uninstall-dist_appdefaultDATA
-.MAKE: all install-am install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+ ctags-recursive install-am install-strip tags-recursive
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
- clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-binPROGRAMS \
+ clean-generic ctags ctags-recursive dist dist-all dist-bzip2 \
dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
dist-zip distcheck distclean distclean-compile \
distclean-generic distclean-hdr distclean-tags distcleancheck \
distdir distuninstallcheck dvi dvi-am html html-am info \
- info-am install install-am install-appmanDATA \
- install-binPROGRAMS install-data install-data-am \
- install-dist_appdefaultDATA install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-appmanDATA uninstall-binPROGRAMS \
- uninstall-dist_appdefaultDATA
-
-
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-.man.$(APP_MAN_SUFFIX):
- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+ info-am install install-am install-binPROGRAMS install-data \
+ install-data-am install-dist_appdefaultDATA install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+ ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-dist_appdefaultDATA
+
.PHONY: ChangeLog INSTALL
diff --git a/xfontsel/ULabel.c b/xfontsel/ULabel.c
index ef9ecd2..285fb1c 100644
--- a/xfontsel/ULabel.c
+++ b/xfontsel/ULabel.c
@@ -1,5 +1,3 @@
-/* $XConsortium: Label.c,v 1.97 94/04/17 20:12:12 kaleb Exp $ */
-
/***********************************************************
Copyright (c) 1987, 1988, 1994 X Consortium
@@ -30,13 +28,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -47,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/xfontsel/ULabel.c,v 1.3tsi Exp $ */
/*
* ULabel.c - UCSLabel widget
@@ -122,7 +119,7 @@ static XtGeometryResult QueryGeometry(Widget w, XtWidgetGeometry *intended,
UCSLabelClassRec ucsLabelClassRec = {
{
-/* core_class fields */
+/* core_class fields */
/* superclass */ (WidgetClass) &simpleClassRec,
/* class_name */ "UCSLabel",
/* widget_size */ sizeof(UCSLabelRec),
@@ -175,7 +172,7 @@ WidgetClass ucsLabelWidgetClass = (WidgetClass)&ucsLabelClassRec;
static void ClassInitialize(void)
{
XawInitializeWidgetSet();
- XtAddConverter( XtRString, XtRJustify, XmuCvtStringToJustify,
+ XtAddConverter( XtRString, XtRJustify, XmuCvtStringToJustify,
(XtConvertArgList)NULL, 0 );
}
@@ -451,7 +448,7 @@ static void GetgrayGC(UCSLabelWidget lw)
values.font = lw->label.font->fid;
values.fill_style = FillTiled;
values.tile = XmuCreateStippledPixmap(XtScreen((Widget)lw),
- lw->label.foreground,
+ lw->label.foreground,
lw->core.background_pixel,
lw->core.depth);
values.graphics_exposures = False;
@@ -465,7 +462,7 @@ static void GetgrayGC(UCSLabelWidget lw)
GCGraphicsExposures,
&values, GCFont, 0);
else
- lw->label.gray_GC = XtGetGC((Widget)lw,
+ lw->label.gray_GC = XtGetGC((Widget)lw,
(unsigned) GCForeground | GCBackground |
GCFont | GCTile | GCFillStyle |
GCGraphicsExposures,
@@ -475,12 +472,12 @@ static void GetgrayGC(UCSLabelWidget lw)
static void compute_bitmap_offsets(UCSLabelWidget lw)
{
/*
- * bitmap will be eventually be displayed at
+ * bitmap will be eventually be displayed at
* (internal_width, internal_height + lbm_y)
*/
if (lw->label.lbm_height != 0) {
lw->label.lbm_y = (lw->core.height -
- (lw->label.internal_height * 2 +
+ (lw->label.internal_height * 2 +
lw->label.lbm_height)) / 2;
} else {
lw->label.lbm_y = 0;
@@ -511,7 +508,7 @@ Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args)
{
UCSLabelWidget lw = (UCSLabelWidget) new;
- if (lw->label.label == NULL)
+ if (lw->label.label == NULL)
lw->label.label = XtNewString(lw->core.name);
else {
lw->label.label = XtNewString(lw->label.label);
@@ -581,7 +578,7 @@ static void Redisplay(Widget gw, XEvent *event, Region region)
XCopyPlane (XtDisplay(gw), w->label.left_bitmap, XtWindow(gw), gc,
0, 0, w->label.lbm_width, w->label.lbm_height,
(int) w->label.internal_width,
- (int) w->label.internal_height + w->label.lbm_y,
+ (int) w->label.internal_height + w->label.lbm_y,
(unsigned long) 1L);
}
@@ -620,7 +617,7 @@ static void Redisplay(Widget gw, XEvent *event, Region region)
else
XDrawString(XtDisplay(gw), XtWindow(gw), gc,
w->label.label_x, y, label, (int)(nl - label));
- y += w->label.font->max_bounds.ascent +
+ y += w->label.font->max_bounds.ascent +
w->label.font->max_bounds.descent;
label = nl + 1;
}
@@ -821,10 +818,10 @@ QueryGeometry(Widget w, XtWidgetGeometry *intended, XtWidgetGeometry *preferred)
UCSLabelWidget lw = (UCSLabelWidget)w;
preferred->request_mode = CWWidth | CWHeight;
- preferred->width = (lw->label.label_width +
+ preferred->width = (lw->label.label_width +
2 * lw->label.internal_width +
LEFT_OFFSET(lw));
- preferred->height = lw->label.label_height +
+ preferred->height = lw->label.label_height +
2 * lw->label.internal_height;
if ( ((intended->request_mode & (CWWidth | CWHeight))
== (CWWidth | CWHeight)) &&
diff --git a/xfontsel/ULabel.h b/xfontsel/ULabel.h
index 7c7c2ed..7ee70f0 100644
--- a/xfontsel/ULabel.h
+++ b/xfontsel/ULabel.h
@@ -1,5 +1,3 @@
-/* $XConsortium: Label.h,v 1.34 94/04/17 20:12:13 rws Exp $ */
-
/***********************************************************
Copyright (c) 1987, 1988, 1994 X Consortium
@@ -30,13 +28,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -47,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: contrib/programs/xfontsel/ULabel.h,v 1.1 1999/04/29 09:12:39 dawes Exp $ */
#ifndef _XawUCSLabel_h
#define _XawUCSLabel_h
Reply to: