diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-09-30 10:35:12 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-09-30 10:35:12 +0000 |
| commit | d1ff376c38aa16000c54a4beb9642308309a7d20 (patch) | |
| tree | f647fbb3cd812ca8fac701cedea821502c6a19b4 /lib/libX11 | |
| parent | 5a64dca17e537bdd5d681cd4f5c7a60ab17a32b5 (diff) | |
Merge libX11 1.1.3
bump major
Diffstat (limited to 'lib/libX11')
68 files changed, 563 insertions, 389 deletions
diff --git a/lib/libX11/Makefile.bsd-wrapper b/lib/libX11/Makefile.bsd-wrapper index 5716fbf19..b2369cecf 100644 --- a/lib/libX11/Makefile.bsd-wrapper +++ b/lib/libX11/Makefile.bsd-wrapper @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2007/03/15 22:23:39 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2007/09/30 10:35:10 matthieu Exp $ -SHARED_LIBS= X11 10.0 +SHARED_LIBS= X11 11.0 CONFIGURE_ARGS= --without-xcb --enable-tcp-transport --enable-unix-transport --enable-IPv6 diff --git a/lib/libX11/Makefile.in b/lib/libX11/Makefile.in index 6ecf4b57f..c27950a9b 100644 --- a/lib/libX11/Makefile.in +++ b/lib/libX11/Makefile.in @@ -260,7 +260,7 @@ target_alias = @target_alias@ SUBDIRS = include $(ORDER) nls man pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = x11.pc $(am__append_1) -EXTRA_DIST = x11.pc.in x11-xcb.pc.in ChangeLog +EXTRA_DIST = x11.pc.in x11-xcb.pc.in ChangeLog autogen.sh MAINTAINERCLEANFILES = ChangeLog # Check source code with tools like lint & sparse @@ -733,7 +733,7 @@ uninstall-info: uninstall-info-recursive .PHONY: ChangeLog ChangeLog: - GIT_DIR=${srcdir}/.git git-log > ChangeLog + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) dist-hook: ChangeLog diff --git a/lib/libX11/compile b/lib/libX11/compile deleted file mode 100644 index 1b1d23216..000000000 --- a/lib/libX11/compile +++ /dev/null @@ -1,142 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. - -scriptversion=2005-05-14.22 - -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. -# Written by Tom Tromey <tromey@cygnus.com>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <bug-automake@gnu.org> or send patches to -# <automake-patches@gnu.org>. - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. - -Report bugs to <bug-automake@gnu.org>. -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; -esac - -ofile= -cfile= -eat= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` - -# Create the lock directory. -# Note: use `[/.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/lib/libX11/configure b/lib/libX11/configure index cc18b5e3e..87243937f 100644 --- a/lib/libX11/configure +++ b/lib/libX11/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for libX11 1.1.1. +# Generated by GNU Autoconf 2.59 for libX11 1.1.3. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libX11' PACKAGE_TARNAME='libX11' -PACKAGE_VERSION='1.1.1' -PACKAGE_STRING='libX11 1.1.1' +PACKAGE_VERSION='1.1.3' +PACKAGE_STRING='libX11 1.1.3' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -998,7 +998,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libX11 1.1.1 to adapt to many kinds of systems. +\`configure' configures libX11 1.1.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1064,7 +1064,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libX11 1.1.1:";; + short | recursive ) echo "Configuration of libX11 1.1.3:";; esac cat <<\_ACEOF @@ -1242,7 +1242,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -libX11 configure 1.1.1 +libX11 configure 1.1.3 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1256,7 +1256,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libX11 $as_me 1.1.1, which was +It was created by libX11 $as_me 1.1.3, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1900,7 +1900,7 @@ fi # Define the identity of the package. PACKAGE='libX11' - VERSION='1.1.1' + VERSION='1.1.3' cat >>confdefs.h <<_ACEOF @@ -22375,6 +22375,9 @@ if test x$xthreads = xyes ; then case $host_os in linux*|openbsd*|gnu*|k*bsd*-gnu) XTHREADLIB=-lpthread ;; + netbsd*) + XTHREAD_CFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS" + XTHREADLIB="-lpthread" ;; freebsd*) XTHREAD_CFLAGS="-D_THREAD_SAFE" XTHREADLIB="-pthread" ;; @@ -23532,6 +23535,60 @@ if test "x$GCC" = "xyes"; then X11_CFLAGS="$GCC_WARNINGS $X11_CFLAGS" fi +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include <features.h> +#ifndef __GLIBC__ +#error not glibc +#endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + +cat >>confdefs.h <<\_ACEOF +#define _GNU_SOURCE 1 +_ACEOF + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + X11_DATADIR="${datadir}/X11" prefix_NONE= @@ -23796,7 +23853,7 @@ _ACEOF - ac_config_files="$ac_config_files Makefile include/Makefile man/Makefile src/Makefile src/util/Makefile src/xcms/Makefile src/xlibi18n/Makefile modules/Makefile modules/im/Makefile modules/im/ximcp/Makefile modules/lc/Makefile modules/lc/def/Makefile modules/lc/gen/Makefile modules/lc/Utf8/Makefile modules/lc/xlocale/Makefile modules/om/Makefile modules/om/generic/Makefile src/xkb/Makefile nls/Makefile nls/armscii-8/Makefile nls/C/Makefile nls/el_GR.UTF-8/Makefile nls/en_US.UTF-8/Makefile nls/georgian-academy/Makefile nls/georgian-ps/Makefile nls/ibm-cp1133/Makefile nls/iscii-dev/Makefile nls/isiri-3342/Makefile nls/iso8859-1/Makefile nls/iso8859-10/Makefile nls/iso8859-11/Makefile nls/iso8859-13/Makefile nls/iso8859-14/Makefile nls/iso8859-15/Makefile nls/iso8859-2/Makefile nls/iso8859-3/Makefile nls/iso8859-4/Makefile nls/iso8859-5/Makefile nls/iso8859-6/Makefile nls/iso8859-7/Makefile nls/iso8859-8/Makefile nls/iso8859-9/Makefile nls/iso8859-9e/Makefile nls/ja/Makefile nls/ja.JIS/Makefile nls/ja_JP.UTF-8/Makefile nls/ja.S90/Makefile nls/ja.SJIS/Makefile nls/ja.U90/Makefile nls/ko/Makefile nls/koi8-c/Makefile nls/koi8-r/Makefile nls/koi8-u/Makefile nls/ko_KR.UTF-8/Makefile nls/microsoft-cp1251/Makefile nls/microsoft-cp1255/Makefile nls/microsoft-cp1256/Makefile nls/mulelao-1/Makefile nls/nokhchi-1/Makefile nls/pt_BR.UTF-8/Makefile nls/tatar-cyr/Makefile nls/th_TH/Makefile nls/th_TH.UTF-8/Makefile nls/tscii-0/Makefile nls/vi_VN.tcvn/Makefile nls/vi_VN.viscii/Makefile nls/zh_CN/Makefile nls/zh_CN.gb18030/Makefile nls/zh_CN.gbk/Makefile nls/zh_CN.UTF-8/Makefile nls/zh_HK.big5/Makefile nls/zh_HK.big5hkscs/Makefile nls/zh_HK.UTF-8/Makefile nls/zh_TW/Makefile nls/zh_TW.big5/Makefile nls/zh_TW.UTF-8/Makefile x11.pc x11-xcb.pc" + ac_config_files="$ac_config_files Makefile include/Makefile man/Makefile man/xkb/Makefile src/Makefile src/util/Makefile src/xcms/Makefile src/xlibi18n/Makefile modules/Makefile modules/im/Makefile modules/im/ximcp/Makefile modules/lc/Makefile modules/lc/def/Makefile modules/lc/gen/Makefile modules/lc/Utf8/Makefile modules/lc/xlocale/Makefile modules/om/Makefile modules/om/generic/Makefile src/xkb/Makefile nls/Makefile nls/armscii-8/Makefile nls/C/Makefile nls/el_GR.UTF-8/Makefile nls/en_US.UTF-8/Makefile nls/georgian-academy/Makefile nls/georgian-ps/Makefile nls/ibm-cp1133/Makefile nls/iscii-dev/Makefile nls/isiri-3342/Makefile nls/iso8859-1/Makefile nls/iso8859-10/Makefile nls/iso8859-11/Makefile nls/iso8859-13/Makefile nls/iso8859-14/Makefile nls/iso8859-15/Makefile nls/iso8859-2/Makefile nls/iso8859-3/Makefile nls/iso8859-4/Makefile nls/iso8859-5/Makefile nls/iso8859-6/Makefile nls/iso8859-7/Makefile nls/iso8859-8/Makefile nls/iso8859-9/Makefile nls/iso8859-9e/Makefile nls/ja/Makefile nls/ja.JIS/Makefile nls/ja_JP.UTF-8/Makefile nls/ja.S90/Makefile nls/ja.SJIS/Makefile nls/ja.U90/Makefile nls/ko/Makefile nls/koi8-c/Makefile nls/koi8-r/Makefile nls/koi8-u/Makefile nls/ko_KR.UTF-8/Makefile nls/microsoft-cp1251/Makefile nls/microsoft-cp1255/Makefile nls/microsoft-cp1256/Makefile nls/mulelao-1/Makefile nls/nokhchi-1/Makefile nls/pt_BR.UTF-8/Makefile nls/tatar-cyr/Makefile nls/th_TH/Makefile nls/th_TH.UTF-8/Makefile nls/tscii-0/Makefile nls/vi_VN.tcvn/Makefile nls/vi_VN.viscii/Makefile nls/zh_CN/Makefile nls/zh_CN.gb18030/Makefile nls/zh_CN.gbk/Makefile nls/zh_CN.UTF-8/Makefile nls/zh_HK.big5/Makefile nls/zh_HK.big5hkscs/Makefile nls/zh_HK.UTF-8/Makefile nls/zh_TW/Makefile nls/zh_TW.big5/Makefile nls/zh_TW.UTF-8/Makefile x11.pc x11-xcb.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -24264,7 +24321,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by libX11 $as_me 1.1.1, which was +This file was extended by libX11 $as_me 1.1.3, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24327,7 +24384,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libX11 config.status 1.1.1 +libX11 config.status 1.1.3 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -24440,6 +24497,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; + "man/xkb/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/xkb/Makefile" ;; "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/util/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/util/Makefile" ;; "src/xcms/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/xcms/Makefile" ;; @@ -25459,6 +25517,11 @@ if test "$no_create" != yes; then fi +man_pages_suffix=$LIBMAN_SUFFIX +if test -z "$man_pages_suffix"; then + man_pages_suffix=none +fi + echo "" echo "X11 will be built with the following settings:" echo " Loadable i18n module support: "$XLIB_LOADABLE_I18N @@ -25472,6 +25535,6 @@ echo " Internationalization support: "$XLOCALE echo " XF86BigFont support: "$XF86BIGFONT echo " XKB support: "$XKB echo " XLOCALEDIR environment variable support: "$ENABLE_XLOCALEDIR -echo " Manual pages installed: "$LIBMAN_SUFFIX +echo " Manual pages suffix: "$man_pages_suffix echo " Compose table cache enabled: "$COMPOSECACHE echo "" diff --git a/lib/libX11/include/Makefile.in b/lib/libX11/include/Makefile.in index 6f2c9a3cb..6ba84e71a 100644 --- a/lib/libX11/include/Makefile.in +++ b/lib/libX11/include/Makefile.in @@ -51,19 +51,20 @@ CONFIG_HEADER = $(top_builddir)/src/config.h \ CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__x11include_HEADERS_DIST = X11/XKBlib.h X11/Xcms.h X11/Xlib.h \ - X11/Xlibint.h X11/Xlocale.h X11/Xresource.h X11/Xutil.h \ - X11/cursorfont.h X11/Xregion.h X11/ImUtil.h X11/XlibConf.h \ - X11/Xlib-xcb.h am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(x11includedir)" +am__installdirs = "$(DESTDIR)$(x11includedir)" \ + "$(DESTDIR)$(x11includedir)" +nodist_x11includeHEADERS_INSTALL = $(INSTALL_HEADER) +am__x11include_HEADERS_DIST = X11/XKBlib.h X11/Xcms.h X11/Xlib.h \ + X11/Xlibint.h X11/Xlocale.h X11/Xresource.h X11/Xutil.h \ + X11/cursorfont.h X11/Xregion.h X11/ImUtil.h X11/Xlib-xcb.h x11includeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(x11include_HEADERS) +HEADERS = $(nodist_x11include_HEADERS) $(x11include_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -239,7 +240,10 @@ target_alias = @target_alias@ x11includedir = ${includedir}/X11 x11include_HEADERS = X11/XKBlib.h X11/Xcms.h X11/Xlib.h X11/Xlibint.h \ X11/Xlocale.h X11/Xresource.h X11/Xutil.h X11/cursorfont.h \ - X11/Xregion.h X11/ImUtil.h X11/XlibConf.h $(am__append_1) + X11/Xregion.h X11/ImUtil.h $(am__append_1) +nodist_x11include_HEADERS = \ + X11/XlibConf.h + EXTRA_DIST = \ X11/XlibConf.h.in @@ -285,6 +289,23 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: +install-nodist_x11includeHEADERS: $(nodist_x11include_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(x11includedir)" || $(mkdir_p) "$(DESTDIR)$(x11includedir)" + @list='$(nodist_x11include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(nodist_x11includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(x11includedir)/$$f'"; \ + $(nodist_x11includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(x11includedir)/$$f"; \ + done + +uninstall-nodist_x11includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(nodist_x11include_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(x11includedir)/$$f'"; \ + rm -f "$(DESTDIR)$(x11includedir)/$$f"; \ + done install-x11includeHEADERS: $(x11include_HEADERS) @$(NORMAL_INSTALL) test -z "$(x11includedir)" || $(mkdir_p) "$(DESTDIR)$(x11includedir)" @@ -383,7 +404,7 @@ check-am: all-am check: check-am all-am: Makefile $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(x11includedir)"; do \ + for dir in "$(DESTDIR)$(x11includedir)" "$(DESTDIR)$(x11includedir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -429,7 +450,8 @@ info: info-am info-am: -install-data-am: install-x11includeHEADERS +install-data-am: install-nodist_x11includeHEADERS \ + install-x11includeHEADERS install-exec-am: @@ -455,19 +477,21 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am uninstall-x11includeHEADERS +uninstall-am: uninstall-info-am uninstall-nodist_x11includeHEADERS \ + uninstall-x11includeHEADERS .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool ctags distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip \ - install-x11includeHEADERS installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags uninstall uninstall-am uninstall-info-am \ - uninstall-x11includeHEADERS + install-info-am install-man install-nodist_x11includeHEADERS \ + install-strip install-x11includeHEADERS installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-info-am \ + uninstall-nodist_x11includeHEADERS uninstall-x11includeHEADERS # 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. diff --git a/lib/libX11/man/Makefile.in b/lib/libX11/man/Makefile.in index 02d447ded..1190a4bb9 100644 --- a/lib/libX11/man/Makefile.in +++ b/lib/libX11/man/Makefile.in @@ -57,6 +57,12 @@ CONFIG_HEADER = $(top_builddir)/src/config.h \ CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-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/||"`;; \ @@ -66,6 +72,9 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(libmandir)" libmanDATA_INSTALL = $(INSTALL_DATA) DATA = $(libman_DATA) +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ @@ -236,6 +245,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +SUBDIRS = xkb libmandir = $(LIB_MAN_DIR) LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%) libman_PRE = \ @@ -1313,7 +1323,7 @@ XmbTextPerCharExtents_shadows = \ Xutf8TextPerCharExtents all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am + $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: .SUFFIXES: .pre .$(LIB_MAN_SUFFIX) .man @@ -1373,12 +1383,138 @@ uninstall-libmanDATA: echo " rm -f '$(DESTDIR)$(libmandir)/$$f'"; \ rm -f "$(DESTDIR)$(libmandir)/$$f"; \ done + +# 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): + @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; \ + (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" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @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; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (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 \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique tags: TAGS -TAGS: +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + 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 || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + 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; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS -CTAGS: - +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + 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; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) $(mkdir_p) $(distdir)/.. @@ -1408,24 +1544,40 @@ 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; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ + done check-am: all-am check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am + $(MAKE) $(AM_MAKEFLAGS) check-recursive all-am: Makefile $(DATA) -installdirs: +installdirs: installdirs-recursive +installdirs-am: for dir in "$(DESTDIR)$(libmandir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am + $(MAKE) $(AM_MAKEFLAGS) 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 \ @@ -1443,21 +1595,22 @@ 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 "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -clean: clean-am +clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am -distclean: distclean-am +distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic distclean-libtool \ + distclean-tags -dvi: dvi-am +dvi: dvi-recursive dvi-am: -html: html-am +html: html-recursive -info: info-am +info: info-recursive info-am: @@ -1465,43 +1618,50 @@ install-data-am: install-libmanDATA install-exec-am: -install-info: install-info-am +install-info: install-info-recursive install-man: installcheck-am: -maintainer-clean: maintainer-clean-am +maintainer-clean: maintainer-clean-recursive -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic -mostlyclean: mostlyclean-am +mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-generic mostlyclean-libtool -pdf: pdf-am +pdf: pdf-recursive pdf-am: -ps: ps-am +ps: ps-recursive ps-am: uninstall-am: uninstall-info-am uninstall-libmanDATA -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-libmanDATA install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-info-am uninstall-libmanDATA +uninstall-info: uninstall-info-recursive + +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ + clean clean-generic clean-libtool clean-recursive ctags \ + ctags-recursive distclean distclean-generic distclean-libtool \ + distclean-recursive distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-libmanDATA install-man install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-generic \ + mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am uninstall-info-am \ + uninstall-libmanDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ .man.$(LIB_MAN_SUFFIX): $(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ diff --git a/lib/libX11/man/xkb/Makefile.in b/lib/libX11/man/xkb/Makefile.in index 53147d836..1f5e73b18 100644 --- a/lib/libX11/man/xkb/Makefile.in +++ b/lib/libX11/man/xkb/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005 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. @@ -21,11 +21,15 @@ # Rules for generating files using the C pre-processor # (Replaces CppFileTarget from Imake) +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -47,7 +51,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/config.h \ $(top_builddir)/include/X11/XlibConf.h CONFIG_CLEAN_FILES = @@ -66,6 +70,8 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ APP_MAN_DIR = @APP_MAN_DIR@ APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ @@ -100,9 +106,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ -GREP = @GREP@ I18N_MODULE_LIBS = @I18N_MODULE_LIBS@ -INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -115,16 +119,23 @@ LIBTOOL = @LIBTOOL@ LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LINT = @LINT@ +LINT_FALSE = @LINT_FALSE@ LINT_FLAGS = @LINT_FLAGS@ +LINT_TRUE = @LINT_TRUE@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@ +MANPAGES_FALSE = @MANPAGES_FALSE@ +MANPAGES_TRUE = @MANPAGES_TRUE@ MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ -MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ +OS2_FALSE = @OS2_FALSE@ +OS2_TRUE = @OS2_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -136,10 +147,13 @@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ -SED = sed SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +THRSTUBS_FALSE = @THRSTUBS_FALSE@ +THRSTUBS_TRUE = @THRSTUBS_TRUE@ +UDC_FALSE = @UDC_FALSE@ +UDC_TRUE = @UDC_TRUE@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ @@ -150,16 +164,26 @@ X11_LIBS = @X11_LIBS@ X11_LOCALEDATADIR = @X11_LOCALEDATADIR@ X11_LOCALEDIR = @X11_LOCALEDIR@ X11_LOCALELIBDIR = @X11_LOCALELIBDIR@ +XCB_FALSE = @XCB_FALSE@ +XCB_TRUE = @XCB_TRUE@ +XCMS_FALSE = @XCMS_FALSE@ +XCMS_TRUE = @XCMS_TRUE@ XDMCP_CFLAGS = @XDMCP_CFLAGS@ XDMCP_LIBS = @XDMCP_LIBS@ XERRORDB = @XERRORDB@ XKBPROTO_CFLAGS = @XKBPROTO_CFLAGS@ XKBPROTO_LIBS = @XKBPROTO_LIBS@ XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@ +XKB_FALSE = @XKB_FALSE@ +XKB_TRUE = @XKB_TRUE@ XKEYSYMDB = @XKEYSYMDB@ +XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@ +XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@ XLOCALEDATADIR = @XLOCALEDATADIR@ XLOCALEDIR = @XLOCALEDIR@ XLOCALELIBDIR = @XLOCALELIBDIR@ +XLOCALE_FALSE = @XLOCALE_FALSE@ +XLOCALE_TRUE = @XLOCALE_TRUE@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@ XPROTO_CFLAGS = @XPROTO_CFLAGS@ XPROTO_LIBS = @XPROTO_LIBS@ @@ -168,13 +192,17 @@ XTHREADS = @XTHREADS@ XTHREAD_CFLAGS = @XTHREAD_CFLAGS@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -186,39 +214,28 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -builddir = @builddir@ datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ -localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ -psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ libmandir = $(LIB_MAN_DIR) LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%) libman_PRE = \ @@ -428,6 +445,7 @@ libman_PRE = \ @MANPAGES_TRUE@libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) EXTRA_DIST = $(libman_PRE) CLEANFILES = $(libman_DATA) +SED = sed SUFFIXES = .pre .$(LIB_MAN_SUFFIX) .man WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@ CPP_FILES_FLAGS = $(WCHAR32_FLAGS) @@ -490,9 +508,13 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: install-libmanDATA: $(libman_DATA) @$(NORMAL_INSTALL) - test -z "$(libmandir)" || $(MKDIR_P) "$(DESTDIR)$(libmandir)" + test -z "$(libmandir)" || $(mkdir_p) "$(DESTDIR)$(libmandir)" @list='$(libman_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -515,21 +537,23 @@ CTAGS: distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ + $(mkdir_p) $(distdir)/../.. + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -545,7 +569,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(libmandir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -578,7 +602,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic +distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am @@ -592,20 +616,12 @@ info-am: install-data-am: install-libmanDATA -install-dvi: install-dvi-am - 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 - installcheck-am: maintainer-clean: maintainer-clean-am @@ -624,21 +640,17 @@ ps: ps-am ps-am: -uninstall-am: uninstall-libmanDATA - -.MAKE: install-am install-strip +uninstall-am: uninstall-info-am uninstall-libmanDATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ + install-data install-data-am install-exec install-exec-am \ install-info install-info-am install-libmanDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-libmanDATA + uninstall uninstall-am uninstall-info-am uninstall-libmanDATA # Allow people to comment out lines by starting them with '##' diff --git a/lib/libX11/nls/C/Makefile.in b/lib/libX11/nls/C/Makefile.in index e994b4ad8..9cf6a772f 100644 --- a/lib/libX11/nls/C/Makefile.in +++ b/lib/libX11/nls/C/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/Makefile.in b/lib/libX11/nls/Makefile.in index 82ad2bbb5..c90939bcb 100644 --- a/lib/libX11/nls/Makefile.in +++ b/lib/libX11/nls/Makefile.in @@ -661,8 +661,9 @@ uninstall-info: uninstall-info-recursive uninstall-x11localeDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ locale.alias: locale.alias.pre $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.alias.pre | $(CPP_SED_MAGIC) > locale.alias.l1 diff --git a/lib/libX11/nls/armscii-8/Makefile.in b/lib/libX11/nls/armscii-8/Makefile.in index 630d6994f..9d4fb7cfd 100644 --- a/lib/libX11/nls/armscii-8/Makefile.in +++ b/lib/libX11/nls/armscii-8/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/el_GR.UTF-8/Makefile.in b/lib/libX11/nls/el_GR.UTF-8/Makefile.in index 850a1e0f2..ad8cf076c 100644 --- a/lib/libX11/nls/el_GR.UTF-8/Makefile.in +++ b/lib/libX11/nls/el_GR.UTF-8/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/en_US.UTF-8/Makefile.in b/lib/libX11/nls/en_US.UTF-8/Makefile.in index 08e2b1196..12e48c0d2 100644 --- a/lib/libX11/nls/en_US.UTF-8/Makefile.in +++ b/lib/libX11/nls/en_US.UTF-8/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/georgian-academy/Makefile.in b/lib/libX11/nls/georgian-academy/Makefile.in index 653d3996d..1fdb21345 100644 --- a/lib/libX11/nls/georgian-academy/Makefile.in +++ b/lib/libX11/nls/georgian-academy/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/georgian-ps/Makefile.in b/lib/libX11/nls/georgian-ps/Makefile.in index 48ef67062..be362ae3a 100644 --- a/lib/libX11/nls/georgian-ps/Makefile.in +++ b/lib/libX11/nls/georgian-ps/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/ibm-cp1133/Makefile.in b/lib/libX11/nls/ibm-cp1133/Makefile.in index 544305c75..ea7384d1f 100644 --- a/lib/libX11/nls/ibm-cp1133/Makefile.in +++ b/lib/libX11/nls/ibm-cp1133/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/iscii-dev/Makefile.in b/lib/libX11/nls/iscii-dev/Makefile.in index 0f366125a..2d7a65f92 100644 --- a/lib/libX11/nls/iscii-dev/Makefile.in +++ b/lib/libX11/nls/iscii-dev/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/isiri-3342/Makefile.in b/lib/libX11/nls/isiri-3342/Makefile.in index 94136643f..c38792f32 100644 --- a/lib/libX11/nls/isiri-3342/Makefile.in +++ b/lib/libX11/nls/isiri-3342/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/iso8859-1/Makefile.in b/lib/libX11/nls/iso8859-1/Makefile.in index 378702377..40e3dcccf 100644 --- a/lib/libX11/nls/iso8859-1/Makefile.in +++ b/lib/libX11/nls/iso8859-1/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/iso8859-10/Makefile.in b/lib/libX11/nls/iso8859-10/Makefile.in index f5809200b..705c8fefe 100644 --- a/lib/libX11/nls/iso8859-10/Makefile.in +++ b/lib/libX11/nls/iso8859-10/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/iso8859-11/Makefile.in b/lib/libX11/nls/iso8859-11/Makefile.in index 954fba673..4660bf16d 100644 --- a/lib/libX11/nls/iso8859-11/Makefile.in +++ b/lib/libX11/nls/iso8859-11/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/iso8859-13/Makefile.in b/lib/libX11/nls/iso8859-13/Makefile.in index be41fefdc..17f3c7679 100644 --- a/lib/libX11/nls/iso8859-13/Makefile.in +++ b/lib/libX11/nls/iso8859-13/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/iso8859-14/Makefile.in b/lib/libX11/nls/iso8859-14/Makefile.in index 883f9ff4b..152797266 100644 --- a/lib/libX11/nls/iso8859-14/Makefile.in +++ b/lib/libX11/nls/iso8859-14/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/iso8859-15/Makefile.in b/lib/libX11/nls/iso8859-15/Makefile.in index 937c724b6..e2a4c1bf5 100644 --- a/lib/libX11/nls/iso8859-15/Makefile.in +++ b/lib/libX11/nls/iso8859-15/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/iso8859-2/Makefile.in b/lib/libX11/nls/iso8859-2/Makefile.in index 8c0cecfe7..fcb24816e 100644 --- a/lib/libX11/nls/iso8859-2/Makefile.in +++ b/lib/libX11/nls/iso8859-2/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/iso8859-3/Makefile.in b/lib/libX11/nls/iso8859-3/Makefile.in index 51e5662fa..626c77118 100644 --- a/lib/libX11/nls/iso8859-3/Makefile.in +++ b/lib/libX11/nls/iso8859-3/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/iso8859-4/Makefile.in b/lib/libX11/nls/iso8859-4/Makefile.in index c507455d7..c398bc117 100644 --- a/lib/libX11/nls/iso8859-4/Makefile.in +++ b/lib/libX11/nls/iso8859-4/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/iso8859-5/Makefile.in b/lib/libX11/nls/iso8859-5/Makefile.in index 145d6332b..cb8adf731 100644 --- a/lib/libX11/nls/iso8859-5/Makefile.in +++ b/lib/libX11/nls/iso8859-5/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/iso8859-6/Makefile.in b/lib/libX11/nls/iso8859-6/Makefile.in index c9108004a..642e87149 100644 --- a/lib/libX11/nls/iso8859-6/Makefile.in +++ b/lib/libX11/nls/iso8859-6/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/iso8859-7/Makefile.in b/lib/libX11/nls/iso8859-7/Makefile.in index 5d795d184..4f9dc1b59 100644 --- a/lib/libX11/nls/iso8859-7/Makefile.in +++ b/lib/libX11/nls/iso8859-7/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/iso8859-8/Makefile.in b/lib/libX11/nls/iso8859-8/Makefile.in index 11c9baf3d..ef1387e91 100644 --- a/lib/libX11/nls/iso8859-8/Makefile.in +++ b/lib/libX11/nls/iso8859-8/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/iso8859-9/Makefile.in b/lib/libX11/nls/iso8859-9/Makefile.in index 268598df7..777b63025 100644 --- a/lib/libX11/nls/iso8859-9/Makefile.in +++ b/lib/libX11/nls/iso8859-9/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/iso8859-9e/Makefile.in b/lib/libX11/nls/iso8859-9e/Makefile.in index 1475743df..ff9166773 100644 --- a/lib/libX11/nls/iso8859-9e/Makefile.in +++ b/lib/libX11/nls/iso8859-9e/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/ja.JIS/Makefile.in b/lib/libX11/nls/ja.JIS/Makefile.in index ea8610b48..cb987e471 100644 --- a/lib/libX11/nls/ja.JIS/Makefile.in +++ b/lib/libX11/nls/ja.JIS/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/ja.S90/Makefile.in b/lib/libX11/nls/ja.S90/Makefile.in index bcbf78b38..78d2a2c49 100644 --- a/lib/libX11/nls/ja.S90/Makefile.in +++ b/lib/libX11/nls/ja.S90/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/ja.SJIS/Makefile.in b/lib/libX11/nls/ja.SJIS/Makefile.in index ca4bcec60..252ca7322 100644 --- a/lib/libX11/nls/ja.SJIS/Makefile.in +++ b/lib/libX11/nls/ja.SJIS/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/ja.U90/Makefile.in b/lib/libX11/nls/ja.U90/Makefile.in index ccfcae3c0..7d7b60068 100644 --- a/lib/libX11/nls/ja.U90/Makefile.in +++ b/lib/libX11/nls/ja.U90/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/ja/Makefile.in b/lib/libX11/nls/ja/Makefile.in index 7d53c848a..1bc64363a 100644 --- a/lib/libX11/nls/ja/Makefile.in +++ b/lib/libX11/nls/ja/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/ja_JP.UTF-8/Makefile.in b/lib/libX11/nls/ja_JP.UTF-8/Makefile.in index 17994dae6..3e5e4c174 100644 --- a/lib/libX11/nls/ja_JP.UTF-8/Makefile.in +++ b/lib/libX11/nls/ja_JP.UTF-8/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/ko/Makefile.in b/lib/libX11/nls/ko/Makefile.in index a22cf0a12..a07453b42 100644 --- a/lib/libX11/nls/ko/Makefile.in +++ b/lib/libX11/nls/ko/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/ko_KR.UTF-8/Makefile.in b/lib/libX11/nls/ko_KR.UTF-8/Makefile.in index 4ca454339..48e900135 100644 --- a/lib/libX11/nls/ko_KR.UTF-8/Makefile.in +++ b/lib/libX11/nls/ko_KR.UTF-8/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/koi8-c/Makefile.in b/lib/libX11/nls/koi8-c/Makefile.in index 2d3223241..34b1bf93b 100644 --- a/lib/libX11/nls/koi8-c/Makefile.in +++ b/lib/libX11/nls/koi8-c/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/koi8-r/Makefile.in b/lib/libX11/nls/koi8-r/Makefile.in index 0d4ad5563..0c3ad963b 100644 --- a/lib/libX11/nls/koi8-r/Makefile.in +++ b/lib/libX11/nls/koi8-r/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/koi8-u/Makefile.in b/lib/libX11/nls/koi8-u/Makefile.in index 9547a89c7..bec54672c 100644 --- a/lib/libX11/nls/koi8-u/Makefile.in +++ b/lib/libX11/nls/koi8-u/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/microsoft-cp1251/Makefile.in b/lib/libX11/nls/microsoft-cp1251/Makefile.in index 3bbfa3647..9f27abfc0 100644 --- a/lib/libX11/nls/microsoft-cp1251/Makefile.in +++ b/lib/libX11/nls/microsoft-cp1251/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/microsoft-cp1255/Makefile.in b/lib/libX11/nls/microsoft-cp1255/Makefile.in index c8b75c0c3..b602339eb 100644 --- a/lib/libX11/nls/microsoft-cp1255/Makefile.in +++ b/lib/libX11/nls/microsoft-cp1255/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/microsoft-cp1256/Makefile.in b/lib/libX11/nls/microsoft-cp1256/Makefile.in index c0b664862..454d54516 100644 --- a/lib/libX11/nls/microsoft-cp1256/Makefile.in +++ b/lib/libX11/nls/microsoft-cp1256/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/mulelao-1/Makefile.in b/lib/libX11/nls/mulelao-1/Makefile.in index 026ff737d..80262dd3a 100644 --- a/lib/libX11/nls/mulelao-1/Makefile.in +++ b/lib/libX11/nls/mulelao-1/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/nokhchi-1/Makefile.in b/lib/libX11/nls/nokhchi-1/Makefile.in index ee7be288a..0fe1b2351 100644 --- a/lib/libX11/nls/nokhchi-1/Makefile.in +++ b/lib/libX11/nls/nokhchi-1/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/pt_BR.UTF-8/Makefile.in b/lib/libX11/nls/pt_BR.UTF-8/Makefile.in index 39b89c382..4b2192da7 100644 --- a/lib/libX11/nls/pt_BR.UTF-8/Makefile.in +++ b/lib/libX11/nls/pt_BR.UTF-8/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/tatar-cyr/Makefile.in b/lib/libX11/nls/tatar-cyr/Makefile.in index f0e5c397e..47079859d 100644 --- a/lib/libX11/nls/tatar-cyr/Makefile.in +++ b/lib/libX11/nls/tatar-cyr/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/th_TH.UTF-8/Makefile.in b/lib/libX11/nls/th_TH.UTF-8/Makefile.in index 238e2ff84..c35319642 100644 --- a/lib/libX11/nls/th_TH.UTF-8/Makefile.in +++ b/lib/libX11/nls/th_TH.UTF-8/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/th_TH/Makefile.in b/lib/libX11/nls/th_TH/Makefile.in index 4370ef080..ffad30711 100644 --- a/lib/libX11/nls/th_TH/Makefile.in +++ b/lib/libX11/nls/th_TH/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/tscii-0/Makefile.in b/lib/libX11/nls/tscii-0/Makefile.in index f7cde7825..9159a425e 100644 --- a/lib/libX11/nls/tscii-0/Makefile.in +++ b/lib/libX11/nls/tscii-0/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/vi_VN.tcvn/Makefile.in b/lib/libX11/nls/vi_VN.tcvn/Makefile.in index f41c61fa0..92ad0a2b9 100644 --- a/lib/libX11/nls/vi_VN.tcvn/Makefile.in +++ b/lib/libX11/nls/vi_VN.tcvn/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/vi_VN.viscii/Makefile.in b/lib/libX11/nls/vi_VN.viscii/Makefile.in index ca70b8bdb..12a5b48e2 100644 --- a/lib/libX11/nls/vi_VN.viscii/Makefile.in +++ b/lib/libX11/nls/vi_VN.viscii/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/zh_CN.UTF-8/Makefile.in b/lib/libX11/nls/zh_CN.UTF-8/Makefile.in index 9323125f1..3627639f2 100644 --- a/lib/libX11/nls/zh_CN.UTF-8/Makefile.in +++ b/lib/libX11/nls/zh_CN.UTF-8/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/zh_CN.gb18030/Makefile.in b/lib/libX11/nls/zh_CN.gb18030/Makefile.in index f3fed1618..7a9607a6d 100644 --- a/lib/libX11/nls/zh_CN.gb18030/Makefile.in +++ b/lib/libX11/nls/zh_CN.gb18030/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/zh_CN.gbk/Makefile.in b/lib/libX11/nls/zh_CN.gbk/Makefile.in index 58b29642d..55a0f199d 100644 --- a/lib/libX11/nls/zh_CN.gbk/Makefile.in +++ b/lib/libX11/nls/zh_CN.gbk/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/zh_CN/Makefile.in b/lib/libX11/nls/zh_CN/Makefile.in index c59444ed5..4e078d302 100644 --- a/lib/libX11/nls/zh_CN/Makefile.in +++ b/lib/libX11/nls/zh_CN/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/zh_HK.UTF-8/Makefile.in b/lib/libX11/nls/zh_HK.UTF-8/Makefile.in index e0e7ec696..17d0b46b9 100644 --- a/lib/libX11/nls/zh_HK.UTF-8/Makefile.in +++ b/lib/libX11/nls/zh_HK.UTF-8/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/zh_HK.big5/Makefile.in b/lib/libX11/nls/zh_HK.big5/Makefile.in index 967dba9ab..51e43c501 100644 --- a/lib/libX11/nls/zh_HK.big5/Makefile.in +++ b/lib/libX11/nls/zh_HK.big5/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/zh_HK.big5hkscs/Makefile.in b/lib/libX11/nls/zh_HK.big5hkscs/Makefile.in index 48c9d7032..e829e4a5d 100644 --- a/lib/libX11/nls/zh_HK.big5hkscs/Makefile.in +++ b/lib/libX11/nls/zh_HK.big5hkscs/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/zh_TW.UTF-8/Makefile.in b/lib/libX11/nls/zh_TW.UTF-8/Makefile.in index 27ee83465..3fae1b700 100644 --- a/lib/libX11/nls/zh_TW.UTF-8/Makefile.in +++ b/lib/libX11/nls/zh_TW.UTF-8/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/zh_TW.big5/Makefile.in b/lib/libX11/nls/zh_TW.big5/Makefile.in index db7f388e7..af595ac29 100644 --- a/lib/libX11/nls/zh_TW.big5/Makefile.in +++ b/lib/libX11/nls/zh_TW.big5/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/nls/zh_TW/Makefile.in b/lib/libX11/nls/zh_TW/Makefile.in index eb0794d1b..083cf7e3f 100644 --- a/lib/libX11/nls/zh_TW/Makefile.in +++ b/lib/libX11/nls/zh_TW/Makefile.in @@ -464,8 +464,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \ uninstall-x11thislocaleDATA +# Allow people to comment out lines by starting them with '##' .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@ # 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: diff --git a/lib/libX11/src/ImUtil.c b/lib/libX11/src/ImUtil.c index 9e667bb9c..d1df7ae28 100644 --- a/lib/libX11/src/ImUtil.c +++ b/lib/libX11/src/ImUtil.c @@ -307,20 +307,19 @@ void _XInitImageFuncPtrs ( * */ -XImage *XCreateImage (dpy, visual, depth, format, offset, data, width, height, - xpad, image_bytes_per_line) - register Display *dpy; - register Visual *visual; - unsigned int depth; - int format; - int offset; /*How many pixels from the start of the data does the +XImage *XCreateImage ( + register Display *dpy, + register Visual *visual, + unsigned int depth, + int format, + int offset, /*How many pixels from the start of the data does the picture to be transmitted start?*/ - char *data; - unsigned int width; - unsigned int height; - int xpad; - int image_bytes_per_line; + char *data, + unsigned int width, + unsigned int height, + int xpad, + int image_bytes_per_line) /*How many bytes between a pixel on one line and the pixel with the same X coordinate on the next line? 0 means XCreateImage can calculate it.*/ @@ -387,8 +386,7 @@ XImage *XCreateImage (dpy, visual, depth, format, offset, data, width, height, return image; } -Status XInitImage (image) - XImage *image; +Status XInitImage (XImage *image) { int min_bytes_per_line; @@ -435,9 +433,7 @@ Status XInitImage (image) * entirely by the library. */ -static int _XDestroyImage (ximage) - XImage *ximage; - +static int _XDestroyImage (XImage *ximage) { if (ximage->data != NULL) Xfree((char *)ximage->data); if (ximage->obdata != NULL) Xfree((char *)ximage->obdata); @@ -472,10 +468,10 @@ static unsigned long const low_bits_table[] = { 0xffffffff }; -static unsigned long _XGetPixel (ximage, x, y) - register XImage *ximage; - int x; - int y; +static unsigned long _XGetPixel ( + register XImage *ximage, + int x, + int y) { unsigned long pixel, px; @@ -537,10 +533,10 @@ static unsigned long _XGetPixel (ximage, x, y) static CARD32 const byteorderpixel = MSBFirst << 24; #endif -static unsigned long _XGetPixel32 (ximage, x, y) - register XImage *ximage; - int x; - int y; +static unsigned long _XGetPixel32 ( + register XImage *ximage, + int x, + int y) { register unsigned char *addr; unsigned long pixel; @@ -572,10 +568,10 @@ static unsigned long _XGetPixel32 (ximage, x, y) } } -static unsigned long _XGetPixel16 (ximage, x, y) - register XImage *ximage; - int x; - int y; +static unsigned long _XGetPixel16 ( + register XImage *ximage, + int x, + int y) { register unsigned char *addr; unsigned long pixel; @@ -596,10 +592,10 @@ static unsigned long _XGetPixel16 (ximage, x, y) } } -static unsigned long _XGetPixel8 (ximage, x, y) - register XImage *ximage; - int x; - int y; +static unsigned long _XGetPixel8 ( + register XImage *ximage, + int x, + int y) { unsigned char pixel; @@ -615,10 +611,10 @@ static unsigned long _XGetPixel8 (ximage, x, y) } } -static unsigned long _XGetPixel1 (ximage, x, y) - register XImage *ximage; - int x; - int y; +static unsigned long _XGetPixel1 ( + register XImage *ximage, + int x, + int y) { unsigned char bit; int xoff, yoff; @@ -655,11 +651,11 @@ static unsigned long _XGetPixel1 (ximage, x, y) * */ -static int _XPutPixel (ximage, x, y, pixel) - register XImage *ximage; - int x; - int y; - unsigned long pixel; +static int _XPutPixel ( + register XImage *ximage, + int x, + int y, + unsigned long pixel) { unsigned long px, npixel; @@ -728,11 +724,11 @@ static int _XPutPixel (ximage, x, y, pixel) return 1; } -static int _XPutPixel32 (ximage, x, y, pixel) - register XImage *ximage; - int x; - int y; - unsigned long pixel; +static int _XPutPixel32 ( + register XImage *ximage, + int x, + int y, + unsigned long pixel) { unsigned char *addr; @@ -762,11 +758,11 @@ static int _XPutPixel32 (ximage, x, y, pixel) } } -static int _XPutPixel16 (ximage, x, y, pixel) - register XImage *ximage; - int x; - int y; - unsigned long pixel; +static int _XPutPixel16 ( + register XImage *ximage, + int x, + int y, + unsigned long pixel) { unsigned char *addr; @@ -787,11 +783,11 @@ static int _XPutPixel16 (ximage, x, y, pixel) } } -static int _XPutPixel8 (ximage, x, y, pixel) - register XImage *ximage; - int x; - int y; - unsigned long pixel; +static int _XPutPixel8 ( + register XImage *ximage, + int x, + int y, + unsigned long pixel) { if ((ximage->format == ZPixmap) && (ximage->bits_per_pixel == 8)) { ximage->data[y * ximage->bytes_per_line + x] = pixel; @@ -802,11 +798,11 @@ static int _XPutPixel8 (ximage, x, y, pixel) } } -static int _XPutPixel1 (ximage, x, y, pixel) - register XImage *ximage; - int x; - int y; - unsigned long pixel; +static int _XPutPixel1 ( + register XImage *ximage, + int x, + int y, + unsigned long pixel) { unsigned char bit; int xoff, yoff; @@ -841,12 +837,12 @@ static int _XPutPixel1 (ximage, x, y, pixel) * */ -static XImage *_XSubImage (ximage, x, y, width, height) - XImage *ximage; - register int x; /* starting x coordinate in existing image */ - register int y; /* starting y coordinate in existing image */ - unsigned int width; /* width in pixels of new subimage */ - unsigned int height;/* height in pixels of new subimage */ +static XImage *_XSubImage ( + XImage *ximage, + register int x, /* starting x coordinate in existing image */ + register int y, /* starting y coordinate in existing image */ + unsigned int width, /* width in pixels of new subimage */ + unsigned int height)/* height in pixels of new subimage */ { register XImage *subimage; @@ -973,9 +969,9 @@ int _XSetImage( */ static int -_XAddPixel (ximage, value) - register XImage *ximage; - register long value; +_XAddPixel ( + register XImage *ximage, + register long value) { register int x; register int y; diff --git a/lib/libX11/src/Makefile.in b/lib/libX11/src/Makefile.in index 96ec306eb..fa1e8f58b 100644 --- a/lib/libX11/src/Makefile.in +++ b/lib/libX11/src/Makefile.in @@ -1227,7 +1227,7 @@ ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT) mv ks_tables_h $@ $(top_builddir)/src/util/makekeys$(EXEEXT): force - cd util; $(MAKE) + cd util && $(MAKE) force: # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib/libX11/src/config.h.in b/lib/libX11/src/config.h.in index af45e2fd3..80093dd12 100644 --- a/lib/libX11/src/config.h.in +++ b/lib/libX11/src/config.h.in @@ -173,3 +173,6 @@ /* Whether libX11 needs to use MT safe API's */ #undef XUSE_MTSAFE_API + +/* Enable GNU and other extensions to the C environment for glibc */ +#undef _GNU_SOURCE |