summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorwl <wl>2010-12-13 17:42:28 +0000
committerwl <wl>2010-12-13 17:42:28 +0000
commit0ed95a1ca0e948d03d0b8ce97d7446628ccb8579 (patch)
tree3bd96a1d884b2e1907f46ae98aea8a52f864b4f2 /Makefile.in
parentca864c3ce4e9a33f25fc1dbd1b288b352d84adee (diff)
downloadgroff-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.in')
-rw-r--r--Makefile.in73
1 files changed, 62 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in
index e66e66dc..e7fc424f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+# Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010
# Free Software Foundation, Inc.
# Written by James Clark (jjc@jclark.com)
#
@@ -545,7 +545,8 @@ MDEFINES= \
MAKE_K_FLAG=`case "$(MAKEFLAGS)" in *k*) echo ' -k ';; esac`
-INCDIRS=src/include
+INCDIRS=\
+ src/include
LIBDIRS=\
src/libs/libgroff \
src/libs/libdriver \
@@ -576,8 +577,13 @@ CCPROGDIRS=\
src/utils/addftinfo
CPROGDIRS=\
src/utils/pfbtops
-PROGDEPDIRS=arch/misc
-PROGDIRS=$(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) $(XPROGDIRS)
+PROGDEPDIRS=\
+ arch/misc
+PROGDIRS=\
+ $(PROGDEPDIRS) \
+ $(CCPROGDIRS) \
+ $(CPROGDIRS) \
+ $(XPROGDIRS)
DEVDIRS=\
font/devps \
font/devdvi \
@@ -605,8 +611,15 @@ OTHERDIRS=\
contrib/hdtbl \
contrib/pdfmark \
contrib/gdiffmk
-ALLDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) \
- $(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(OTHERDIRS)
+ALLDIRS=\
+ $(INCDIRS) \
+ $(LIBDIRS) \
+ $(PROGDIRS) \
+ $(DEVDIRS) \
+ $(XDEVDIRS) \
+ $(OTHERDEVDIRS) \
+ $(TTYDEVDIRS) \
+ $(OTHERDIRS)
EXTRADIRS=\
font/devps/generate \
font/devdvi/generate \
@@ -626,13 +639,36 @@ NOMAKEDIRS=\
contrib/mom/momdoc \
contrib/gdiffmk/tests \
src/libs/snprintf \
+ src/libs/gnulib/lib \
+ src/libs/gnulib/lib/uniwidth \
+ src/libs/gnulib/m4 \
+ src/libs/gnulib/build-aux \
+ src/libs/gnulib \
font/devps/old \
font/util
+GNULIBDIRS=\
+ src/libs/gnulib
DISTDIRS=\
- $(INCDIRS) $(LIBDIRS) $(PROGDIRS) $(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) \
- $(ALLTTYDEVDIRS) $(OTHERDIRS) $(EXTRADIRS) $(NOMAKEDIRS)
-TARGETS=all install_bin install_data clean distclean mostlyclean \
- realclean extraclean distfiles TAGS depend uninstall_sub fonts
+ $(INCDIRS) \
+ $(LIBDIRS) \
+ $(PROGDIRS) \
+ $(DEVDIRS) \
+ $(XDEVDIRS) \
+ $(OTHERDEVDIRS) \
+ $(ALLTTYDEVDIRS) \
+ $(OTHERDIRS) \
+ $(EXTRADIRS) \
+ $(NOMAKEDIRS) \
+ $(GNULIBDIRS)
+TARGETS=\
+ all \
+ install_bin install_data \
+ clean distclean mostlyclean realclean extraclean \
+ distfiles \
+ TAGS \
+ depend \
+ uninstall_sub \
+ fonts
# This ENVSETUP gork is required by the DJGPP build on Windows 9X,
# where Make needs to be case-sensitive to find files like BI and VERSION.
@@ -658,7 +694,7 @@ dot: FORCE
-f $(top_srcdir)/Makefile.comm \
-f $(top_srcdir)/Makefile.sub $(do)
-$(LIBDIRS): FORCE $(INCDIRS) $(PROGDEPDIRS)
+$(LIBDIRS): FORCE $(INCDIRS) $(PROGDEPDIRS) $(GNULIBDIRS)
@$(ENVSETUP); \
if test $(srcdir) = .; then \
srcdir=.; \
@@ -720,6 +756,21 @@ $(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE $(PROGDEPDIRS) $(CCP
-f $$srcdir/Makefile.sub \
-f $(top_srcdir)/Makefile.dev $(do)
+$(GNULIBDIRS): FORCE
+ @$(ENVSETUP); \
+ if test $(srcdir) = .; then \
+ srcdir=.; \
+ else \
+ srcdir=`cd $(srcdir); pwd`/$@; \
+ fi; \
+ test -d $@ || $(mkinstalldirs) $@; \
+ case $(do) in \
+ all) \
+ cd $@; \
+ test -f Makefile || $(SHELL) $$srcdir/configure; \
+ $(MAKE) $(do) ;; \
+ esac
+
$(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS)
$(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS): FORCE