diff options
131 files changed, 620 insertions, 718 deletions
diff --git a/libX11/COPYING b/libX11/COPYING index e15e3ecab..df1e85a69 100644 --- a/libX11/COPYING +++ b/libX11/COPYING @@ -13,7 +13,7 @@ to that file. Copyright (C) 2003-2006,2008 Jamey Sharp, Josh Triplett
Copyright © 2009 Red Hat, Inc.
-Copyright 1990-1992,1999,2000,2004,2009 Oracle and/or its affiliates.
+Copyright 1990-1992,1999,2000,2004,2009,2010 Oracle and/or its affiliates.
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/libX11/configure.ac b/libX11/configure.ac index ce74112fd..f174f31e1 100644 --- a/libX11/configure.ac +++ b/libX11/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.60)
AC_INIT([libX11],
- 1.3.99.901,
+ 1.3.99.902,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libX11)
AC_CONFIG_SRCDIR([Makefile.am])
@@ -67,7 +67,7 @@ if test x"$LDFLAGS_FOR_BUILD" = x; then fi
AC_SUBST(LDFLAGS_FOR_BUILD)
-# Find perl for "make check" tests in nls/localerules.in
+# Find perl for "make check" tests in nls/Makefile.am
AC_ARG_WITH(perl,
AC_HELP_STRING([--with-perl=<path>],
[path to perl interpreter for build-time tests]),
@@ -462,66 +462,6 @@ AC_OUTPUT([Makefile modules/om/generic/Makefile
src/xkb/Makefile
nls/Makefile
- nls/am_ET.UTF-8/Makefile
- nls/armscii-8/Makefile
- nls/C/Makefile
- nls/el_GR.UTF-8/Makefile
- nls/en_US.UTF-8/Makefile
- nls/fi_FI.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/ru_RU.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
specs/Makefile
specs/i18n/Makefile
specs/i18n/framework/Makefile
@@ -544,7 +484,6 @@ echo " Internationalization support: "$XLOCALE echo " XF86BigFont support: "$XF86BIGFONT
echo " XKB support: "$XKB
echo " XLOCALEDIR environment variable support: "$ENABLE_XLOCALEDIR
-echo " Manual pages suffix: "$LIB_MAN_SUFFIX
echo " Compose table cache enabled: "$COMPOSECACHE
echo " Functional specs building enabled: "$build_specs
echo ""
diff --git a/libX11/cpprules.in b/libX11/cpprules.in index 845e242e6..6640bbfd9 100644 --- a/libX11/cpprules.in +++ b/libX11/cpprules.in @@ -1,29 +1,29 @@ -# -*- Makefile -*- -# Rules for generating files using the C pre-processor -# (Replaces CppFileTarget from Imake) - -SED = sed - -SUFFIXES = .pre - -WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@ - -CPP_FILES_FLAGS = $(WCHAR32_FLAGS) - -# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM -# to cpp, because that trick does not work on all ANSI C preprocessors. -# Delete line numbers from the cpp output (-P is not portable, I guess). -# Allow XCOMM to be preceded by whitespace and provide a means of generating -# output lines with trailing backslashes. -# Allow XHASH to always be substituted, even in cases where XCOMM isn't. - -CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ - -e '/^\#line *[0-9][0-9]* *.*$$/d' \ - -e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \ - -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \ - -e '/^[ ]*XHASH/s/XHASH/\#/' \ - -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \ - -e '/\@\@$$/s/\@\@$$/\\/' - -.pre: - $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ +# -*- Makefile -*-
+# Rules for generating files using the C pre-processor
+# (Replaces CppFileTarget from Imake)
+
+SED = sed
+
+SUFFIXES += .pre
+
+WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
+
+CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
+
+# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM
+# to cpp, because that trick does not work on all ANSI C preprocessors.
+# Delete line numbers from the cpp output (-P is not portable, I guess).
+# Allow XCOMM to be preceded by whitespace and provide a means of generating
+# output lines with trailing backslashes.
+# Allow XHASH to always be substituted, even in cases where XCOMM isn't.
+
+CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
+ -e '/^\#line *[0-9][0-9]* *.*$$/d' \
+ -e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \
+ -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
+ -e '/^[ ]*XHASH/s/XHASH/\#/' \
+ -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
+ -e '/\@\@$$/s/\@\@$$/\\/'
+
+.pre:
+ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
diff --git a/libX11/cpprules.mak b/libX11/cpprules.mak new file mode 100644 index 000000000..25e6e259b --- /dev/null +++ b/libX11/cpprules.mak @@ -0,0 +1,18 @@ +
+ifdef x11thislocaledir
+
+$(x11thislocaledir)\%: %.pre
+ cl /nologo /EP $< -DXCOMM\#\# > $@
+
+$(x11thislocaledir):
+ $(CREATEDIR)
+
+all: $(x11thislocaledir)
+endif
+
+$(reparse $(locales:%=$(X11_LOCALEDATADIR)\%\XLC_LOCALE : %\XLC_LOCALE.pre; cl /nologo /EP $$< -DXCOMM\#\# > $$@;; ))
+
+$(reparse $(locales:%=$(X11_LOCALEDATADIR)\%\Compose : %\Compose.pre; cl /nologo /EP $$< -DXCOMM\#\# > $$@;; ))
+
+$(reparse $(locales:%=$(X11_LOCALEDATADIR)\%\XI18N_OBJS : %\XI18N_OBJS; copy $$< $$@;; ))
+
diff --git a/libX11/nls/C/Makefile.am b/libX11/nls/C/Makefile.am deleted file mode 100644 index c4826e2eb..000000000 --- a/libX11/nls/C/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/C - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/C/makefile b/libX11/nls/C/makefile deleted file mode 100644 index 69d26a1fe..000000000 --- a/libX11/nls/C/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\C - -all: $(x11thislocaledir)\XLC_LOCALE diff --git a/libX11/nls/Makefile.am b/libX11/nls/Makefile.am index 076bf31ad..4c7f57797 100644 --- a/libX11/nls/Makefile.am +++ b/libX11/nls/Makefile.am @@ -1,94 +1,149 @@ -x11localedir = $(X11_LOCALEDATADIR) - -EXTRA_DIST = locale.alias.pre compose.dir.pre locale.dir.pre \ - compose-check.pl - -x11locale_DATA = locale.alias locale.dir compose.dir - -CLEANFILES= \ - locale.alias locale.alias.l1 locale.alias.l2 \ - compose.dir compose.dir.l1 compose.dir.l2 \ - locale.dir locale.dir.l1 locale.dir.l2 \ - XLC_LOCALE - -SUBDIRS= \ - am_ET.UTF-8 \ - armscii-8 \ - C \ - el_GR.UTF-8 \ - en_US.UTF-8 \ - fi_FI.UTF-8 \ - georgian-academy \ - georgian-ps \ - ibm-cp1133 \ - iscii-dev \ - isiri-3342 \ - iso8859-1 \ - iso8859-10 \ - iso8859-11 \ - iso8859-13 \ - iso8859-14 \ - iso8859-15 \ - iso8859-2 \ - iso8859-3 \ - iso8859-4 \ - iso8859-5 \ - iso8859-6 \ - iso8859-7 \ - iso8859-8 \ - iso8859-9 \ - iso8859-9e \ - ja \ - ja.JIS \ - ja_JP.UTF-8 \ - ja.S90 \ - ja.SJIS \ - ja.U90 \ - ko \ - koi8-c \ - koi8-r \ - koi8-u \ - ko_KR.UTF-8 \ - microsoft-cp1251 \ - microsoft-cp1255 \ - microsoft-cp1256 \ - mulelao-1 \ - nokhchi-1 \ - pt_BR.UTF-8 \ - ru_RU.UTF-8 \ - tatar-cyr \ - th_TH \ - th_TH.UTF-8 \ - tscii-0 \ - vi_VN.tcvn \ - vi_VN.viscii \ - zh_CN \ - zh_CN.gb18030 \ - zh_CN.gbk \ - zh_CN.UTF-8 \ - zh_HK.big5 \ - zh_HK.big5hkscs \ - zh_HK.UTF-8 \ - zh_TW \ - zh_TW.big5 \ - zh_TW.UTF-8 - -include $(top_srcdir)/cpprules.in - -locale.alias: locale.alias.pre - $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.alias.pre | $(CPP_SED_MAGIC) > locale.alias.l1 - sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \ - < locale.alias.l1 > locale.alias.l2 - cat locale.alias.l2 locale.alias.l1 > locale.alias - -compose.dir: compose.dir.pre - $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/compose.dir.pre | $(CPP_SED_MAGIC) > compose.dir.l1 - sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \ - < compose.dir.l1 > compose.dir.l2 - cat compose.dir.l2 compose.dir.l1 > compose.dir - -locale.dir: locale.dir.pre - $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.dir.pre | $(CPP_SED_MAGIC) > locale.dir.l1 - sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \ - < locale.dir.l1 > locale.dir.l2 - cat locale.dir.l2 locale.dir.l1 > locale.dir +x11localedir = $(X11_LOCALEDATADIR)
+specdir = $(docdir)/Compose
+
+include $(top_srcdir)/specs/xmlrules.in
+
+EXTRA_DIST = locale.alias.pre compose.dir.pre locale.dir.pre \
+ compose-check.pl compose-chart.pl
+
+x11locale_DATA = locale.alias locale.dir compose.dir
+
+CLEANFILES += \
+ locale.alias locale.alias.l1 locale.alias.l2 \
+ compose.dir compose.dir.l1 compose.dir.l2 \
+ locale.dir locale.dir.l1 locale.dir.l2 \
+ XLC_LOCALE
+
+locales = \
+ am_ET.UTF-8 \
+ armscii-8 \
+ C \
+ el_GR.UTF-8 \
+ en_US.UTF-8 \
+ fi_FI.UTF-8 \
+ georgian-academy \
+ georgian-ps \
+ ibm-cp1133 \
+ iscii-dev \
+ isiri-3342 \
+ iso8859-1 \
+ iso8859-10 \
+ iso8859-11 \
+ iso8859-13 \
+ iso8859-14 \
+ iso8859-15 \
+ iso8859-2 \
+ iso8859-3 \
+ iso8859-4 \
+ iso8859-5 \
+ iso8859-6 \
+ iso8859-7 \
+ iso8859-8 \
+ iso8859-9 \
+ iso8859-9e \
+ ja \
+ ja.JIS \
+ ja_JP.UTF-8 \
+ ja.S90 \
+ ja.SJIS \
+ ja.U90 \
+ ko \
+ koi8-c \
+ koi8-r \
+ koi8-u \
+ ko_KR.UTF-8 \
+ microsoft-cp1251 \
+ microsoft-cp1255 \
+ microsoft-cp1256 \
+ mulelao-1 \
+ nokhchi-1 \
+ pt_BR.UTF-8 \
+ ru_RU.UTF-8 \
+ tatar-cyr \
+ th_TH \
+ th_TH.UTF-8 \
+ tscii-0 \
+ vi_VN.tcvn \
+ vi_VN.viscii \
+ zh_CN \
+ zh_CN.gb18030 \
+ zh_CN.gbk \
+ zh_CN.UTF-8 \
+ zh_HK.big5 \
+ zh_HK.big5hkscs \
+ zh_HK.UTF-8 \
+ zh_TW \
+ zh_TW.big5 \
+ zh_TW.UTF-8
+
+include $(top_srcdir)/cpprules.in
+
+# Global data files
+
+locale.alias: locale.alias.pre
+ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.alias.pre | $(CPP_SED_MAGIC) > locale.alias.l1
+ sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \
+ < locale.alias.l1 > locale.alias.l2
+ cat locale.alias.l2 locale.alias.l1 > locale.alias
+
+compose.dir: compose.dir.pre
+ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/compose.dir.pre | $(CPP_SED_MAGIC) > compose.dir.l1
+ sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \
+ < compose.dir.l1 > compose.dir.l2
+ cat compose.dir.l2 compose.dir.l1 > compose.dir
+
+locale.dir: locale.dir.pre
+ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.dir.pre | $(CPP_SED_MAGIC) > locale.dir.l1
+ sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \
+ < locale.dir.l1 > locale.dir.l2
+ cat locale.dir.l2 locale.dir.l1 > locale.dir
+
+if HAVE_PERL
+doc_sources = Compose/index.xml
+
+Compose/index.xml: Compose
+ $(AM_V_GEN)$(PERL) $(srcdir)/compose-chart.pl \
+ --index --output="$@" $(locales)
+
+Compose:
+ $(MKDIR_P) $@
+
+clean-local: clean-Compose-dir
+clean-Compose-dir:
+ -rm -rf Compose
+endif HAVE_PERL
+
+
+# Per-locale data files
+
+nobase_dist_x11locale_DATA = $(locales:%=%/XI18N_OBJS)
+
+nobase_x11locale_DATA = $(locales:%=%/XLC_LOCALE) $(locales:%=%/Compose)
+EXTRA_DIST += $(nobase_x11locale_DATA:%=%.pre)
+CLEANFILES += $(nobase_x11locale_DATA)
+
+$(nobase_x11locale_DATA): builddirs
+
+builddirs:
+ $(MKDIR_P) $(locales)
+
+if HAVE_PERL
+TESTS_ENVIRONMENT = $(PERL)
+TESTS = $(srcdir)/compose-check.pl
+
+COMPOSE_CHARTS = $(locales:%=%/Compose.xml)
+doc_sources += $(locales:%=Compose/%.xml)
+CLEANFILES += $(COMPOSE_CHARTS) $(doc_sources)
+
+XMLTO_FLAGS += -o $(@D)
+
+%/Compose.xml: %/Compose
+ $(AM_V_GEN)$(PERL) $(srcdir)/compose-chart.pl \
+ --locale="$(@D)" --output="$@" $<
+
+Compose/%.xml: %/Compose.xml
+ $(AM_V_GEN)cp $< $@
+
+$(doc_sources): Compose
+
+endif HAVE_PERL
diff --git a/libX11/nls/am_ET.UTF-8/Makefile.am b/libX11/nls/am_ET.UTF-8/Makefile.am deleted file mode 100644 index a2904fbdc..000000000 --- a/libX11/nls/am_ET.UTF-8/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/am_ET.UTF-8 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/am_ET.UTF-8/makefile b/libX11/nls/am_ET.UTF-8/makefile deleted file mode 100644 index d36631a31..000000000 --- a/libX11/nls/am_ET.UTF-8/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\am_ET.UTF-8 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/armscii-8/Makefile.am b/libX11/nls/armscii-8/Makefile.am deleted file mode 100644 index 45b00e742..000000000 --- a/libX11/nls/armscii-8/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/armscii-8 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/armscii-8/makefile b/libX11/nls/armscii-8/makefile deleted file mode 100644 index 7ef44af01..000000000 --- a/libX11/nls/armscii-8/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\armscii-8 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/compose-chart.pl b/libX11/nls/compose-chart.pl new file mode 100644 index 000000000..b9b6ff916 --- /dev/null +++ b/libX11/nls/compose-chart.pl @@ -0,0 +1,389 @@ +#! /usr/bin/perl
+#
+# Copyright 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+
+#
+# Make a DocBook chart showing compose combinations for a locale
+#
+# See perldoc at end (or run with --help or --man options) for details
+# of command-line options.
+#
+
+# Compose file grammar is defined in modules/im/ximcp/imLcPrs.c
+
+use strict;
+use warnings;
+use Getopt::Long;
+use Pod::Usage;
+
+my $error_count = 0;
+
+my $charset;
+my $locale_name;
+my $output_filename = '-';
+my $man = 0;
+my $help = 0;
+my $make_index = 0;
+
+GetOptions ('charset:s' => \$charset,
+ 'locale=s' => \$locale_name,
+ 'output=s' => \$output_filename,
+ 'index' => \$make_index,
+ 'help|?' => \$help,
+ 'man' => \$man)
+ or pod2usage(2);
+pod2usage(1) if $help;
+pod2usage(-exitstatus => 0, -verbose => 2) if $man;
+
+if (!defined($charset) || ($charset eq "")) {
+ if (defined($locale_name)) {
+ my $guessed_charset = $locale_name;
+ $guessed_charset =~ s{^.*\.}{};
+ if ($guessed_charset =~ m{^(utf-8|gbk|gb18030)$}i) {
+ $charset = $1;
+ } elsif ($guessed_charset =~ m{iso8859-(\d+)}i) {
+ $charset = "iso-8859-$1";
+ } elsif ($guessed_charset =~ m{^microsoft-cp(125\d)$}) {
+ $charset = "windows-$1";
+ }
+ }
+ if (!defined($charset) || ($charset eq "")) {
+ $charset = "utf-8";
+ }
+}
+
+if ($make_index) {
+ # Print Docbook output
+ open my $OUTPUT, '>', $output_filename
+ or die "Could not create $output_filename: $!";
+
+ print $OUTPUT
+ join ("\n",
+ qq(<?xml version="1.0" encoding="$charset" ?>),
+ q(<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"),
+ q( "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">),
+ q(<article id="compose-index">),
+ q(<simplesect>),
+ q(<title>Xlib Compose Key Charts</title>),
+ q(<simplelist type='horiz' columns='3'>),
+ ( map { qq(<member><ulink url="$_.html">$_</ulink></member>) }
+ @ARGV ),
+ q(</simplelist>),
+ q(</simplesect>),
+ q(</article>),
+ "\n"
+ );
+
+ close $OUTPUT or die "Couldn't write $output_filename: $!";
+
+ exit(0);
+}
+
+foreach my $a (@ARGV) {
+ $error_count += make_compose_chart($a);
+}
+
+exit($error_count);
+
+sub make_compose_chart {
+ my ($filename) = @_;
+ my $errors = 0;
+
+ my @compose_table = ();
+ my @included_files = ();
+
+ my $line = 0;
+ my $pre_file = ($filename =~ m{\.pre$}) ? 1 : 0;
+ my $in_c_comment = 0;
+ my $in_comment = 0;
+ my $keyseq_count = 0;
+
+ open my $COMPOSE, '<', $filename or die "Could not open $filename: $!";
+
+ COMPOSE_LINE:
+ while (my $cl = <$COMPOSE>) {
+ $line++;
+ chomp($cl);
+ my $original_line = $cl;
+
+ # Special handling for changes cpp makes to .pre files
+ if ($pre_file == 1) {
+ if ($in_c_comment) { # Look for end of multi-line C comment
+ if ($cl =~ m{\*/(.*)$}) {
+ $cl = $1;
+ $in_c_comment = 0;
+ } else {
+ next;
+ }
+ }
+ $cl =~ s{/\*.\**/}{}; # Remove single line C comments
+ if ($cl =~ m{^(.*)/\*}) { # Start of a multi-line C comment
+ $cl = $1;
+ $in_c_comment = 1;
+ }
+ $cl =~ s{^\s*XCOMM}{#}; # Translate pre-processing comments
+ }
+
+ chomp($cl);
+
+ if ($cl =~ m{^\s*#\s*(.*)$}) { # Comment only lines
+ # Combine commment blocks
+ my $comment = $1;
+
+ if ($in_comment) {
+ my $prev_comment = pop @compose_table;
+ $comment = join(' ', $prev_comment->{-comment}, $comment);
+ } else {
+ $in_comment = 1;
+ }
+
+ push @compose_table, { -type => 'comment', -comment => $comment };
+ next COMPOSE_LINE;
+ }
+
+ $in_comment = 0;
+
+ if ($cl =~ m{^\s*$}) { # Skip blank lines
+ next COMPOSE_LINE;
+ }
+ elsif ($cl =~ m{^(STATE\s+|END_STATE)}) {
+ # Sun extension to compose file syntax
+ next COMPOSE_LINE;
+ }
+ elsif ($cl =~ m{^([^:]+)\s*:\s*(.+)$}) {
+ my ($seq, $action) = ($1, $2);
+ $seq =~ s{\s+$}{};
+
+ my @keys = grep { $_ !~ m/^\s*$/ } split /[\s\<\>]+/, $seq;
+
+ push @compose_table, {
+ -type => 'keyseq',
+ -keys => [ @keys ],
+ -action => $action
+ };
+ $keyseq_count++;
+ next COMPOSE_LINE;
+ } elsif ($cl =~ m{^(STATE_TYPE:|\@StartDeadKeyMap|\@EndDeadKeyMap)}) {
+ # ignore
+ next COMPOSE_LINE;
+ } elsif ($cl =~ m{^include "(.*)"}) {
+ my $incpath = $1;
+ $incpath =~ s{^X11_LOCALEDATADIR/(.*)/Compose}{the $1 compose table};
+
+ push @included_files, $incpath;
+ next COMPOSE_LINE;
+ } else {
+ print STDERR ('Unrecognized pattern in ', $filename,
+ ' on line #', $line, ":\n ", $cl, "\n");
+ }
+ }
+ close $COMPOSE;
+
+ if ($errors > 0) {
+ return $errors;
+ }
+
+ # Print Docbook output
+ open my $OUTPUT, '>', $output_filename
+ or die "Could not create $output_filename: $!";
+
+ print $OUTPUT
+ join ("\n",
+ qq(<?xml version="1.0" encoding="$charset" ?>),
+ q(<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"),
+ q( "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">),
+ qq(<article id="$locale_name">),
+ q(<simplesect>),
+ qq(<title>Xlib Compose Keys for $locale_name</title>),
+ q(<para>Applications using Xlib input handling should recognize),
+ q( these compose key sequences in locales using the),
+ qq( $locale_name compose table.</para>),
+ "\n"
+ );
+
+ if (@included_files) {
+ print $OUTPUT
+ q(<para>This compose table includes the non-conflicting),
+ q( entries from: ),
+ join(',', @included_files),
+ q(. Those entries are not shown here - see those charts for the),
+ q( included key sequences.</para>),
+ "\n";
+ }
+
+ my @pretable_comments = ();
+
+ if ($keyseq_count == 0) {
+ @pretable_comments = @compose_table;
+ } elsif ($compose_table[0]->{-type} eq 'comment') {
+ push @pretable_comments, shift @compose_table;
+ }
+
+ foreach my $comment_ref (@pretable_comments) {
+ print $OUTPUT
+ qq(<para>), xml_escape($comment_ref->{-comment}), qq(</para>\n);
+ }
+
+ if ($keyseq_count > 0) {
+ start_table($OUTPUT);
+ my $row_count = 0;
+
+ foreach my $cr (@compose_table) {
+
+ if ($row_count++ > 750) {
+ # Break tables every 750 rows to avoid overflowing
+ # xmlto/xsltproc limits on the largest tables
+ end_table($OUTPUT);
+ start_table($OUTPUT);
+ $row_count = 0;
+ }
+
+ if ($cr->{-type} eq 'comment') {
+ print $OUTPUT
+ qq(<row><entry namest='seq' nameend='action'>),
+ xml_escape($cr->{-comment}), qq(</entry></row>\n);
+ } elsif ($cr->{-type} eq 'keyseq') {
+ my $action = join(" ", xml_escape($cr->{-action}));
+ if ($action =~ m{^\s*"\\([0-7]+)"}) {
+ my $char = oct($1);
+ if ($char >= 32) {
+ $action =~ s{^\s*"\\[0-7]+"}{"&#$char;"};
+ }
+ }
+ $action =~ s{^\s*"(.+)"}{"<literal>$1</literal>"};
+
+ print $OUTPUT
+ qq(<row><entry>),
+ qq(<keycombo action='seq'>),
+ (map { qq(<keysym>$_</keysym>) } xml_escape(@{$cr->{-keys}})),
+ qq(</keycombo>),
+ qq(</entry><entry>),
+ $action,
+ qq(</entry></row>\n);
+ }
+ }
+
+ end_table($OUTPUT);
+ } else {
+ print $OUTPUT
+ qq(<para><emphasis>),
+ qq(This compose table defines no sequences of its own.),
+ qq(</emphasis></para>\n);
+ }
+ print $OUTPUT "</simplesect>\n</article>\n";
+
+ close $OUTPUT or die "Couldn't write $output_filename: $!";
+
+ return $errors;
+}
+
+sub xml_escape {
+ my @output;
+
+ foreach my $l (@_) {
+ $l =~ s{\&}{&}g;
+ $l =~ s{\<}{<}g;
+ $l =~ s{\>}{>}g;
+ push @output, $l;
+ }
+ return @output;
+}
+
+sub start_table {
+ my ($OUTPUT) = @_;
+
+ print $OUTPUT
+ join("\n",
+ qq(<table><title>Compose Key Sequences for $locale_name</title>),
+ qq(<tgroup cols='2'>),
+ qq( <colspec colname='seq' /><colspec colname='action' />),
+ qq( <thead><row>),
+ qq( <entry>Key Sequence</entry><entry>Action</entry>),
+ qq( </row></thead>),
+ qq( <tbody>\n),
+ );
+}
+
+sub end_table {
+ my ($OUTPUT) = @_;
+
+ print $OUTPUT "</tbody>\n</tgroup>\n</table>\n";
+}
+
+__END__
+
+=head1 NAME
+
+compose-chart - Make DocBook/XML charts of compose table entries
+
+=head1 SYNOPSIS
+
+compose-chart [options] [file ...]
+
+ Options:
+ --charset[=<cset>] character set to specify in XML doctype
+ --locale=<locale> name of locale to display in chart
+ --output=<file> filename to output chart to
+ --index make index of charts instead of individual chart
+ --help brief help message
+ --man full documentation
+
+=head1 OPTIONS
+
+=over 8
+
+=item B<--charset>[=I<cset>]
+
+Specify a character set to list in the doctype declaration in the XML output.
+If not specified, attempts to guess from the locale name, else default to
+"utf-8".
+
+=item B<--locale>=I<locale>
+
+Specify the locale name to use in the chart titles and introductory text.
+
+=item B<--output>=I<file>
+
+Specify the output file to write the DocBook output to.
+
+=item B<--index>
+
+Generate an index of the listed locale charts instead of a chart for a
+specific locale.
+
+=item B<--help>
+
+Print a brief help message and exit.
+
+=item B<--man>
+
+Print the manual page and exit.
+
+=back
+
+=head1 DESCRIPTION
+
+This program will read the given compose table file(s) and generate
+DocBook/XML charts listing the available characters for end-user reference.
+
+=cut
diff --git a/libX11/nls/compose-check.pl b/libX11/nls/compose-check.pl index 5486bcbcb..a12db0c82 100644 --- a/libX11/nls/compose-check.pl +++ b/libX11/nls/compose-check.pl @@ -34,10 +34,15 @@ use warnings; my $error_count = 0;
if (scalar(@ARGV) == 0) {
- push @ARGV, "Compose";
+ if ( -f 'Compose' ) {
+ push @ARGV, 'Compose';
+ } else {
+ push @ARGV, glob '*/Compose';
+ }
}
foreach my $cf (@ARGV) {
+ # print "Checking $cf\n";
$error_count += check_compose_file($cf);
}
diff --git a/libX11/nls/el_GR.UTF-8/Makefile.am b/libX11/nls/el_GR.UTF-8/Makefile.am deleted file mode 100644 index 99aa86300..000000000 --- a/libX11/nls/el_GR.UTF-8/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/el_GR.UTF-8 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/el_GR.UTF-8/makefile b/libX11/nls/el_GR.UTF-8/makefile deleted file mode 100644 index d5aaaf17d..000000000 --- a/libX11/nls/el_GR.UTF-8/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\el_GR.UTF-8 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/en_US.UTF-8/Makefile.am b/libX11/nls/en_US.UTF-8/Makefile.am deleted file mode 100644 index c364315ab..000000000 --- a/libX11/nls/en_US.UTF-8/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/en_US.UTF-8 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/en_US.UTF-8/makefile b/libX11/nls/en_US.UTF-8/makefile deleted file mode 100644 index 30179f391..000000000 --- a/libX11/nls/en_US.UTF-8/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\en_US.UTF-8 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/fi_FI.UTF-8/Makefile.am b/libX11/nls/fi_FI.UTF-8/Makefile.am deleted file mode 100644 index 800e800ec..000000000 --- a/libX11/nls/fi_FI.UTF-8/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/fi_FI.UTF-8 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/fi_FI.UTF-8/makefile b/libX11/nls/fi_FI.UTF-8/makefile deleted file mode 100644 index ab3730dea..000000000 --- a/libX11/nls/fi_FI.UTF-8/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\fi_FI.UTF-8 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/georgian-academy/Makefile.am b/libX11/nls/georgian-academy/Makefile.am deleted file mode 100644 index a1340cf81..000000000 --- a/libX11/nls/georgian-academy/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/georgian-academy - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/georgian-academy/makefile b/libX11/nls/georgian-academy/makefile deleted file mode 100644 index 4066ffa82..000000000 --- a/libX11/nls/georgian-academy/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\georgian-academy - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/georgian-ps/Makefile.am b/libX11/nls/georgian-ps/Makefile.am deleted file mode 100644 index fc85c823f..000000000 --- a/libX11/nls/georgian-ps/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/georgian-ps - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/georgian-ps/makefile b/libX11/nls/georgian-ps/makefile deleted file mode 100644 index a496aa10f..000000000 --- a/libX11/nls/georgian-ps/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\georgian-ps - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/ibm-cp1133/Makefile.am b/libX11/nls/ibm-cp1133/Makefile.am deleted file mode 100644 index 5ecced231..000000000 --- a/libX11/nls/ibm-cp1133/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/ibm-cp1133 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/ibm-cp1133/makefile b/libX11/nls/ibm-cp1133/makefile deleted file mode 100644 index ea195d803..000000000 --- a/libX11/nls/ibm-cp1133/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\ibm-cp1133 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/iscii-dev/Makefile.am b/libX11/nls/iscii-dev/Makefile.am deleted file mode 100644 index 21e31e23f..000000000 --- a/libX11/nls/iscii-dev/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/iscii-dev - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/iscii-dev/makefile b/libX11/nls/iscii-dev/makefile deleted file mode 100644 index 53798b936..000000000 --- a/libX11/nls/iscii-dev/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\iscii-dev - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/isiri-3342/Makefile.am b/libX11/nls/isiri-3342/Makefile.am deleted file mode 100644 index 103d9c9f4..000000000 --- a/libX11/nls/isiri-3342/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/isiri-3342 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/isiri-3342/makefile b/libX11/nls/isiri-3342/makefile deleted file mode 100644 index 9737df15c..000000000 --- a/libX11/nls/isiri-3342/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\isiri-3342 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/iso8859-1/Makefile.am b/libX11/nls/iso8859-1/Makefile.am deleted file mode 100644 index e689716ba..000000000 --- a/libX11/nls/iso8859-1/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-1 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/iso8859-1/makefile b/libX11/nls/iso8859-1/makefile deleted file mode 100644 index 48781d810..000000000 --- a/libX11/nls/iso8859-1/makefile +++ /dev/null @@ -1,6 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-1 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose - diff --git a/libX11/nls/iso8859-10/Makefile.am b/libX11/nls/iso8859-10/Makefile.am deleted file mode 100644 index 871cdf16d..000000000 --- a/libX11/nls/iso8859-10/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-10 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/iso8859-10/makefile b/libX11/nls/iso8859-10/makefile deleted file mode 100644 index a3cb63b6e..000000000 --- a/libX11/nls/iso8859-10/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-10 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/iso8859-11/Makefile.am b/libX11/nls/iso8859-11/Makefile.am deleted file mode 100644 index 391c4c4e5..000000000 --- a/libX11/nls/iso8859-11/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-11 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/iso8859-11/makefile b/libX11/nls/iso8859-11/makefile deleted file mode 100644 index 3663f9218..000000000 --- a/libX11/nls/iso8859-11/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-11 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/iso8859-13/Makefile.am b/libX11/nls/iso8859-13/Makefile.am deleted file mode 100644 index 2635ce953..000000000 --- a/libX11/nls/iso8859-13/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-13 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/iso8859-13/makefile b/libX11/nls/iso8859-13/makefile deleted file mode 100644 index e37d77d81..000000000 --- a/libX11/nls/iso8859-13/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-13 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/iso8859-14/Makefile.am b/libX11/nls/iso8859-14/Makefile.am deleted file mode 100644 index fa68e42f3..000000000 --- a/libX11/nls/iso8859-14/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-14 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/iso8859-14/makefile b/libX11/nls/iso8859-14/makefile deleted file mode 100644 index be48c10cd..000000000 --- a/libX11/nls/iso8859-14/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-14 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/iso8859-15/Makefile.am b/libX11/nls/iso8859-15/Makefile.am deleted file mode 100644 index f6f5fee95..000000000 --- a/libX11/nls/iso8859-15/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-15 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/iso8859-15/makefile b/libX11/nls/iso8859-15/makefile deleted file mode 100644 index 0d3802cc0..000000000 --- a/libX11/nls/iso8859-15/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-15 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/iso8859-2/Makefile.am b/libX11/nls/iso8859-2/Makefile.am deleted file mode 100644 index 13e605329..000000000 --- a/libX11/nls/iso8859-2/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-2 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/iso8859-2/makefile b/libX11/nls/iso8859-2/makefile deleted file mode 100644 index 226e2a055..000000000 --- a/libX11/nls/iso8859-2/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-2 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/iso8859-3/Makefile.am b/libX11/nls/iso8859-3/Makefile.am deleted file mode 100644 index f389d91d7..000000000 --- a/libX11/nls/iso8859-3/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-3 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/iso8859-3/makefile b/libX11/nls/iso8859-3/makefile deleted file mode 100644 index bb0130b18..000000000 --- a/libX11/nls/iso8859-3/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-3 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/iso8859-4/Makefile.am b/libX11/nls/iso8859-4/Makefile.am deleted file mode 100644 index 5e68d0363..000000000 --- a/libX11/nls/iso8859-4/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-4 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/iso8859-4/makefile b/libX11/nls/iso8859-4/makefile deleted file mode 100644 index a4fbc942f..000000000 --- a/libX11/nls/iso8859-4/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-4 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/iso8859-5/Makefile.am b/libX11/nls/iso8859-5/Makefile.am deleted file mode 100644 index 574ce1ebf..000000000 --- a/libX11/nls/iso8859-5/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-5 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/iso8859-5/makefile b/libX11/nls/iso8859-5/makefile deleted file mode 100644 index dcf1c125c..000000000 --- a/libX11/nls/iso8859-5/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-5 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/iso8859-6/Makefile.am b/libX11/nls/iso8859-6/Makefile.am deleted file mode 100644 index cfde98450..000000000 --- a/libX11/nls/iso8859-6/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-6 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/iso8859-6/makefile b/libX11/nls/iso8859-6/makefile deleted file mode 100644 index fb0b1af50..000000000 --- a/libX11/nls/iso8859-6/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-6 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/iso8859-7/Makefile.am b/libX11/nls/iso8859-7/Makefile.am deleted file mode 100644 index 6395d3223..000000000 --- a/libX11/nls/iso8859-7/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-7 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/iso8859-7/makefile b/libX11/nls/iso8859-7/makefile deleted file mode 100644 index bf50d774c..000000000 --- a/libX11/nls/iso8859-7/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-7 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/iso8859-8/Makefile.am b/libX11/nls/iso8859-8/Makefile.am deleted file mode 100644 index 351cfa4f1..000000000 --- a/libX11/nls/iso8859-8/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-8 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/iso8859-8/makefile b/libX11/nls/iso8859-8/makefile deleted file mode 100644 index 9963b63e5..000000000 --- a/libX11/nls/iso8859-8/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-8 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/iso8859-9/Makefile.am b/libX11/nls/iso8859-9/Makefile.am deleted file mode 100644 index c46388f47..000000000 --- a/libX11/nls/iso8859-9/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-9 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/iso8859-9/makefile b/libX11/nls/iso8859-9/makefile deleted file mode 100644 index 7f3474990..000000000 --- a/libX11/nls/iso8859-9/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-9 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/iso8859-9e/Makefile.am b/libX11/nls/iso8859-9e/Makefile.am deleted file mode 100644 index 1f53628b6..000000000 --- a/libX11/nls/iso8859-9e/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-9e - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/iso8859-9e/makefile b/libX11/nls/iso8859-9e/makefile deleted file mode 100644 index 412dd5965..000000000 --- a/libX11/nls/iso8859-9e/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-9e - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/ja.JIS/Makefile.am b/libX11/nls/ja.JIS/Makefile.am deleted file mode 100644 index bb5b1bb67..000000000 --- a/libX11/nls/ja.JIS/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/ja.JIS - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/ja.JIS/makefile b/libX11/nls/ja.JIS/makefile deleted file mode 100644 index 470a8de0f..000000000 --- a/libX11/nls/ja.JIS/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\ja.JIS - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/ja.S90/Makefile.am b/libX11/nls/ja.S90/Makefile.am deleted file mode 100644 index c4c843d67..000000000 --- a/libX11/nls/ja.S90/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/ja.S90 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/ja.S90/makefile b/libX11/nls/ja.S90/makefile deleted file mode 100644 index 365a5cef3..000000000 --- a/libX11/nls/ja.S90/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\ja.S90 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/ja.SJIS/Makefile.am b/libX11/nls/ja.SJIS/Makefile.am deleted file mode 100644 index 19f2b8407..000000000 --- a/libX11/nls/ja.SJIS/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/ja.SJIS - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/ja.SJIS/makefile b/libX11/nls/ja.SJIS/makefile deleted file mode 100644 index 230a80b36..000000000 --- a/libX11/nls/ja.SJIS/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\ja.SJIS - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/ja.U90/Makefile.am b/libX11/nls/ja.U90/Makefile.am deleted file mode 100644 index a98374abf..000000000 --- a/libX11/nls/ja.U90/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/ja.U90 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/ja.U90/makefile b/libX11/nls/ja.U90/makefile deleted file mode 100644 index bcb58cb99..000000000 --- a/libX11/nls/ja.U90/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\ja.U90 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/ja/Makefile.am b/libX11/nls/ja/Makefile.am deleted file mode 100644 index 47fbacc24..000000000 --- a/libX11/nls/ja/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/ja - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/ja/makefile b/libX11/nls/ja/makefile deleted file mode 100644 index 72bbc50bc..000000000 --- a/libX11/nls/ja/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\ja - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/ja_JP.UTF-8/Makefile.am b/libX11/nls/ja_JP.UTF-8/Makefile.am deleted file mode 100644 index 8bdf5e423..000000000 --- a/libX11/nls/ja_JP.UTF-8/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/ja_JP.UTF-8 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/ja_JP.UTF-8/makefile b/libX11/nls/ja_JP.UTF-8/makefile deleted file mode 100644 index 017fff57a..000000000 --- a/libX11/nls/ja_JP.UTF-8/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\ja_JP.UTF-8 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/ko/Makefile.am b/libX11/nls/ko/Makefile.am deleted file mode 100644 index 17e39a358..000000000 --- a/libX11/nls/ko/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/ko - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/ko/makefile b/libX11/nls/ko/makefile deleted file mode 100644 index 3c6655ffe..000000000 --- a/libX11/nls/ko/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\ko - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/ko_KR.UTF-8/Makefile.am b/libX11/nls/ko_KR.UTF-8/Makefile.am deleted file mode 100644 index dc98b9d08..000000000 --- a/libX11/nls/ko_KR.UTF-8/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/ko_KR.UTF-8 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/ko_KR.UTF-8/makefile b/libX11/nls/ko_KR.UTF-8/makefile deleted file mode 100644 index f60f3e3a7..000000000 --- a/libX11/nls/ko_KR.UTF-8/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\ko_KR.UTF-8 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/koi8-c/Makefile.am b/libX11/nls/koi8-c/Makefile.am deleted file mode 100644 index 88ae93fe5..000000000 --- a/libX11/nls/koi8-c/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/koi8-c - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/koi8-c/makefile b/libX11/nls/koi8-c/makefile deleted file mode 100644 index 34b58b2b8..000000000 --- a/libX11/nls/koi8-c/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\koi8-c - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/koi8-r/Makefile.am b/libX11/nls/koi8-r/Makefile.am deleted file mode 100644 index af5a2302b..000000000 --- a/libX11/nls/koi8-r/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/koi8-r - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/koi8-r/makefile b/libX11/nls/koi8-r/makefile deleted file mode 100644 index 77ed038ac..000000000 --- a/libX11/nls/koi8-r/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\koi8-r - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/koi8-u/Makefile.am b/libX11/nls/koi8-u/Makefile.am deleted file mode 100644 index 92ead47a9..000000000 --- a/libX11/nls/koi8-u/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/koi8-u - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/koi8-u/makefile b/libX11/nls/koi8-u/makefile deleted file mode 100644 index d60988564..000000000 --- a/libX11/nls/koi8-u/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\koi8-u - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/localerules.in b/libX11/nls/localerules.in deleted file mode 100644 index 9fcf5438e..000000000 --- a/libX11/nls/localerules.in +++ /dev/null @@ -1,13 +0,0 @@ -include $(top_srcdir)/cpprules.in - -EXTRA_DIST = XLC_LOCALE.pre Compose.pre - -dist_x11thislocale_DATA = XI18N_OBJS -x11thislocale_DATA = XLC_LOCALE Compose - -CLEANFILES = XLC_LOCALE Compose - -if HAVE_PERL -TESTS_ENVIRONMENT = $(PERL) -TESTS = $(top_srcdir)/nls/compose-check.pl -endif HAVE_PERL diff --git a/libX11/nls/makefile b/libX11/nls/makefile index c38c8fd4e..e6bf47297 100644 --- a/libX11/nls/makefile +++ b/libX11/nls/makefile @@ -1,4 +1,8 @@ -SUBDIRS= \
+X11_LOCALEDATADIR = ..\..\xorg-server\locale
+
+x11localedir = $(X11_LOCALEDATADIR)
+x11locale_DATA = locale.alias locale.dir compose.dir
+locales = \
am_ET.UTF-8 \
armscii-8 \
C \
@@ -60,29 +64,22 @@ SUBDIRS= \ zh_TW.big5 \
zh_TW.UTF-8
-CPP_FILES_FLAGS = -DWCHAR32=@WCHAR32@
+include ../cpprules.mak
-X11_LOCALEDATADIR = ..\..\xorg-server\locale
-$(X11_LOCALEDATADIR)\locale.alias: locale.alias.pre
- cl /nologo /EP $< -DXCOMM\#\# > locale.alias.l1
- sed -e "/^[^\#][^ ]*:/s/://" -e "/^[^\#].*[ ].*:/d" < locale.alias.l1 > locale.alias.l2
- type locale.alias.l2 locale.alias.l1 > $@
- del locale.alias.l1
- del locale.alias.l2
+$(X11_LOCALEDATADIR)\%: %.pre
+ cl /nologo /EP $< -DXCOMM\#\# > $<.l1
+ sed -e "/^[^\#][^ ]*:/s/://" -e "/^[^\#].*[ ].*:/d" < $<.l1 > $<.l2
+ type $<.l2 $<.l1 > $@
+ del $<.l1
+ del $<.l2
+
+# Per-locale data files
+
+nobase_dist_x11locale_DATA = $(locales:%=%\XI18N_OBJS)
-$(X11_LOCALEDATADIR)\compose.dir: compose.dir.pre
- cl /nologo /EP $< -DXCOMM\#\# > compose.dir.l1
- sed -e "/^[^\#][^ ]*:/s/://" -e "/^[^\#].*[ ].*:/d" < compose.dir.l1 > compose.dir.l2
- type compose.dir.l2 compose.dir.l1 > $@
- del compose.dir.l1
- del compose.dir.l2
+nobase_x11locale_DATA = $(locales:%=%\XLC_LOCALE) $(locales:%=%\Compose)
-$(X11_LOCALEDATADIR)\locale.dir: locale.dir.pre
- cl /nologo /EP $< -DXCOMM\#\# > locale.dir.l1
- sed -e "/^[^\#][^ ]*:/s/://" -e "/^[^\#].*[ ].*:/d" < locale.dir.l1 > locale.dir.l2
- type locale.dir.l2 locale.dir.l1 > $@
- del locale.dir.l1
- del locale.dir.l2
+all_DATA = $(nobase_dist_x11locale_DATA) $(nobase_x11locale_DATA) $(x11locale_DATA)
-all: $(X11_LOCALEDATADIR)\locale.alias $(X11_LOCALEDATADIR)\compose.dir $(X11_LOCALEDATADIR)\locale.dir
+all: $(all_DATA:%=$(X11_LOCALEDATADIR)\%)
diff --git a/libX11/nls/microsoft-cp1251/Makefile.am b/libX11/nls/microsoft-cp1251/Makefile.am deleted file mode 100644 index 5842c9041..000000000 --- a/libX11/nls/microsoft-cp1251/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/microsoft-cp1251 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/microsoft-cp1251/makefile b/libX11/nls/microsoft-cp1251/makefile deleted file mode 100644 index 973c150ea..000000000 --- a/libX11/nls/microsoft-cp1251/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\microsoft-cp1251 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/microsoft-cp1255/Makefile.am b/libX11/nls/microsoft-cp1255/Makefile.am deleted file mode 100644 index d8b71228c..000000000 --- a/libX11/nls/microsoft-cp1255/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/microsoft-cp1255 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/microsoft-cp1255/makefile b/libX11/nls/microsoft-cp1255/makefile deleted file mode 100644 index b5c97a764..000000000 --- a/libX11/nls/microsoft-cp1255/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\microsoft-cp1255 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/microsoft-cp1256/Makefile.am b/libX11/nls/microsoft-cp1256/Makefile.am deleted file mode 100644 index c4250bda5..000000000 --- a/libX11/nls/microsoft-cp1256/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/microsoft-cp1256 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/microsoft-cp1256/makefile b/libX11/nls/microsoft-cp1256/makefile deleted file mode 100644 index b45902da0..000000000 --- a/libX11/nls/microsoft-cp1256/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\microsoft-cp1256 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/mulelao-1/Makefile.am b/libX11/nls/mulelao-1/Makefile.am deleted file mode 100644 index 8d37d3317..000000000 --- a/libX11/nls/mulelao-1/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/mulelao-1 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/mulelao-1/makefile b/libX11/nls/mulelao-1/makefile deleted file mode 100644 index f502bfb88..000000000 --- a/libX11/nls/mulelao-1/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\mulelao-1 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/nokhchi-1/Makefile.am b/libX11/nls/nokhchi-1/Makefile.am deleted file mode 100644 index 5504ff3f1..000000000 --- a/libX11/nls/nokhchi-1/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/nokhchi-1 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/nokhchi-1/makefile b/libX11/nls/nokhchi-1/makefile deleted file mode 100644 index b68d6367b..000000000 --- a/libX11/nls/nokhchi-1/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\nokhchi-1 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/pt_BR.UTF-8/Makefile.am b/libX11/nls/pt_BR.UTF-8/Makefile.am deleted file mode 100644 index 186847986..000000000 --- a/libX11/nls/pt_BR.UTF-8/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/pt_BR.UTF-8 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/pt_BR.UTF-8/makefile b/libX11/nls/pt_BR.UTF-8/makefile deleted file mode 100644 index f13141041..000000000 --- a/libX11/nls/pt_BR.UTF-8/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\pt_BR.UTF-8 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/ru_RU.UTF-8/Makefile.am b/libX11/nls/ru_RU.UTF-8/Makefile.am deleted file mode 100644 index f138e53dd..000000000 --- a/libX11/nls/ru_RU.UTF-8/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/ru_RU.UTF-8 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/ru_RU.UTF-8/makefile b/libX11/nls/ru_RU.UTF-8/makefile deleted file mode 100644 index d6b9e48ab..000000000 --- a/libX11/nls/ru_RU.UTF-8/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\ru_RU.UTF-8 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/tatar-cyr/Makefile.am b/libX11/nls/tatar-cyr/Makefile.am deleted file mode 100644 index 505956c73..000000000 --- a/libX11/nls/tatar-cyr/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/tatar-cyr - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/tatar-cyr/makefile b/libX11/nls/tatar-cyr/makefile deleted file mode 100644 index cbb2e2105..000000000 --- a/libX11/nls/tatar-cyr/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\tatar-cyr - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/th_TH.UTF-8/Makefile.am b/libX11/nls/th_TH.UTF-8/Makefile.am deleted file mode 100644 index ab216189e..000000000 --- a/libX11/nls/th_TH.UTF-8/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/th_TH.UTF-8 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/th_TH.UTF-8/makefile b/libX11/nls/th_TH.UTF-8/makefile deleted file mode 100644 index 712d2495a..000000000 --- a/libX11/nls/th_TH.UTF-8/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\th_TH.UTF-8 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/th_TH/Makefile.am b/libX11/nls/th_TH/Makefile.am deleted file mode 100644 index 39cbc233d..000000000 --- a/libX11/nls/th_TH/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/th_TH - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/th_TH/makefile b/libX11/nls/th_TH/makefile deleted file mode 100644 index 15fdad4c0..000000000 --- a/libX11/nls/th_TH/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\th_TH - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/tscii-0/Makefile.am b/libX11/nls/tscii-0/Makefile.am deleted file mode 100644 index f8aa71fbe..000000000 --- a/libX11/nls/tscii-0/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/tscii-0 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/tscii-0/makefile b/libX11/nls/tscii-0/makefile deleted file mode 100644 index 5135beaca..000000000 --- a/libX11/nls/tscii-0/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\tscii-0 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/vi_VN.tcvn/Makefile.am b/libX11/nls/vi_VN.tcvn/Makefile.am deleted file mode 100644 index ed94bd64f..000000000 --- a/libX11/nls/vi_VN.tcvn/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/vi_VN.tcvn - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/vi_VN.tcvn/makefile b/libX11/nls/vi_VN.tcvn/makefile deleted file mode 100644 index 4b131ddd7..000000000 --- a/libX11/nls/vi_VN.tcvn/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\vi_VN.tcvn - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/vi_VN.viscii/Makefile.am b/libX11/nls/vi_VN.viscii/Makefile.am deleted file mode 100644 index 1b2bc34b1..000000000 --- a/libX11/nls/vi_VN.viscii/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/vi_VN.viscii - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/vi_VN.viscii/makefile b/libX11/nls/vi_VN.viscii/makefile deleted file mode 100644 index 58dcdd262..000000000 --- a/libX11/nls/vi_VN.viscii/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\vi_VN.viscii - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/zh_CN.UTF-8/Makefile.am b/libX11/nls/zh_CN.UTF-8/Makefile.am deleted file mode 100644 index 7dd4aba91..000000000 --- a/libX11/nls/zh_CN.UTF-8/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN.UTF-8 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/zh_CN.UTF-8/makefile b/libX11/nls/zh_CN.UTF-8/makefile deleted file mode 100644 index 01c319dcc..000000000 --- a/libX11/nls/zh_CN.UTF-8/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\zh_CN.UTF-8 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/zh_CN.gb18030/Makefile.am b/libX11/nls/zh_CN.gb18030/Makefile.am deleted file mode 100644 index de6474313..000000000 --- a/libX11/nls/zh_CN.gb18030/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN.gb18030 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/zh_CN.gb18030/makefile b/libX11/nls/zh_CN.gb18030/makefile deleted file mode 100644 index 90f0d21e1..000000000 --- a/libX11/nls/zh_CN.gb18030/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\zh_CN.gb18030 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/zh_CN.gbk/Makefile.am b/libX11/nls/zh_CN.gbk/Makefile.am deleted file mode 100644 index c4586656d..000000000 --- a/libX11/nls/zh_CN.gbk/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN.gbk - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/zh_CN.gbk/makefile b/libX11/nls/zh_CN.gbk/makefile deleted file mode 100644 index 418e63e5a..000000000 --- a/libX11/nls/zh_CN.gbk/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\zh_CN.gbk - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/zh_CN/Makefile.am b/libX11/nls/zh_CN/Makefile.am deleted file mode 100644 index e4c74e7b5..000000000 --- a/libX11/nls/zh_CN/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/zh_CN/makefile b/libX11/nls/zh_CN/makefile deleted file mode 100644 index d019b7bed..000000000 --- a/libX11/nls/zh_CN/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\zh_CN - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/zh_HK.UTF-8/Makefile.am b/libX11/nls/zh_HK.UTF-8/Makefile.am deleted file mode 100644 index 89d753074..000000000 --- a/libX11/nls/zh_HK.UTF-8/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/zh_HK.UTF-8 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/zh_HK.UTF-8/makefile b/libX11/nls/zh_HK.UTF-8/makefile deleted file mode 100644 index 45b3fea5a..000000000 --- a/libX11/nls/zh_HK.UTF-8/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\zh_HK.UTF-8 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/zh_HK.big5/Makefile.am b/libX11/nls/zh_HK.big5/Makefile.am deleted file mode 100644 index b8229ddd4..000000000 --- a/libX11/nls/zh_HK.big5/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/zh_HK.big5 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/zh_HK.big5/makefile b/libX11/nls/zh_HK.big5/makefile deleted file mode 100644 index 577695f36..000000000 --- a/libX11/nls/zh_HK.big5/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\zh_HK.big5 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/zh_HK.big5hkscs/Makefile.am b/libX11/nls/zh_HK.big5hkscs/Makefile.am deleted file mode 100644 index b4d5f83b2..000000000 --- a/libX11/nls/zh_HK.big5hkscs/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/zh_HK.big5hkscs - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/zh_HK.big5hkscs/makefile b/libX11/nls/zh_HK.big5hkscs/makefile deleted file mode 100644 index dba8d60ec..000000000 --- a/libX11/nls/zh_HK.big5hkscs/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\zh_HK.big5hkscs - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/zh_TW.UTF-8/Makefile.am b/libX11/nls/zh_TW.UTF-8/Makefile.am deleted file mode 100644 index 127941761..000000000 --- a/libX11/nls/zh_TW.UTF-8/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/zh_TW.UTF-8 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/zh_TW.UTF-8/makefile b/libX11/nls/zh_TW.UTF-8/makefile deleted file mode 100644 index 99ca0bd22..000000000 --- a/libX11/nls/zh_TW.UTF-8/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\zh_TW.UTF-8 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/zh_TW.big5/Makefile.am b/libX11/nls/zh_TW.big5/Makefile.am deleted file mode 100644 index b8fbe546c..000000000 --- a/libX11/nls/zh_TW.big5/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/zh_TW.big5 - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/zh_TW.big5/makefile b/libX11/nls/zh_TW.big5/makefile deleted file mode 100644 index 0ecbc0818..000000000 --- a/libX11/nls/zh_TW.big5/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\zh_TW.big5 - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/nls/zh_TW/Makefile.am b/libX11/nls/zh_TW/Makefile.am deleted file mode 100644 index a847cc3ba..000000000 --- a/libX11/nls/zh_TW/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -x11thislocaledir = $(X11_LOCALEDATADIR)/zh_TW - -include $(top_srcdir)/nls/localerules.in diff --git a/libX11/nls/zh_TW/makefile b/libX11/nls/zh_TW/makefile deleted file mode 100644 index 41ab5a02e..000000000 --- a/libX11/nls/zh_TW/makefile +++ /dev/null @@ -1,5 +0,0 @@ -X11_LOCALEDATADIR = ..\..\..\xorg-server\locale - -x11thislocaledir = $(X11_LOCALEDATADIR)\zh_TW - -all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose diff --git a/libX11/specs/xmlrules.in b/libX11/specs/xmlrules.in index d9f8fea42..c34fba41b 100644 --- a/libX11/specs/xmlrules.in +++ b/libX11/specs/xmlrules.in @@ -21,6 +21,10 @@ # DEALINGS IN THE SOFTWARE.
#
+CLEANFILES =
+SUFFIXES =
+XMLTO_FLAGS =
+
if HAVE_XMLTO
spec_DATA = $(doc_sources:.xml=.html)
@@ -33,16 +37,16 @@ spec_DATA += $(doc_sources:.xml=.txt) endif
if HAVE_STYLESHEETS
-XMLTO_FLAGS = -m $(XSL_STYLESHEET) --stringparam img.src.path=$(abs_builddir)/
+XMLTO_FLAGS += -m $(XSL_STYLESHEET) --stringparam img.src.path=$(abs_builddir)/
spec_DATA += xorg.css
xorg.css: $(STYLESHEET_SRCDIR)/xorg.css
$(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@
endif
-CLEANFILES = $(spec_DATA)
+CLEANFILES += $(spec_DATA)
-SUFFIXES = .xml .ps .pdf .txt .html
+SUFFIXES += .xml .ps .pdf .txt .html
%.txt: %.xml $(dist_spec_DATA)
$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
diff --git a/makefile.after b/makefile.after index 2b119c0ce..b9f3f7af6 100644 --- a/makefile.after +++ b/makefile.after @@ -105,17 +105,6 @@ $(DESTDIR)\%.enc.gz: %.enc gzip -c < $< > $@
endif
-ifdef x11thislocaledir
-
-$(x11thislocaledir)\%: %.pre
- cl /nologo /EP $< -DXCOMM\#\# > $@
-
-$(x11thislocaledir):
- $(CREATEDIR)
-
-all: $(x11thislocaledir)
-endif
-
ifdef DESTDIR
$(DESTDIR):
$(CREATEDIR)
|