Commit graph

14 commits

Author SHA1 Message Date
Alex Richardson
1c845834a3 Fix cross-compilation from macOS
We can't use `LC_CTYPE=C sed` there since /usr/bin/sed is not compatible
with the expressions in nls/ (`sed: RE error: illegal byte sequence`).
To fix this use $(SED) instead which autotools will set to a GNU
version of sed (usually /usr/local/bin/gsed) on macOS.

Signed-off-by: Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
2021-06-15 08:47:31 +01:00
Ross Burton
a37986f7a7 cpprules.in: squash whitespace in generated files
CPP is used to generate files, but as cpp reads files from the build host the
output has a number of blank lines at the beginning which varies depending on
what GCC and friends is used.

Pathalogical example:

 $ cpp -undef -traditional /dev/null
 # 1 "/dev/null"
 # 1 "<built-in>"
 # 1 "<command-line>"
 # 31 "<command-line>"
 # 1 "/usr/include/stdc-predef.h" 1 3 4

 # 17 "/usr/include/stdc-predef.h" 3 4

 [ 40 blank line ]

 # 32 "<command-line>" 2
 # 1 "/dev/null"

So depending on the content of stdc-predef.h and what other headers CPP will
load, the amount of whitespace in the generates files varies. This can result in
differences in reproducible environments, and file conflicts in multilib
environments.

As whitespace is irrelevant to these machine-readable files, extend the sed to
just delete blank lines.
2020-10-10 21:35:04 +00:00
Andreas Schwab
c6bc28d433 Restore lost tabs in sed commands
Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2014-05-23 17:27:10 -07:00
Jeremy Huddleston
d2cce0abba nls: Use LC_CTYPE=C for sed magic
Stricter versions of sed can trip up if the input does not match
LC_CTYPE

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-02-12 19:14:37 -08:00
Dan Nicholson
81d1d9a6bd docs: Remove directory prerequisites from make rules
Make expects prerequisites to be files with valid timestamps, and
directories are treated as always being out of date. Thus, any targets
depending on directories will always be rebuilt.

Instead, the doc rules are changed to always create the target's leading
directory. This should prevent the documentation from being rebuilt when
"make install" is run.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-10-10 09:43:55 -07:00
Alan Coopersmith
986bb6d1d5 Bug 19379 - Provide docs with overview of all compose key combinations
Adds compose-chart.pl to generate DocBook/XML documents listing compose
keys, and Makefile rules to generate HTML & PDF output from them if xmlto
is present.

https://bugs.freedesktop.org/show_bug.cgi?id=19379

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: James Cloos <cloos@jhcloos.com>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
2010-09-21 18:22:21 -07:00
Xake
383165916d Use AM_V_GEN instead of customized macros for AM_SILENT_RULES
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-10-08 08:29:58 -07:00
Alan Coopersmith
7dabcac973 Add AM_SILENT_RULES support for cpp rules for man & nls files
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-09-18 17:13:04 -07:00
Julien Cristau
e3198b55dc Add a ru_RU.UTF-8 locale
Based on patch by Eugene Konev <ejka@imfi.kspu.ru> for X.Org 6.9.0.

Debian bug#330144 <http://bugs.debian.org/330144>
X.Org bug#15887 <http://bugs.freedesktop.org/show_bug.cgi?id=15887>
2009-04-06 17:30:52 +02:00
James Cloos
b7502abfe2 Revert "For nls/*.pre, allow people to comment lines by starting them with '##'."
As of commit c9d20e3 the initial double-hashes are replaced with proper C comments.

This reverts commit a225a0be48.
2008-12-07 04:09:46 -05:00
Tilman Sauerbeck
a225a0be48 For nls/*.pre, allow people to comment lines by starting them with '##'.
This fixes a bunch of cpp warnings from nls/en_US.UTF-8/Compose.pre.
Fixing that file would have been a larger diff, and using ## may be
nicer to use anyway.
2007-04-06 12:46:25 +02:00
Alan Coopersmith
83406d69c6 Move RAWCPP macro to xorg-macros.m4 so other modules can use it Add check for whether or not RAWCPP needs -traditional instead of hardcoding it, so non-gcc cpp's can be used 2005-08-15 19:53:37 +00:00
Keith Packard
6e752ea120 Enable loadable i18n modules, making them configurable on the configure command line.
Clean up conditionals for XKB, XCMS, XLOCALEDIR
Create new lib directory for locale modules in ${X11_LIBDIR}/locale/lib. Add this to the default XLOCALEDIR search path.
Create separate X11_LOCALEDATADIR variable pointing at ${datadir}/X11/locale for installing locale data.
Split out xcms, xkb, xlibi18n sources from main xlib bits so they can be conditionally included more easily. Lots of source files have been moved with this step; the result seems like it might be easier to maintain.
Display message at end of configure script with selected options.
Fix manual building with cpp to add -traditional in cpprules.in. This isn't conditionalized at all, so it will break on systems not using GNU cpp.
2005-07-11 08:29:18 +00:00
Alan Coopersmith
3939ac4410 - Since all but one line of all the nls/*/Makefile.am files are identical, move common bits to nls/localerules.in for easier updating and use automake includes to include in all the nls/*/Makefile.am files
- Don't assume $(CPP) can take gcc-only -traditional flag
- CPP process man pages as is done in the monolithic tree
2005-07-09 18:44:14 +00:00