diff options
| author | wl <wl> | 2010-12-13 17:42:28 +0000 |
|---|---|---|
| committer | wl <wl> | 2010-12-13 17:42:28 +0000 |
| commit | 0ed95a1ca0e948d03d0b8ce97d7446628ccb8579 (patch) | |
| tree | 3bd96a1d884b2e1907f46ae98aea8a52f864b4f2 /Makefile.comm | |
| parent | ca864c3ce4e9a33f25fc1dbd1b288b352d84adee (diff) | |
| download | groff-0ed95a1ca0e948d03d0b8ce97d7446628ccb8579.tar.gz | |
Add wide character support to grotty.
This is a huge patch, mainly by adding the gnulib infrastructure in
a separate directory tree (in `src/libs/gnulib/lib') for its
`wcwidth' module. However, the actual changes to native groff
source files are just a few lines.
* Makefile.comm (INCLUDES): Updated.
(LIBGNU): Define.
* Makefile.in (NOMAKEDIRS): Updated.
(GNULLIBDIRS): Define.
(DISTDIRS): Add GNULLIBDIRS.
($LIBDIRS): Depend on GNULLIBDIRS.
($GNULLIBDIRS): New target.
* src/libs/libgroff/font.cpp (font::get_width, font::load)
[is_unicode]: Use `wcwidth'.
* src/roff/troff/Makefile.sub (XLIBS): Add LIBGNU.
* src/roff/troff/input.cpp (main): Set LC_CTYPE.
* src/devices/grotty/Makefile.sub (XLIBS): Add LIBGNU.
* src/devices/grotty/tty.cpp (main): Set LC_CTYPE.
* src/libs/gnulib/*: New files. The import was done as follows:
. Call
gnulib-tool --create-testdir \
--dir=src/libs/gnulib \
wcwidth
to get a testbed.
. Manually move directories src/libs/gl{lib,m4} to
src/libs/{lib,m4}, and do s/gllib/lib/ and s/glm4/m4/ everywhere
to `convert' the gnulib testbed to a standard gnulib
configuration as maintained by gnulib-tool.
. Call
gnulib-tool --add-import \
--dir=src/libs/gnulib \
wcwidth
to update everything.
Diffstat (limited to 'Makefile.comm')
| -rw-r--r-- | Makefile.comm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.comm b/Makefile.comm index 0408ef40..f3bbc84b 100644 --- a/Makefile.comm +++ b/Makefile.comm @@ -1,4 +1,4 @@ -# Copyright (C) 1989-2000, 2002, 2003, 2004, 2006, 2007, 2009 +# Copyright (C) 1989-2000, 2002, 2003, 2004, 2006, 2007, 2009, 2010 # Free Software Foundation, Inc. # Written by James Clark (jjc@jclark.com) # @@ -20,7 +20,8 @@ # Makefile.comm # INCLUDES=-I. -I$(srcdir) \ - -I$(top_builddir)/src/include -I$(top_srcdir)/src/include + -I$(top_builddir)/src/include -I$(top_srcdir)/src/include \ + -I$(tob_builddir)/src/libs/gnulib/lib ALL_CCFLAGS=$(INCLUDES) $(CCDEFINES) $(CCFLAGS) $(CPPFLAGS) COMPILE.cpp=$(CCC) $(ALL_CCFLAGS) -c ALL_CFLAGS=$(INCLUDES) $(CDEFINES) $(CFLAGS) $(CPPFLAGS) @@ -31,6 +32,7 @@ LIBGROFF=$(top_builddir)/src/libs/libgroff/libgroff.$(LIBEXT) LIBBIB=$(top_builddir)/src/libs/libbib/libbib.$(LIBEXT) LIBDRIVER=$(top_builddir)/src/libs/libdriver/libdriver.$(LIBEXT) LIBXUTIL=$(top_builddir)/src/libs/libxutil/libxutil.$(LIBEXT) +LIBGNU=$(top_builddir)/src/libs/gnulib/lib/libgnu.$(LIBEXT) MLIB= XLIBS= YTABH= |