From: Bruno Haible <bruno@clisp.org>
Date: Tue, 2 Apr 2019 16:33:26 +0000 (+0200)
Subject: build: Move local gnulib modules that are only needed in libtextstyle.
X-Git-Tag: v0.20~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=809ce8c05da6fb659e9aa8fc252bfb314a3fe3c2;p=thirdparty%2Fgettext.git

build: Move local gnulib modules that are only needed in libtextstyle.

* libtextstyle/gnulib-local/*: Many files moved to here from gnulib-local/*.
* libtextstyle/gnulib-local/modules/libglib: Apply diff.
* libtextstyle/gnulib-local/modules/libglib.diff: Remove file.
* libtextstyle/gnulib-local/modules/libcroco: Apply diff.
* libtextstyle/gnulib-local/modules/libcroco.diff: Remove file.
* libtextstyle/gnulib-local/modules/term-styled-ostream: Apply diff.
* libtextstyle/gnulib-local/modules/term-styled-ostream.diff: Remove file.
* libtextstyle/gnulib-local/modules/html-styled-ostream: Apply diff.
* libtextstyle/gnulib-local/modules/html-styled-ostream.diff: Remove file.
* libtextstyle/gnulib-local/modules/noop-styled-ostream: Apply diff.
* libtextstyle/gnulib-local/modules/noop-styled-ostream.diff: Remove file.
* libtextstyle/woe32dll/c++term-styled-ostream.cc: Remove file.
* libtextstyle/woe32dll/c++html-styled-ostream.cc: Remove file.
* libtextstyle/woe32dll/c++noop-styled-ostream.cc: Remove file.
* gettext-tools/woe32dll/c++term-styled-ostream.cc: Remove file.
* gettext-tools/woe32dll/c++html-styled-ostream.cc: Remove file.
* gnulib-local/Makefile.am (EXTRA_DIST): Remove the files that were moved away.
* libtextstyle/Makefile.am (EXTRA_DIST): Add the files that were moved to
libtextstyle/gnulib-local/. Add build-aux/moopp.
* Makefile.am (EXTRA_DIST): Remove build-aux/moopp.
---

diff --git a/Makefile.am b/Makefile.am
index 97f4b8a4e..53b5448c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,7 +52,7 @@ changelog_etc = \
 
 EXTRA_DIST = \
   $(changelog_etc) DEPENDENCIES PACKAGING HACKING ChangeLog.0 autogen.sh \
-  build-aux/ac-help.sed build-aux/moopp build-aux/git-version-gen \
+  build-aux/ac-help.sed build-aux/git-version-gen \
   m4/fixautomake.m4 m4/woe32-dll.m4 \
   m4/libtool.m4
 
diff --git a/gettext-tools/woe32dll/c++html-styled-ostream.cc b/gettext-tools/woe32dll/c++html-styled-ostream.cc
deleted file mode 100644
index 207532b02..000000000
--- a/gettext-tools/woe32dll/c++html-styled-ostream.cc
+++ /dev/null
@@ -1 +0,0 @@
-#include "../gnulib-lib/html-styled-ostream.c"
diff --git a/gettext-tools/woe32dll/c++term-styled-ostream.cc b/gettext-tools/woe32dll/c++term-styled-ostream.cc
deleted file mode 100644
index 43eb773bf..000000000
--- a/gettext-tools/woe32dll/c++term-styled-ostream.cc
+++ /dev/null
@@ -1 +0,0 @@
-#include "../gnulib-lib/term-styled-ostream.c"
diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index f738226b5..a2fcfbb7e 100644
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -17,9 +17,8 @@
 ## Process this file with automake to produce Makefile.in.
 
 # Generate this list with
-# find . '(' -name CVS -o -name Makefile.am ')' -prune -o -type f '!' '(' -name '*.orig' -or -name '*~' -or -name 'ChangeLog.*' ')' -printf '%P\n' | sort | tr '\012' @ | sed 's/@$/%/;s/@/ \\@/g' | tr @% '\012\012'
+# find . '(' -name Makefile.am ')' -prune -o -type f '!' '(' -name '*.orig' -or -name '*~' -or -name 'ChangeLog.*' ')' -printf '%P\n' | sort | tr '\012' @ | sed 's/@$/%/;s/@/ \\@/g' | tr @% '\012\012'
 EXTRA_DIST = \
-build-aux/moopp \
 lib/addext.c \
 lib/alloca.in.h \
 lib/argmatch.h.diff \
@@ -35,94 +34,14 @@ lib/error.h.diff \
 lib/error-progname.c \
 lib/error-progname.h \
 lib/exitfail.h.diff \
-lib/fd-ostream.oo.c \
-lib/fd-ostream.oo.h \
-lib/file-ostream.oo.c \
-lib/file-ostream.oo.h \
 lib/fnmatch.c.diff \
 lib/fnmatch_loop.c.diff \
 lib/getopt-core.h.diff \
 lib/gettext.h \
 lib/gl_array_list.h.diff \
-lib/glibconfig.in.h \
-lib/glib/ghash.c \
-lib/glib/ghash.in.h \
-lib/glib/glist.c \
-lib/glib/glist.in.h \
-lib/glib/gmessages.c \
-lib/glib/gprimes.c \
-lib/glib/gprimes.in.h \
-lib/glib/gstrfuncs.c \
-lib/glib/gstrfuncs.in.h \
-lib/glib/gstring.c \
-lib/glib/gstring.in.h \
-lib/glib/gtypes.in.h \
-lib/glib.in.h \
-lib/glib/README \
 lib/gl_linkedhash_list.h.diff \
 lib/hash.c \
 lib/hash.h \
-lib/html-ostream.oo.c \
-lib/html-ostream.oo.h \
-lib/html-styled-ostream.oo.c \
-lib/html-styled-ostream.oo.h \
-lib/iconv-ostream.oo.c \
-lib/iconv-ostream.oo.h \
-lib/libcroco/cr-additional-sel.c \
-lib/libcroco/cr-additional-sel.h \
-lib/libcroco/cr-attr-sel.c \
-lib/libcroco/cr-attr-sel.h \
-lib/libcroco/cr-cascade.c \
-lib/libcroco/cr-cascade.h \
-lib/libcroco/cr-declaration.c \
-lib/libcroco/cr-declaration.h \
-lib/libcroco/cr-doc-handler.c \
-lib/libcroco/cr-doc-handler.h \
-lib/libcroco/cr-enc-handler.c \
-lib/libcroco/cr-enc-handler.h \
-lib/libcroco/cr-fonts.c \
-lib/libcroco/cr-fonts.h \
-lib/libcroco/cr-input.c \
-lib/libcroco/cr-input.h \
-lib/libcroco/cr-num.c \
-lib/libcroco/cr-num.h \
-lib/libcroco/cr-om-parser.c \
-lib/libcroco/cr-om-parser.h \
-lib/libcroco/cr-parser.c \
-lib/libcroco/cr-parser.h \
-lib/libcroco/cr-parsing-location.c \
-lib/libcroco/cr-parsing-location.h \
-lib/libcroco/cr-prop-list.c \
-lib/libcroco/cr-prop-list.h \
-lib/libcroco/cr-pseudo.c \
-lib/libcroco/cr-pseudo.h \
-lib/libcroco/cr-rgb.c \
-lib/libcroco/cr-rgb.h \
-lib/libcroco/cr-selector.c \
-lib/libcroco/cr-selector.h \
-lib/libcroco/cr-sel-eng.c \
-lib/libcroco/cr-sel-eng.h \
-lib/libcroco/cr-simple-sel.c \
-lib/libcroco/cr-simple-sel.h \
-lib/libcroco/cr-statement.c \
-lib/libcroco/cr-statement.h \
-lib/libcroco/cr-string.c \
-lib/libcroco/cr-string.h \
-lib/libcroco/cr-style.c \
-lib/libcroco/cr-style.h \
-lib/libcroco/cr-stylesheet.c \
-lib/libcroco/cr-stylesheet.h \
-lib/libcroco/cr-term.c \
-lib/libcroco/cr-term.h \
-lib/libcroco/cr-tknzr.c \
-lib/libcroco/cr-tknzr.h \
-lib/libcroco/cr-token.c \
-lib/libcroco/cr-token.h \
-lib/libcroco/cr-utils.c \
-lib/libcroco/cr-utils.h \
-lib/libcroco/libcroco-config.h \
-lib/libcroco/libcroco.h \
-lib/libcroco/README \
 lib/libxml/buf.c \
 lib/libxml/buf.h \
 lib/libxml/c14n.c \
@@ -225,26 +144,9 @@ lib/libxml/xpointer.c \
 lib/libxml/xpointer.in.h \
 lib/markup.c \
 lib/markup.h \
-lib/memory-ostream.oo.c \
-lib/memory-ostream.oo.h \
-lib/moo.h \
-lib/noop-styled-ostream.oo.c \
-lib/noop-styled-ostream.oo.h \
 lib/obstack.h.diff \
-lib/ostream.oo.c \
-lib/ostream.oo.h \
 lib/progname.h.diff \
 lib/regex_internal.h.diff \
-lib/styled-ostream.oo.c \
-lib/styled-ostream.oo.h \
-lib/termcap.h \
-lib/terminfo.h \
-lib/term-ostream.oo.c \
-lib/term-ostream.oo.h \
-lib/term-styled-ostream.oo.c \
-lib/term-styled-ostream.oo.h \
-lib/tparm.c \
-lib/tputs.c \
 lib/unistd.in.h.diff \
 lib/xalloc.h \
 lib/xerror.c \
@@ -255,82 +157,25 @@ lib/xmalloc.c \
 lib/xstrdup.c \
 m4/alloca.m4 \
 m4/backupfile.m4 \
-m4/curses.m4 \
 m4/java.m4 \
-m4/libcroco.m4 \
-m4/libglib.m4 \
 m4/libxml.m4 \
-m4/moo.m4 \
-m4/termcap.m4 \
-m4/terminfo.m4 \
-m4/term-ostream.m4 \
 m4/unionwait.m4 \
 modules/backupfile \
 modules/basename \
 modules/closeout \
 modules/error-progname \
-modules/fd-ostream \
-modules/file-ostream \
 modules/fnmatch.diff \
 modules/gettext-runtime-misc \
 modules/gettext-tools-misc \
 modules/hash \
-modules/html-ostream \
-modules/html-styled-ostream \
-modules/iconv-ostream \
 modules/java \
-modules/libcroco \
-modules/libglib \
 modules/libtextstyle-dummy \
 modules/libxml \
 modules/markup \
-modules/memory-ostream \
-modules/moo \
-modules/moo-tests \
-modules/noop-styled-ostream \
-modules/ostream \
-modules/styled-ostream \
-modules/termcap \
-modules/termcap-h \
-modules/terminfo \
-modules/terminfo-h \
-modules/term-ostream \
-modules/term-ostream-tests \
-modules/term-styled-ostream \
 modules/wait-process.diff \
 modules/xalloc \
 modules/xalloc-die \
 modules/xerror \
-modules/xgetcwd \
-tests/test-moo-aroot.oo.c \
-tests/test-moo-aroot.oo.h \
-tests/test-moo-assign.c \
-tests/test-moo-asub1.oo.c \
-tests/test-moo-asub1.oo.h \
-tests/test-moo-root.oo.c \
-tests/test-moo-root.oo.h \
-tests/test-moo-sub1.oo.c \
-tests/test-moo-sub1.oo.h \
-tests/test-moo-sub2.oo.c \
-tests/test-moo-sub2.oo.h \
-tests/test-term-ostream.c \
-tests/test-term-ostream-xterm.sh \
-tests/test-term-ostream-xterm-16color.out \
-tests/test-term-ostream-xterm-256color.out \
-tests/test-term-ostream-xterm-88color.out \
-tests/test-term-ostream-xterm-8bit.out \
-tests/test-term-ostream-xterm-aix51.out \
-tests/test-term-ostream-xterm-basic-italic.out \
-tests/test-term-ostream-xterm-basic.out \
-tests/test-term-ostream-xterm-freebsd101.out \
-tests/test-term-ostream-xterm-irix65.out \
-tests/test-term-ostream-xterm-linux-debian.out \
-tests/test-term-ostream-xterm-linux-mandriva.out \
-tests/test-term-ostream-xterm-mingw.out \
-tests/test-term-ostream-xterm-netbsd3.out \
-tests/test-term-ostream-xterm-osf51.out \
-tests/test-term-ostream-xterm-r6.out \
-tests/test-term-ostream-xterm-solaris10.out \
-tests/test-term-ostream-xterm-xf86-v32.out
+modules/xgetcwd
 
 maintainer-update-po:
diff --git a/libtextstyle/Makefile.am b/libtextstyle/Makefile.am
index aa0ad25f5..e27b3a31f 100644
--- a/libtextstyle/Makefile.am
+++ b/libtextstyle/Makefile.am
@@ -27,6 +27,162 @@ EXTRA_DIST = \
   DEPENDENCIES \
   HACKING \
   autogen.sh \
+  gnulib-local/build-aux/moopp \
+  gnulib-local/lib/fd-ostream.oo.c \
+  gnulib-local/lib/fd-ostream.oo.h \
+  gnulib-local/lib/file-ostream.oo.c \
+  gnulib-local/lib/file-ostream.oo.h \
+  gnulib-local/lib/glibconfig.in.h \
+  gnulib-local/lib/glib/ghash.c \
+  gnulib-local/lib/glib/ghash.in.h \
+  gnulib-local/lib/glib/glist.c \
+  gnulib-local/lib/glib/glist.in.h \
+  gnulib-local/lib/glib/gmessages.c \
+  gnulib-local/lib/glib/gprimes.c \
+  gnulib-local/lib/glib/gprimes.in.h \
+  gnulib-local/lib/glib/gstrfuncs.c \
+  gnulib-local/lib/glib/gstrfuncs.in.h \
+  gnulib-local/lib/glib/gstring.c \
+  gnulib-local/lib/glib/gstring.in.h \
+  gnulib-local/lib/glib/gtypes.in.h \
+  gnulib-local/lib/glib.in.h \
+  gnulib-local/lib/glib/README \
+  gnulib-local/lib/html-ostream.oo.c \
+  gnulib-local/lib/html-ostream.oo.h \
+  gnulib-local/lib/html-styled-ostream.oo.c \
+  gnulib-local/lib/html-styled-ostream.oo.h \
+  gnulib-local/lib/iconv-ostream.oo.c \
+  gnulib-local/lib/iconv-ostream.oo.h \
+  gnulib-local/lib/libcroco/cr-additional-sel.c \
+  gnulib-local/lib/libcroco/cr-additional-sel.h \
+  gnulib-local/lib/libcroco/cr-attr-sel.c \
+  gnulib-local/lib/libcroco/cr-attr-sel.h \
+  gnulib-local/lib/libcroco/cr-cascade.c \
+  gnulib-local/lib/libcroco/cr-cascade.h \
+  gnulib-local/lib/libcroco/cr-declaration.c \
+  gnulib-local/lib/libcroco/cr-declaration.h \
+  gnulib-local/lib/libcroco/cr-doc-handler.c \
+  gnulib-local/lib/libcroco/cr-doc-handler.h \
+  gnulib-local/lib/libcroco/cr-enc-handler.c \
+  gnulib-local/lib/libcroco/cr-enc-handler.h \
+  gnulib-local/lib/libcroco/cr-fonts.c \
+  gnulib-local/lib/libcroco/cr-fonts.h \
+  gnulib-local/lib/libcroco/cr-input.c \
+  gnulib-local/lib/libcroco/cr-input.h \
+  gnulib-local/lib/libcroco/cr-num.c \
+  gnulib-local/lib/libcroco/cr-num.h \
+  gnulib-local/lib/libcroco/cr-om-parser.c \
+  gnulib-local/lib/libcroco/cr-om-parser.h \
+  gnulib-local/lib/libcroco/cr-parser.c \
+  gnulib-local/lib/libcroco/cr-parser.h \
+  gnulib-local/lib/libcroco/cr-parsing-location.c \
+  gnulib-local/lib/libcroco/cr-parsing-location.h \
+  gnulib-local/lib/libcroco/cr-prop-list.c \
+  gnulib-local/lib/libcroco/cr-prop-list.h \
+  gnulib-local/lib/libcroco/cr-pseudo.c \
+  gnulib-local/lib/libcroco/cr-pseudo.h \
+  gnulib-local/lib/libcroco/cr-rgb.c \
+  gnulib-local/lib/libcroco/cr-rgb.h \
+  gnulib-local/lib/libcroco/cr-selector.c \
+  gnulib-local/lib/libcroco/cr-selector.h \
+  gnulib-local/lib/libcroco/cr-sel-eng.c \
+  gnulib-local/lib/libcroco/cr-sel-eng.h \
+  gnulib-local/lib/libcroco/cr-simple-sel.c \
+  gnulib-local/lib/libcroco/cr-simple-sel.h \
+  gnulib-local/lib/libcroco/cr-statement.c \
+  gnulib-local/lib/libcroco/cr-statement.h \
+  gnulib-local/lib/libcroco/cr-string.c \
+  gnulib-local/lib/libcroco/cr-string.h \
+  gnulib-local/lib/libcroco/cr-style.c \
+  gnulib-local/lib/libcroco/cr-style.h \
+  gnulib-local/lib/libcroco/cr-stylesheet.c \
+  gnulib-local/lib/libcroco/cr-stylesheet.h \
+  gnulib-local/lib/libcroco/cr-term.c \
+  gnulib-local/lib/libcroco/cr-term.h \
+  gnulib-local/lib/libcroco/cr-tknzr.c \
+  gnulib-local/lib/libcroco/cr-tknzr.h \
+  gnulib-local/lib/libcroco/cr-token.c \
+  gnulib-local/lib/libcroco/cr-token.h \
+  gnulib-local/lib/libcroco/cr-utils.c \
+  gnulib-local/lib/libcroco/cr-utils.h \
+  gnulib-local/lib/libcroco/libcroco-config.h \
+  gnulib-local/lib/libcroco/libcroco.h \
+  gnulib-local/lib/libcroco/README \
+  gnulib-local/lib/memory-ostream.oo.c \
+  gnulib-local/lib/memory-ostream.oo.h \
+  gnulib-local/lib/moo.h \
+  gnulib-local/lib/noop-styled-ostream.oo.c \
+  gnulib-local/lib/noop-styled-ostream.oo.h \
+  gnulib-local/lib/ostream.oo.c \
+  gnulib-local/lib/ostream.oo.h \
+  gnulib-local/lib/styled-ostream.oo.c \
+  gnulib-local/lib/styled-ostream.oo.h \
+  gnulib-local/lib/termcap.h \
+  gnulib-local/lib/terminfo.h \
+  gnulib-local/lib/term-ostream.oo.c \
+  gnulib-local/lib/term-ostream.oo.h \
+  gnulib-local/lib/term-styled-ostream.oo.c \
+  gnulib-local/lib/term-styled-ostream.oo.h \
+  gnulib-local/lib/tparm.c \
+  gnulib-local/lib/tputs.c \
+  gnulib-local/m4/curses.m4 \
+  gnulib-local/m4/libcroco.m4 \
+  gnulib-local/m4/libglib.m4 \
+  gnulib-local/m4/moo.m4 \
+  gnulib-local/m4/termcap.m4 \
+  gnulib-local/m4/terminfo.m4 \
+  gnulib-local/m4/term-ostream.m4 \
+  gnulib-local/modules/fd-ostream \
+  gnulib-local/modules/file-ostream \
+  gnulib-local/modules/html-ostream \
+  gnulib-local/modules/html-styled-ostream \
+  gnulib-local/modules/iconv-ostream \
+  gnulib-local/modules/libcroco \
+  gnulib-local/modules/libglib \
+  gnulib-local/modules/memory-ostream \
+  gnulib-local/modules/moo \
+  gnulib-local/modules/moo-tests \
+  gnulib-local/modules/noop-styled-ostream \
+  gnulib-local/modules/ostream \
+  gnulib-local/modules/styled-ostream \
+  gnulib-local/modules/termcap \
+  gnulib-local/modules/termcap-h \
+  gnulib-local/modules/terminfo \
+  gnulib-local/modules/terminfo-h \
+  gnulib-local/modules/term-ostream \
+  gnulib-local/modules/term-ostream-tests \
+  gnulib-local/modules/term-styled-ostream \
+  gnulib-local/tests/test-moo-aroot.oo.c \
+  gnulib-local/tests/test-moo-aroot.oo.h \
+  gnulib-local/tests/test-moo-assign.c \
+  gnulib-local/tests/test-moo-asub1.oo.c \
+  gnulib-local/tests/test-moo-asub1.oo.h \
+  gnulib-local/tests/test-moo-root.oo.c \
+  gnulib-local/tests/test-moo-root.oo.h \
+  gnulib-local/tests/test-moo-sub1.oo.c \
+  gnulib-local/tests/test-moo-sub1.oo.h \
+  gnulib-local/tests/test-moo-sub2.oo.c \
+  gnulib-local/tests/test-moo-sub2.oo.h \
+  gnulib-local/tests/test-term-ostream.c \
+  gnulib-local/tests/test-term-ostream-xterm.sh \
+  gnulib-local/tests/test-term-ostream-xterm-16color.out \
+  gnulib-local/tests/test-term-ostream-xterm-256color.out \
+  gnulib-local/tests/test-term-ostream-xterm-88color.out \
+  gnulib-local/tests/test-term-ostream-xterm-8bit.out \
+  gnulib-local/tests/test-term-ostream-xterm-aix51.out \
+  gnulib-local/tests/test-term-ostream-xterm-basic-italic.out \
+  gnulib-local/tests/test-term-ostream-xterm-basic.out \
+  gnulib-local/tests/test-term-ostream-xterm-freebsd101.out \
+  gnulib-local/tests/test-term-ostream-xterm-irix65.out \
+  gnulib-local/tests/test-term-ostream-xterm-linux-debian.out \
+  gnulib-local/tests/test-term-ostream-xterm-linux-mandriva.out \
+  gnulib-local/tests/test-term-ostream-xterm-mingw.out \
+  gnulib-local/tests/test-term-ostream-xterm-netbsd3.out \
+  gnulib-local/tests/test-term-ostream-xterm-osf51.out \
+  gnulib-local/tests/test-term-ostream-xterm-r6.out \
+  gnulib-local/tests/test-term-ostream-xterm-solaris10.out \
+  gnulib-local/tests/test-term-ostream-xterm-xf86-v32.out \
+  build-aux/moopp \
   build-aux/texi2html \
   build-aux/run-test \
   build-aux/test-driver.diff \
diff --git a/gnulib-local/build-aux/moopp b/libtextstyle/gnulib-local/build-aux/moopp
similarity index 100%
rename from gnulib-local/build-aux/moopp
rename to libtextstyle/gnulib-local/build-aux/moopp
diff --git a/gnulib-local/lib/fd-ostream.oo.c b/libtextstyle/gnulib-local/lib/fd-ostream.oo.c
similarity index 100%
rename from gnulib-local/lib/fd-ostream.oo.c
rename to libtextstyle/gnulib-local/lib/fd-ostream.oo.c
diff --git a/gnulib-local/lib/fd-ostream.oo.h b/libtextstyle/gnulib-local/lib/fd-ostream.oo.h
similarity index 100%
rename from gnulib-local/lib/fd-ostream.oo.h
rename to libtextstyle/gnulib-local/lib/fd-ostream.oo.h
diff --git a/gnulib-local/lib/file-ostream.oo.c b/libtextstyle/gnulib-local/lib/file-ostream.oo.c
similarity index 100%
rename from gnulib-local/lib/file-ostream.oo.c
rename to libtextstyle/gnulib-local/lib/file-ostream.oo.c
diff --git a/gnulib-local/lib/file-ostream.oo.h b/libtextstyle/gnulib-local/lib/file-ostream.oo.h
similarity index 100%
rename from gnulib-local/lib/file-ostream.oo.h
rename to libtextstyle/gnulib-local/lib/file-ostream.oo.h
diff --git a/gnulib-local/lib/glib.in.h b/libtextstyle/gnulib-local/lib/glib.in.h
similarity index 100%
rename from gnulib-local/lib/glib.in.h
rename to libtextstyle/gnulib-local/lib/glib.in.h
diff --git a/gnulib-local/lib/glib/README b/libtextstyle/gnulib-local/lib/glib/README
similarity index 100%
rename from gnulib-local/lib/glib/README
rename to libtextstyle/gnulib-local/lib/glib/README
diff --git a/gnulib-local/lib/glib/ghash.c b/libtextstyle/gnulib-local/lib/glib/ghash.c
similarity index 100%
rename from gnulib-local/lib/glib/ghash.c
rename to libtextstyle/gnulib-local/lib/glib/ghash.c
diff --git a/gnulib-local/lib/glib/ghash.in.h b/libtextstyle/gnulib-local/lib/glib/ghash.in.h
similarity index 100%
rename from gnulib-local/lib/glib/ghash.in.h
rename to libtextstyle/gnulib-local/lib/glib/ghash.in.h
diff --git a/gnulib-local/lib/glib/glist.c b/libtextstyle/gnulib-local/lib/glib/glist.c
similarity index 100%
rename from gnulib-local/lib/glib/glist.c
rename to libtextstyle/gnulib-local/lib/glib/glist.c
diff --git a/gnulib-local/lib/glib/glist.in.h b/libtextstyle/gnulib-local/lib/glib/glist.in.h
similarity index 100%
rename from gnulib-local/lib/glib/glist.in.h
rename to libtextstyle/gnulib-local/lib/glib/glist.in.h
diff --git a/gnulib-local/lib/glib/gmessages.c b/libtextstyle/gnulib-local/lib/glib/gmessages.c
similarity index 100%
rename from gnulib-local/lib/glib/gmessages.c
rename to libtextstyle/gnulib-local/lib/glib/gmessages.c
diff --git a/gnulib-local/lib/glib/gprimes.c b/libtextstyle/gnulib-local/lib/glib/gprimes.c
similarity index 100%
rename from gnulib-local/lib/glib/gprimes.c
rename to libtextstyle/gnulib-local/lib/glib/gprimes.c
diff --git a/gnulib-local/lib/glib/gprimes.in.h b/libtextstyle/gnulib-local/lib/glib/gprimes.in.h
similarity index 100%
rename from gnulib-local/lib/glib/gprimes.in.h
rename to libtextstyle/gnulib-local/lib/glib/gprimes.in.h
diff --git a/gnulib-local/lib/glib/gstrfuncs.c b/libtextstyle/gnulib-local/lib/glib/gstrfuncs.c
similarity index 100%
rename from gnulib-local/lib/glib/gstrfuncs.c
rename to libtextstyle/gnulib-local/lib/glib/gstrfuncs.c
diff --git a/gnulib-local/lib/glib/gstrfuncs.in.h b/libtextstyle/gnulib-local/lib/glib/gstrfuncs.in.h
similarity index 100%
rename from gnulib-local/lib/glib/gstrfuncs.in.h
rename to libtextstyle/gnulib-local/lib/glib/gstrfuncs.in.h
diff --git a/gnulib-local/lib/glib/gstring.c b/libtextstyle/gnulib-local/lib/glib/gstring.c
similarity index 100%
rename from gnulib-local/lib/glib/gstring.c
rename to libtextstyle/gnulib-local/lib/glib/gstring.c
diff --git a/gnulib-local/lib/glib/gstring.in.h b/libtextstyle/gnulib-local/lib/glib/gstring.in.h
similarity index 100%
rename from gnulib-local/lib/glib/gstring.in.h
rename to libtextstyle/gnulib-local/lib/glib/gstring.in.h
diff --git a/gnulib-local/lib/glib/gtypes.in.h b/libtextstyle/gnulib-local/lib/glib/gtypes.in.h
similarity index 100%
rename from gnulib-local/lib/glib/gtypes.in.h
rename to libtextstyle/gnulib-local/lib/glib/gtypes.in.h
diff --git a/gnulib-local/lib/glibconfig.in.h b/libtextstyle/gnulib-local/lib/glibconfig.in.h
similarity index 100%
rename from gnulib-local/lib/glibconfig.in.h
rename to libtextstyle/gnulib-local/lib/glibconfig.in.h
diff --git a/gnulib-local/lib/html-ostream.oo.c b/libtextstyle/gnulib-local/lib/html-ostream.oo.c
similarity index 100%
rename from gnulib-local/lib/html-ostream.oo.c
rename to libtextstyle/gnulib-local/lib/html-ostream.oo.c
diff --git a/gnulib-local/lib/html-ostream.oo.h b/libtextstyle/gnulib-local/lib/html-ostream.oo.h
similarity index 100%
rename from gnulib-local/lib/html-ostream.oo.h
rename to libtextstyle/gnulib-local/lib/html-ostream.oo.h
diff --git a/gnulib-local/lib/html-styled-ostream.oo.c b/libtextstyle/gnulib-local/lib/html-styled-ostream.oo.c
similarity index 100%
rename from gnulib-local/lib/html-styled-ostream.oo.c
rename to libtextstyle/gnulib-local/lib/html-styled-ostream.oo.c
diff --git a/gnulib-local/lib/html-styled-ostream.oo.h b/libtextstyle/gnulib-local/lib/html-styled-ostream.oo.h
similarity index 100%
rename from gnulib-local/lib/html-styled-ostream.oo.h
rename to libtextstyle/gnulib-local/lib/html-styled-ostream.oo.h
diff --git a/gnulib-local/lib/iconv-ostream.oo.c b/libtextstyle/gnulib-local/lib/iconv-ostream.oo.c
similarity index 100%
rename from gnulib-local/lib/iconv-ostream.oo.c
rename to libtextstyle/gnulib-local/lib/iconv-ostream.oo.c
diff --git a/gnulib-local/lib/iconv-ostream.oo.h b/libtextstyle/gnulib-local/lib/iconv-ostream.oo.h
similarity index 100%
rename from gnulib-local/lib/iconv-ostream.oo.h
rename to libtextstyle/gnulib-local/lib/iconv-ostream.oo.h
diff --git a/gnulib-local/lib/libcroco/README b/libtextstyle/gnulib-local/lib/libcroco/README
similarity index 100%
rename from gnulib-local/lib/libcroco/README
rename to libtextstyle/gnulib-local/lib/libcroco/README
diff --git a/gnulib-local/lib/libcroco/cr-additional-sel.c b/libtextstyle/gnulib-local/lib/libcroco/cr-additional-sel.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-additional-sel.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-additional-sel.c
diff --git a/gnulib-local/lib/libcroco/cr-additional-sel.h b/libtextstyle/gnulib-local/lib/libcroco/cr-additional-sel.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-additional-sel.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-additional-sel.h
diff --git a/gnulib-local/lib/libcroco/cr-attr-sel.c b/libtextstyle/gnulib-local/lib/libcroco/cr-attr-sel.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-attr-sel.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-attr-sel.c
diff --git a/gnulib-local/lib/libcroco/cr-attr-sel.h b/libtextstyle/gnulib-local/lib/libcroco/cr-attr-sel.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-attr-sel.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-attr-sel.h
diff --git a/gnulib-local/lib/libcroco/cr-cascade.c b/libtextstyle/gnulib-local/lib/libcroco/cr-cascade.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-cascade.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-cascade.c
diff --git a/gnulib-local/lib/libcroco/cr-cascade.h b/libtextstyle/gnulib-local/lib/libcroco/cr-cascade.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-cascade.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-cascade.h
diff --git a/gnulib-local/lib/libcroco/cr-declaration.c b/libtextstyle/gnulib-local/lib/libcroco/cr-declaration.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-declaration.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-declaration.c
diff --git a/gnulib-local/lib/libcroco/cr-declaration.h b/libtextstyle/gnulib-local/lib/libcroco/cr-declaration.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-declaration.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-declaration.h
diff --git a/gnulib-local/lib/libcroco/cr-doc-handler.c b/libtextstyle/gnulib-local/lib/libcroco/cr-doc-handler.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-doc-handler.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-doc-handler.c
diff --git a/gnulib-local/lib/libcroco/cr-doc-handler.h b/libtextstyle/gnulib-local/lib/libcroco/cr-doc-handler.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-doc-handler.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-doc-handler.h
diff --git a/gnulib-local/lib/libcroco/cr-enc-handler.c b/libtextstyle/gnulib-local/lib/libcroco/cr-enc-handler.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-enc-handler.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-enc-handler.c
diff --git a/gnulib-local/lib/libcroco/cr-enc-handler.h b/libtextstyle/gnulib-local/lib/libcroco/cr-enc-handler.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-enc-handler.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-enc-handler.h
diff --git a/gnulib-local/lib/libcroco/cr-fonts.c b/libtextstyle/gnulib-local/lib/libcroco/cr-fonts.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-fonts.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-fonts.c
diff --git a/gnulib-local/lib/libcroco/cr-fonts.h b/libtextstyle/gnulib-local/lib/libcroco/cr-fonts.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-fonts.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-fonts.h
diff --git a/gnulib-local/lib/libcroco/cr-input.c b/libtextstyle/gnulib-local/lib/libcroco/cr-input.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-input.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-input.c
diff --git a/gnulib-local/lib/libcroco/cr-input.h b/libtextstyle/gnulib-local/lib/libcroco/cr-input.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-input.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-input.h
diff --git a/gnulib-local/lib/libcroco/cr-num.c b/libtextstyle/gnulib-local/lib/libcroco/cr-num.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-num.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-num.c
diff --git a/gnulib-local/lib/libcroco/cr-num.h b/libtextstyle/gnulib-local/lib/libcroco/cr-num.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-num.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-num.h
diff --git a/gnulib-local/lib/libcroco/cr-om-parser.c b/libtextstyle/gnulib-local/lib/libcroco/cr-om-parser.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-om-parser.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-om-parser.c
diff --git a/gnulib-local/lib/libcroco/cr-om-parser.h b/libtextstyle/gnulib-local/lib/libcroco/cr-om-parser.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-om-parser.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-om-parser.h
diff --git a/gnulib-local/lib/libcroco/cr-parser.c b/libtextstyle/gnulib-local/lib/libcroco/cr-parser.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-parser.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-parser.c
diff --git a/gnulib-local/lib/libcroco/cr-parser.h b/libtextstyle/gnulib-local/lib/libcroco/cr-parser.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-parser.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-parser.h
diff --git a/gnulib-local/lib/libcroco/cr-parsing-location.c b/libtextstyle/gnulib-local/lib/libcroco/cr-parsing-location.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-parsing-location.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-parsing-location.c
diff --git a/gnulib-local/lib/libcroco/cr-parsing-location.h b/libtextstyle/gnulib-local/lib/libcroco/cr-parsing-location.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-parsing-location.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-parsing-location.h
diff --git a/gnulib-local/lib/libcroco/cr-prop-list.c b/libtextstyle/gnulib-local/lib/libcroco/cr-prop-list.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-prop-list.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-prop-list.c
diff --git a/gnulib-local/lib/libcroco/cr-prop-list.h b/libtextstyle/gnulib-local/lib/libcroco/cr-prop-list.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-prop-list.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-prop-list.h
diff --git a/gnulib-local/lib/libcroco/cr-pseudo.c b/libtextstyle/gnulib-local/lib/libcroco/cr-pseudo.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-pseudo.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-pseudo.c
diff --git a/gnulib-local/lib/libcroco/cr-pseudo.h b/libtextstyle/gnulib-local/lib/libcroco/cr-pseudo.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-pseudo.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-pseudo.h
diff --git a/gnulib-local/lib/libcroco/cr-rgb.c b/libtextstyle/gnulib-local/lib/libcroco/cr-rgb.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-rgb.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-rgb.c
diff --git a/gnulib-local/lib/libcroco/cr-rgb.h b/libtextstyle/gnulib-local/lib/libcroco/cr-rgb.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-rgb.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-rgb.h
diff --git a/gnulib-local/lib/libcroco/cr-sel-eng.c b/libtextstyle/gnulib-local/lib/libcroco/cr-sel-eng.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-sel-eng.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-sel-eng.c
diff --git a/gnulib-local/lib/libcroco/cr-sel-eng.h b/libtextstyle/gnulib-local/lib/libcroco/cr-sel-eng.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-sel-eng.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-sel-eng.h
diff --git a/gnulib-local/lib/libcroco/cr-selector.c b/libtextstyle/gnulib-local/lib/libcroco/cr-selector.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-selector.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-selector.c
diff --git a/gnulib-local/lib/libcroco/cr-selector.h b/libtextstyle/gnulib-local/lib/libcroco/cr-selector.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-selector.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-selector.h
diff --git a/gnulib-local/lib/libcroco/cr-simple-sel.c b/libtextstyle/gnulib-local/lib/libcroco/cr-simple-sel.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-simple-sel.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-simple-sel.c
diff --git a/gnulib-local/lib/libcroco/cr-simple-sel.h b/libtextstyle/gnulib-local/lib/libcroco/cr-simple-sel.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-simple-sel.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-simple-sel.h
diff --git a/gnulib-local/lib/libcroco/cr-statement.c b/libtextstyle/gnulib-local/lib/libcroco/cr-statement.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-statement.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-statement.c
diff --git a/gnulib-local/lib/libcroco/cr-statement.h b/libtextstyle/gnulib-local/lib/libcroco/cr-statement.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-statement.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-statement.h
diff --git a/gnulib-local/lib/libcroco/cr-string.c b/libtextstyle/gnulib-local/lib/libcroco/cr-string.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-string.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-string.c
diff --git a/gnulib-local/lib/libcroco/cr-string.h b/libtextstyle/gnulib-local/lib/libcroco/cr-string.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-string.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-string.h
diff --git a/gnulib-local/lib/libcroco/cr-style.c b/libtextstyle/gnulib-local/lib/libcroco/cr-style.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-style.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-style.c
diff --git a/gnulib-local/lib/libcroco/cr-style.h b/libtextstyle/gnulib-local/lib/libcroco/cr-style.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-style.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-style.h
diff --git a/gnulib-local/lib/libcroco/cr-stylesheet.c b/libtextstyle/gnulib-local/lib/libcroco/cr-stylesheet.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-stylesheet.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-stylesheet.c
diff --git a/gnulib-local/lib/libcroco/cr-stylesheet.h b/libtextstyle/gnulib-local/lib/libcroco/cr-stylesheet.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-stylesheet.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-stylesheet.h
diff --git a/gnulib-local/lib/libcroco/cr-term.c b/libtextstyle/gnulib-local/lib/libcroco/cr-term.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-term.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-term.c
diff --git a/gnulib-local/lib/libcroco/cr-term.h b/libtextstyle/gnulib-local/lib/libcroco/cr-term.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-term.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-term.h
diff --git a/gnulib-local/lib/libcroco/cr-tknzr.c b/libtextstyle/gnulib-local/lib/libcroco/cr-tknzr.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-tknzr.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-tknzr.c
diff --git a/gnulib-local/lib/libcroco/cr-tknzr.h b/libtextstyle/gnulib-local/lib/libcroco/cr-tknzr.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-tknzr.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-tknzr.h
diff --git a/gnulib-local/lib/libcroco/cr-token.c b/libtextstyle/gnulib-local/lib/libcroco/cr-token.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-token.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-token.c
diff --git a/gnulib-local/lib/libcroco/cr-token.h b/libtextstyle/gnulib-local/lib/libcroco/cr-token.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-token.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-token.h
diff --git a/gnulib-local/lib/libcroco/cr-utils.c b/libtextstyle/gnulib-local/lib/libcroco/cr-utils.c
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-utils.c
rename to libtextstyle/gnulib-local/lib/libcroco/cr-utils.c
diff --git a/gnulib-local/lib/libcroco/cr-utils.h b/libtextstyle/gnulib-local/lib/libcroco/cr-utils.h
similarity index 100%
rename from gnulib-local/lib/libcroco/cr-utils.h
rename to libtextstyle/gnulib-local/lib/libcroco/cr-utils.h
diff --git a/gnulib-local/lib/libcroco/libcroco-config.h b/libtextstyle/gnulib-local/lib/libcroco/libcroco-config.h
similarity index 100%
rename from gnulib-local/lib/libcroco/libcroco-config.h
rename to libtextstyle/gnulib-local/lib/libcroco/libcroco-config.h
diff --git a/gnulib-local/lib/libcroco/libcroco.h b/libtextstyle/gnulib-local/lib/libcroco/libcroco.h
similarity index 100%
rename from gnulib-local/lib/libcroco/libcroco.h
rename to libtextstyle/gnulib-local/lib/libcroco/libcroco.h
diff --git a/gnulib-local/lib/memory-ostream.oo.c b/libtextstyle/gnulib-local/lib/memory-ostream.oo.c
similarity index 100%
rename from gnulib-local/lib/memory-ostream.oo.c
rename to libtextstyle/gnulib-local/lib/memory-ostream.oo.c
diff --git a/gnulib-local/lib/memory-ostream.oo.h b/libtextstyle/gnulib-local/lib/memory-ostream.oo.h
similarity index 100%
rename from gnulib-local/lib/memory-ostream.oo.h
rename to libtextstyle/gnulib-local/lib/memory-ostream.oo.h
diff --git a/gnulib-local/lib/moo.h b/libtextstyle/gnulib-local/lib/moo.h
similarity index 100%
rename from gnulib-local/lib/moo.h
rename to libtextstyle/gnulib-local/lib/moo.h
diff --git a/gnulib-local/lib/noop-styled-ostream.oo.c b/libtextstyle/gnulib-local/lib/noop-styled-ostream.oo.c
similarity index 100%
rename from gnulib-local/lib/noop-styled-ostream.oo.c
rename to libtextstyle/gnulib-local/lib/noop-styled-ostream.oo.c
diff --git a/gnulib-local/lib/noop-styled-ostream.oo.h b/libtextstyle/gnulib-local/lib/noop-styled-ostream.oo.h
similarity index 100%
rename from gnulib-local/lib/noop-styled-ostream.oo.h
rename to libtextstyle/gnulib-local/lib/noop-styled-ostream.oo.h
diff --git a/gnulib-local/lib/ostream.oo.c b/libtextstyle/gnulib-local/lib/ostream.oo.c
similarity index 100%
rename from gnulib-local/lib/ostream.oo.c
rename to libtextstyle/gnulib-local/lib/ostream.oo.c
diff --git a/gnulib-local/lib/ostream.oo.h b/libtextstyle/gnulib-local/lib/ostream.oo.h
similarity index 100%
rename from gnulib-local/lib/ostream.oo.h
rename to libtextstyle/gnulib-local/lib/ostream.oo.h
diff --git a/gnulib-local/lib/styled-ostream.oo.c b/libtextstyle/gnulib-local/lib/styled-ostream.oo.c
similarity index 100%
rename from gnulib-local/lib/styled-ostream.oo.c
rename to libtextstyle/gnulib-local/lib/styled-ostream.oo.c
diff --git a/gnulib-local/lib/styled-ostream.oo.h b/libtextstyle/gnulib-local/lib/styled-ostream.oo.h
similarity index 100%
rename from gnulib-local/lib/styled-ostream.oo.h
rename to libtextstyle/gnulib-local/lib/styled-ostream.oo.h
diff --git a/gnulib-local/lib/term-ostream.oo.c b/libtextstyle/gnulib-local/lib/term-ostream.oo.c
similarity index 100%
rename from gnulib-local/lib/term-ostream.oo.c
rename to libtextstyle/gnulib-local/lib/term-ostream.oo.c
diff --git a/gnulib-local/lib/term-ostream.oo.h b/libtextstyle/gnulib-local/lib/term-ostream.oo.h
similarity index 100%
rename from gnulib-local/lib/term-ostream.oo.h
rename to libtextstyle/gnulib-local/lib/term-ostream.oo.h
diff --git a/gnulib-local/lib/term-styled-ostream.oo.c b/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c
similarity index 100%
rename from gnulib-local/lib/term-styled-ostream.oo.c
rename to libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c
diff --git a/gnulib-local/lib/term-styled-ostream.oo.h b/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.h
similarity index 100%
rename from gnulib-local/lib/term-styled-ostream.oo.h
rename to libtextstyle/gnulib-local/lib/term-styled-ostream.oo.h
diff --git a/gnulib-local/lib/termcap.h b/libtextstyle/gnulib-local/lib/termcap.h
similarity index 100%
rename from gnulib-local/lib/termcap.h
rename to libtextstyle/gnulib-local/lib/termcap.h
diff --git a/gnulib-local/lib/terminfo.h b/libtextstyle/gnulib-local/lib/terminfo.h
similarity index 100%
rename from gnulib-local/lib/terminfo.h
rename to libtextstyle/gnulib-local/lib/terminfo.h
diff --git a/gnulib-local/lib/tparm.c b/libtextstyle/gnulib-local/lib/tparm.c
similarity index 100%
rename from gnulib-local/lib/tparm.c
rename to libtextstyle/gnulib-local/lib/tparm.c
diff --git a/gnulib-local/lib/tputs.c b/libtextstyle/gnulib-local/lib/tputs.c
similarity index 100%
rename from gnulib-local/lib/tputs.c
rename to libtextstyle/gnulib-local/lib/tputs.c
diff --git a/gnulib-local/m4/curses.m4 b/libtextstyle/gnulib-local/m4/curses.m4
similarity index 100%
rename from gnulib-local/m4/curses.m4
rename to libtextstyle/gnulib-local/m4/curses.m4
diff --git a/gnulib-local/m4/libcroco.m4 b/libtextstyle/gnulib-local/m4/libcroco.m4
similarity index 100%
rename from gnulib-local/m4/libcroco.m4
rename to libtextstyle/gnulib-local/m4/libcroco.m4
diff --git a/gnulib-local/m4/libglib.m4 b/libtextstyle/gnulib-local/m4/libglib.m4
similarity index 100%
rename from gnulib-local/m4/libglib.m4
rename to libtextstyle/gnulib-local/m4/libglib.m4
diff --git a/gnulib-local/m4/moo.m4 b/libtextstyle/gnulib-local/m4/moo.m4
similarity index 100%
rename from gnulib-local/m4/moo.m4
rename to libtextstyle/gnulib-local/m4/moo.m4
diff --git a/gnulib-local/m4/term-ostream.m4 b/libtextstyle/gnulib-local/m4/term-ostream.m4
similarity index 100%
rename from gnulib-local/m4/term-ostream.m4
rename to libtextstyle/gnulib-local/m4/term-ostream.m4
diff --git a/gnulib-local/m4/termcap.m4 b/libtextstyle/gnulib-local/m4/termcap.m4
similarity index 100%
rename from gnulib-local/m4/termcap.m4
rename to libtextstyle/gnulib-local/m4/termcap.m4
diff --git a/gnulib-local/m4/terminfo.m4 b/libtextstyle/gnulib-local/m4/terminfo.m4
similarity index 100%
rename from gnulib-local/m4/terminfo.m4
rename to libtextstyle/gnulib-local/m4/terminfo.m4
diff --git a/gnulib-local/modules/fd-ostream b/libtextstyle/gnulib-local/modules/fd-ostream
similarity index 100%
rename from gnulib-local/modules/fd-ostream
rename to libtextstyle/gnulib-local/modules/fd-ostream
diff --git a/gnulib-local/modules/file-ostream b/libtextstyle/gnulib-local/modules/file-ostream
similarity index 100%
rename from gnulib-local/modules/file-ostream
rename to libtextstyle/gnulib-local/modules/file-ostream
diff --git a/gnulib-local/modules/html-ostream b/libtextstyle/gnulib-local/modules/html-ostream
similarity index 100%
rename from gnulib-local/modules/html-ostream
rename to libtextstyle/gnulib-local/modules/html-ostream
diff --git a/gnulib-local/modules/html-styled-ostream b/libtextstyle/gnulib-local/modules/html-styled-ostream
similarity index 96%
rename from gnulib-local/modules/html-styled-ostream
rename to libtextstyle/gnulib-local/modules/html-styled-ostream
index 5012e0d8b..87dd634b2 100644
--- a/gnulib-local/modules/html-styled-ostream
+++ b/libtextstyle/gnulib-local/modules/html-styled-ostream
@@ -20,11 +20,7 @@ close
 configure.ac:
 
 Makefile.am:
-if !WOE32DLL
 lib_SOURCES += html-styled-ostream.c
-else
-lib_SOURCES += ../woe32dll/c++html-styled-ostream.cc
-endif
 # This is a Makefile rule that generates multiple files at once; see the
 # automake documentation, node "Multiple Outputs", for details.
 $(srcdir)/html-styled-ostream.h : $(top_srcdir)/build-aux/moopp html-styled-ostream.oo.h html-styled-ostream.oo.c styled-ostream.oo.h ostream.oo.h
diff --git a/libtextstyle/gnulib-local/modules/html-styled-ostream.diff b/libtextstyle/gnulib-local/modules/html-styled-ostream.diff
deleted file mode 100644
index 90d343913..000000000
--- a/libtextstyle/gnulib-local/modules/html-styled-ostream.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-*** html-styled-ostream.orig
---- html-styled-ostream
-***************
-*** 20,30 ****
-  configure.ac:
-  
-  Makefile.am:
-- if !WOE32DLL
-  lib_SOURCES += html-styled-ostream.c
-- else
-- lib_SOURCES += ../woe32dll/c++html-styled-ostream.cc
-- endif
-  # This is a Makefile rule that generates multiple files at once; see the
-  # automake documentation, node "Multiple Outputs", for details.
-  $(srcdir)/html-styled-ostream.h : $(top_srcdir)/build-aux/moopp html-styled-ostream.oo.h html-styled-ostream.oo.c styled-ostream.oo.h ostream.oo.h
---- 20,26 ----
-  configure.ac:
-  
-  Makefile.am:
-  lib_SOURCES += html-styled-ostream.c
-  # This is a Makefile rule that generates multiple files at once; see the
-  # automake documentation, node "Multiple Outputs", for details.
-  $(srcdir)/html-styled-ostream.h : $(top_srcdir)/build-aux/moopp html-styled-ostream.oo.h html-styled-ostream.oo.c styled-ostream.oo.h ostream.oo.h
diff --git a/gnulib-local/modules/iconv-ostream b/libtextstyle/gnulib-local/modules/iconv-ostream
similarity index 100%
rename from gnulib-local/modules/iconv-ostream
rename to libtextstyle/gnulib-local/modules/iconv-ostream
diff --git a/gnulib-local/modules/libcroco b/libtextstyle/gnulib-local/modules/libcroco
similarity index 80%
rename from gnulib-local/modules/libcroco
rename to libtextstyle/gnulib-local/modules/libcroco
index 6efeb555f..2d9933fd5 100644
--- a/gnulib-local/modules/libcroco
+++ b/libtextstyle/gnulib-local/modules/libcroco
@@ -65,7 +65,17 @@ libxml
 no-c++
 
 configure.ac:
-gl_LIBCROCO
+# In libtextstyle, we don't want to use an external libcroco, because its
+# dependencies and their dynamic relocations have an impact on the startup
+# time of a program that is linked with it. As you can see by using
+# 'readelf -r ... | wc -l' and 'readelf -d ... | grep NEEDED':
+# - libcroco.so depends on libxml2.
+#   - libxml2.so has more than 3300 relocations and depends on libicuuc.
+#     - libicuuc.so has more than 4900 relocations and depends on libstdc++.
+#       - libstdc++.so has more than 4600 relocations.
+# These are more than 12800 relocations, to perform at program startup.
+# So, force the use of the included libcroco part.
+gl_LIBCROCO([yes])
 
 Makefile.am:
 AM_CPPFLAGS += $(INCGLIB)
diff --git a/libtextstyle/gnulib-local/modules/libcroco.diff b/libtextstyle/gnulib-local/modules/libcroco.diff
deleted file mode 100644
index deea60bc7..000000000
--- a/libtextstyle/gnulib-local/modules/libcroco.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-*** libcroco.orig	2019-02-14 20:54:15.681209898 +0100
---- libcroco	2019-02-14 21:08:00.529990044 +0100
-***************
-*** 65,71 ****
-  no-c++
-  
-  configure.ac:
-! gl_LIBCROCO
-  
-  Makefile.am:
-  AM_CPPFLAGS += $(INCGLIB)
---- 65,81 ----
-  no-c++
-  
-  configure.ac:
-! # In libtextstyle, we don't want to use an external libcroco, because its
-! # dependencies and their dynamic relocations have an impact on the startup
-! # time of a program that is linked with it. As you can see by using
-! # 'readelf -r ... | wc -l' and 'readelf -d ... | grep NEEDED':
-! # - libcroco.so depends on libxml2.
-! #   - libxml2.so has more than 3300 relocations and depends on libicuuc.
-! #     - libicuuc.so has more than 4900 relocations and depends on libstdc++.
-! #       - libstdc++.so has more than 4600 relocations.
-! # These are more than 12800 relocations, to perform at program startup.
-! # So, force the use of the included libcroco part.
-! gl_LIBCROCO([yes])
-  
-  Makefile.am:
-  AM_CPPFLAGS += $(INCGLIB)
diff --git a/gnulib-local/modules/libglib b/libtextstyle/gnulib-local/modules/libglib
similarity index 81%
rename from gnulib-local/modules/libglib
rename to libtextstyle/gnulib-local/modules/libglib
index 909e08404..77980ec7e 100644
--- a/gnulib-local/modules/libglib
+++ b/libtextstyle/gnulib-local/modules/libglib
@@ -26,7 +26,15 @@ xvasprintf
 no-c++
 
 configure.ac:
-gl_LIBGLIB
+# In libtextstyle, we don't want to use an external libglib, because its
+# dynamic relocations have an impact on the startup time of a program that
+# is linked with it. As you can see by using 'readelf -r ... | wc -l',
+# 'readelf -d ... | grep NEEDED', and 'nm --dynamic ...':
+# - libglib-2.0.so has more than 300 relocations and depends on libpcre.
+# - But libtextstyle needs only less than 10% of libglib: out of the more
+#   than 1600 exported symbols, libtextstyle needs less than 160.
+# So, force the use of the included libglib part.
+gl_LIBGLIB([yes])
 
 Makefile.am:
 if INCLUDED_LIBGLIB
diff --git a/libtextstyle/gnulib-local/modules/libglib.diff b/libtextstyle/gnulib-local/modules/libglib.diff
deleted file mode 100644
index b13b2e828..000000000
--- a/libtextstyle/gnulib-local/modules/libglib.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- libglib.orig	2019-02-08 20:25:17.922495262 +0100
-+++ libglib	2019-02-15 00:54:59.402112246 +0100
-@@ -26,7 +26,15 @@
- no-c++
- 
- configure.ac:
--gl_LIBGLIB
-+# In libtextstyle, we don't want to use an external libglib, because its
-+# dynamic relocations have an impact on the startup time of a program that
-+# is linked with it. As you can see by using 'readelf -r ... | wc -l',
-+# 'readelf -d ... | grep NEEDED', and 'nm --dynamic ...':
-+# - libglib-2.0.so has more than 300 relocations and depends on libpcre.
-+# - But libtextstyle needs only less than 10% of libglib: out of the more
-+#   than 1600 exported symbols, libtextstyle needs less than 160.
-+# So, force the use of the included libglib part.
-+gl_LIBGLIB([yes])
- 
- Makefile.am:
- if INCLUDED_LIBGLIB
diff --git a/gnulib-local/modules/memory-ostream b/libtextstyle/gnulib-local/modules/memory-ostream
similarity index 100%
rename from gnulib-local/modules/memory-ostream
rename to libtextstyle/gnulib-local/modules/memory-ostream
diff --git a/gnulib-local/modules/moo b/libtextstyle/gnulib-local/modules/moo
similarity index 100%
rename from gnulib-local/modules/moo
rename to libtextstyle/gnulib-local/modules/moo
diff --git a/gnulib-local/modules/moo-tests b/libtextstyle/gnulib-local/modules/moo-tests
similarity index 100%
rename from gnulib-local/modules/moo-tests
rename to libtextstyle/gnulib-local/modules/moo-tests
diff --git a/gnulib-local/modules/noop-styled-ostream b/libtextstyle/gnulib-local/modules/noop-styled-ostream
similarity index 96%
rename from gnulib-local/modules/noop-styled-ostream
rename to libtextstyle/gnulib-local/modules/noop-styled-ostream
index 9fcd12ccb..d1be7b5de 100644
--- a/gnulib-local/modules/noop-styled-ostream
+++ b/libtextstyle/gnulib-local/modules/noop-styled-ostream
@@ -13,11 +13,7 @@ xalloc
 configure.ac:
 
 Makefile.am:
-if !WOE32DLL
 lib_SOURCES += noop-styled-ostream.c
-else
-lib_SOURCES += ../woe32dll/c++noop-styled-ostream.cc
-endif
 # This is a Makefile rule that generates multiple files at once; see the
 # automake documentation, node "Multiple Outputs", for details.
 $(srcdir)/noop-styled-ostream.h : $(top_srcdir)/build-aux/moopp noop-styled-ostream.oo.h noop-styled-ostream.oo.c styled-ostream.oo.h ostream.oo.h
diff --git a/libtextstyle/gnulib-local/modules/noop-styled-ostream.diff b/libtextstyle/gnulib-local/modules/noop-styled-ostream.diff
deleted file mode 100644
index cef0a0677..000000000
--- a/libtextstyle/gnulib-local/modules/noop-styled-ostream.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-*** noop-styled-ostream.orig
---- noop-styled-ostream
-***************
-*** 13,23 ****
-  configure.ac:
-  
-  Makefile.am:
-- if !WOE32DLL
-  lib_SOURCES += noop-styled-ostream.c
-- else
-- lib_SOURCES += ../woe32dll/c++noop-styled-ostream.cc
-- endif
-  # This is a Makefile rule that generates multiple files at once; see the
-  # automake documentation, node "Multiple Outputs", for details.
-  $(srcdir)/noop-styled-ostream.h : $(top_srcdir)/build-aux/moopp noop-styled-ostream.oo.h noop-styled-ostream.oo.c styled-ostream.oo.h ostream.oo.h
---- 13,19 ----
-  configure.ac:
-  
-  Makefile.am:
-  lib_SOURCES += noop-styled-ostream.c
-  # This is a Makefile rule that generates multiple files at once; see the
-  # automake documentation, node "Multiple Outputs", for details.
-  $(srcdir)/noop-styled-ostream.h : $(top_srcdir)/build-aux/moopp noop-styled-ostream.oo.h noop-styled-ostream.oo.c styled-ostream.oo.h ostream.oo.h
diff --git a/gnulib-local/modules/ostream b/libtextstyle/gnulib-local/modules/ostream
similarity index 100%
rename from gnulib-local/modules/ostream
rename to libtextstyle/gnulib-local/modules/ostream
diff --git a/gnulib-local/modules/styled-ostream b/libtextstyle/gnulib-local/modules/styled-ostream
similarity index 100%
rename from gnulib-local/modules/styled-ostream
rename to libtextstyle/gnulib-local/modules/styled-ostream
diff --git a/gnulib-local/modules/term-ostream b/libtextstyle/gnulib-local/modules/term-ostream
similarity index 100%
rename from gnulib-local/modules/term-ostream
rename to libtextstyle/gnulib-local/modules/term-ostream
diff --git a/gnulib-local/modules/term-ostream-tests b/libtextstyle/gnulib-local/modules/term-ostream-tests
similarity index 100%
rename from gnulib-local/modules/term-ostream-tests
rename to libtextstyle/gnulib-local/modules/term-ostream-tests
diff --git a/gnulib-local/modules/term-styled-ostream b/libtextstyle/gnulib-local/modules/term-styled-ostream
similarity index 96%
rename from gnulib-local/modules/term-styled-ostream
rename to libtextstyle/gnulib-local/modules/term-styled-ostream
index 29dae33f6..c2412fc4a 100644
--- a/gnulib-local/modules/term-styled-ostream
+++ b/libtextstyle/gnulib-local/modules/term-styled-ostream
@@ -16,11 +16,7 @@ xalloc
 configure.ac:
 
 Makefile.am:
-if !WOE32DLL
 lib_SOURCES += term-styled-ostream.c
-else
-lib_SOURCES += ../woe32dll/c++term-styled-ostream.cc
-endif
 # This is a Makefile rule that generates multiple files at once; see the
 # automake documentation, node "Multiple Outputs", for details.
 $(srcdir)/term-styled-ostream.h : $(top_srcdir)/build-aux/moopp term-styled-ostream.oo.h term-styled-ostream.oo.c styled-ostream.oo.h ostream.oo.h
diff --git a/libtextstyle/gnulib-local/modules/term-styled-ostream.diff b/libtextstyle/gnulib-local/modules/term-styled-ostream.diff
deleted file mode 100644
index 976c4f8fc..000000000
--- a/libtextstyle/gnulib-local/modules/term-styled-ostream.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-*** term-styled-ostream.orig
---- term-styled-ostream
-***************
-*** 16,26 ****
-  configure.ac:
-  
-  Makefile.am:
-- if !WOE32DLL
-  lib_SOURCES += term-styled-ostream.c
-- else
-- lib_SOURCES += ../woe32dll/c++term-styled-ostream.cc
-- endif
-  # This is a Makefile rule that generates multiple files at once; see the
-  # automake documentation, node "Multiple Outputs", for details.
-  $(srcdir)/term-styled-ostream.h : $(top_srcdir)/build-aux/moopp term-styled-ostream.oo.h term-styled-ostream.oo.c styled-ostream.oo.h ostream.oo.h
---- 16,22 ----
-  configure.ac:
-  
-  Makefile.am:
-  lib_SOURCES += term-styled-ostream.c
-  # This is a Makefile rule that generates multiple files at once; see the
-  # automake documentation, node "Multiple Outputs", for details.
-  $(srcdir)/term-styled-ostream.h : $(top_srcdir)/build-aux/moopp term-styled-ostream.oo.h term-styled-ostream.oo.c styled-ostream.oo.h ostream.oo.h
diff --git a/gnulib-local/modules/termcap b/libtextstyle/gnulib-local/modules/termcap
similarity index 100%
rename from gnulib-local/modules/termcap
rename to libtextstyle/gnulib-local/modules/termcap
diff --git a/gnulib-local/modules/termcap-h b/libtextstyle/gnulib-local/modules/termcap-h
similarity index 100%
rename from gnulib-local/modules/termcap-h
rename to libtextstyle/gnulib-local/modules/termcap-h
diff --git a/gnulib-local/modules/terminfo b/libtextstyle/gnulib-local/modules/terminfo
similarity index 100%
rename from gnulib-local/modules/terminfo
rename to libtextstyle/gnulib-local/modules/terminfo
diff --git a/gnulib-local/modules/terminfo-h b/libtextstyle/gnulib-local/modules/terminfo-h
similarity index 100%
rename from gnulib-local/modules/terminfo-h
rename to libtextstyle/gnulib-local/modules/terminfo-h
diff --git a/gnulib-local/tests/test-moo-aroot.oo.c b/libtextstyle/gnulib-local/tests/test-moo-aroot.oo.c
similarity index 100%
rename from gnulib-local/tests/test-moo-aroot.oo.c
rename to libtextstyle/gnulib-local/tests/test-moo-aroot.oo.c
diff --git a/gnulib-local/tests/test-moo-aroot.oo.h b/libtextstyle/gnulib-local/tests/test-moo-aroot.oo.h
similarity index 100%
rename from gnulib-local/tests/test-moo-aroot.oo.h
rename to libtextstyle/gnulib-local/tests/test-moo-aroot.oo.h
diff --git a/gnulib-local/tests/test-moo-assign.c b/libtextstyle/gnulib-local/tests/test-moo-assign.c
similarity index 100%
rename from gnulib-local/tests/test-moo-assign.c
rename to libtextstyle/gnulib-local/tests/test-moo-assign.c
diff --git a/gnulib-local/tests/test-moo-asub1.oo.c b/libtextstyle/gnulib-local/tests/test-moo-asub1.oo.c
similarity index 100%
rename from gnulib-local/tests/test-moo-asub1.oo.c
rename to libtextstyle/gnulib-local/tests/test-moo-asub1.oo.c
diff --git a/gnulib-local/tests/test-moo-asub1.oo.h b/libtextstyle/gnulib-local/tests/test-moo-asub1.oo.h
similarity index 100%
rename from gnulib-local/tests/test-moo-asub1.oo.h
rename to libtextstyle/gnulib-local/tests/test-moo-asub1.oo.h
diff --git a/gnulib-local/tests/test-moo-root.oo.c b/libtextstyle/gnulib-local/tests/test-moo-root.oo.c
similarity index 100%
rename from gnulib-local/tests/test-moo-root.oo.c
rename to libtextstyle/gnulib-local/tests/test-moo-root.oo.c
diff --git a/gnulib-local/tests/test-moo-root.oo.h b/libtextstyle/gnulib-local/tests/test-moo-root.oo.h
similarity index 100%
rename from gnulib-local/tests/test-moo-root.oo.h
rename to libtextstyle/gnulib-local/tests/test-moo-root.oo.h
diff --git a/gnulib-local/tests/test-moo-sub1.oo.c b/libtextstyle/gnulib-local/tests/test-moo-sub1.oo.c
similarity index 100%
rename from gnulib-local/tests/test-moo-sub1.oo.c
rename to libtextstyle/gnulib-local/tests/test-moo-sub1.oo.c
diff --git a/gnulib-local/tests/test-moo-sub1.oo.h b/libtextstyle/gnulib-local/tests/test-moo-sub1.oo.h
similarity index 100%
rename from gnulib-local/tests/test-moo-sub1.oo.h
rename to libtextstyle/gnulib-local/tests/test-moo-sub1.oo.h
diff --git a/gnulib-local/tests/test-moo-sub2.oo.c b/libtextstyle/gnulib-local/tests/test-moo-sub2.oo.c
similarity index 100%
rename from gnulib-local/tests/test-moo-sub2.oo.c
rename to libtextstyle/gnulib-local/tests/test-moo-sub2.oo.c
diff --git a/gnulib-local/tests/test-moo-sub2.oo.h b/libtextstyle/gnulib-local/tests/test-moo-sub2.oo.h
similarity index 100%
rename from gnulib-local/tests/test-moo-sub2.oo.h
rename to libtextstyle/gnulib-local/tests/test-moo-sub2.oo.h
diff --git a/gnulib-local/tests/test-term-ostream-xterm-16color.out b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-16color.out
similarity index 100%
rename from gnulib-local/tests/test-term-ostream-xterm-16color.out
rename to libtextstyle/gnulib-local/tests/test-term-ostream-xterm-16color.out
diff --git a/gnulib-local/tests/test-term-ostream-xterm-256color.out b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-256color.out
similarity index 100%
rename from gnulib-local/tests/test-term-ostream-xterm-256color.out
rename to libtextstyle/gnulib-local/tests/test-term-ostream-xterm-256color.out
diff --git a/gnulib-local/tests/test-term-ostream-xterm-88color.out b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-88color.out
similarity index 100%
rename from gnulib-local/tests/test-term-ostream-xterm-88color.out
rename to libtextstyle/gnulib-local/tests/test-term-ostream-xterm-88color.out
diff --git a/gnulib-local/tests/test-term-ostream-xterm-8bit.out b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-8bit.out
similarity index 100%
rename from gnulib-local/tests/test-term-ostream-xterm-8bit.out
rename to libtextstyle/gnulib-local/tests/test-term-ostream-xterm-8bit.out
diff --git a/gnulib-local/tests/test-term-ostream-xterm-aix51.out b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-aix51.out
similarity index 100%
rename from gnulib-local/tests/test-term-ostream-xterm-aix51.out
rename to libtextstyle/gnulib-local/tests/test-term-ostream-xterm-aix51.out
diff --git a/gnulib-local/tests/test-term-ostream-xterm-basic-italic.out b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-basic-italic.out
similarity index 100%
rename from gnulib-local/tests/test-term-ostream-xterm-basic-italic.out
rename to libtextstyle/gnulib-local/tests/test-term-ostream-xterm-basic-italic.out
diff --git a/gnulib-local/tests/test-term-ostream-xterm-basic.out b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-basic.out
similarity index 100%
rename from gnulib-local/tests/test-term-ostream-xterm-basic.out
rename to libtextstyle/gnulib-local/tests/test-term-ostream-xterm-basic.out
diff --git a/gnulib-local/tests/test-term-ostream-xterm-freebsd101.out b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-freebsd101.out
similarity index 100%
rename from gnulib-local/tests/test-term-ostream-xterm-freebsd101.out
rename to libtextstyle/gnulib-local/tests/test-term-ostream-xterm-freebsd101.out
diff --git a/gnulib-local/tests/test-term-ostream-xterm-irix65.out b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-irix65.out
similarity index 100%
rename from gnulib-local/tests/test-term-ostream-xterm-irix65.out
rename to libtextstyle/gnulib-local/tests/test-term-ostream-xterm-irix65.out
diff --git a/gnulib-local/tests/test-term-ostream-xterm-linux-debian.out b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-linux-debian.out
similarity index 100%
rename from gnulib-local/tests/test-term-ostream-xterm-linux-debian.out
rename to libtextstyle/gnulib-local/tests/test-term-ostream-xterm-linux-debian.out
diff --git a/gnulib-local/tests/test-term-ostream-xterm-linux-mandriva.out b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-linux-mandriva.out
similarity index 100%
rename from gnulib-local/tests/test-term-ostream-xterm-linux-mandriva.out
rename to libtextstyle/gnulib-local/tests/test-term-ostream-xterm-linux-mandriva.out
diff --git a/gnulib-local/tests/test-term-ostream-xterm-mingw.out b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-mingw.out
similarity index 100%
rename from gnulib-local/tests/test-term-ostream-xterm-mingw.out
rename to libtextstyle/gnulib-local/tests/test-term-ostream-xterm-mingw.out
diff --git a/gnulib-local/tests/test-term-ostream-xterm-netbsd3.out b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-netbsd3.out
similarity index 100%
rename from gnulib-local/tests/test-term-ostream-xterm-netbsd3.out
rename to libtextstyle/gnulib-local/tests/test-term-ostream-xterm-netbsd3.out
diff --git a/gnulib-local/tests/test-term-ostream-xterm-osf51.out b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-osf51.out
similarity index 100%
rename from gnulib-local/tests/test-term-ostream-xterm-osf51.out
rename to libtextstyle/gnulib-local/tests/test-term-ostream-xterm-osf51.out
diff --git a/gnulib-local/tests/test-term-ostream-xterm-r6.out b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-r6.out
similarity index 100%
rename from gnulib-local/tests/test-term-ostream-xterm-r6.out
rename to libtextstyle/gnulib-local/tests/test-term-ostream-xterm-r6.out
diff --git a/gnulib-local/tests/test-term-ostream-xterm-solaris10.out b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-solaris10.out
similarity index 100%
rename from gnulib-local/tests/test-term-ostream-xterm-solaris10.out
rename to libtextstyle/gnulib-local/tests/test-term-ostream-xterm-solaris10.out
diff --git a/gnulib-local/tests/test-term-ostream-xterm-xf86-v32.out b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-xf86-v32.out
similarity index 100%
rename from gnulib-local/tests/test-term-ostream-xterm-xf86-v32.out
rename to libtextstyle/gnulib-local/tests/test-term-ostream-xterm-xf86-v32.out
diff --git a/gnulib-local/tests/test-term-ostream-xterm.sh b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm.sh
similarity index 100%
rename from gnulib-local/tests/test-term-ostream-xterm.sh
rename to libtextstyle/gnulib-local/tests/test-term-ostream-xterm.sh
diff --git a/gnulib-local/tests/test-term-ostream.c b/libtextstyle/gnulib-local/tests/test-term-ostream.c
similarity index 100%
rename from gnulib-local/tests/test-term-ostream.c
rename to libtextstyle/gnulib-local/tests/test-term-ostream.c
diff --git a/libtextstyle/woe32dll/c++html-styled-ostream.cc b/libtextstyle/woe32dll/c++html-styled-ostream.cc
deleted file mode 100644
index d48a57d73..000000000
--- a/libtextstyle/woe32dll/c++html-styled-ostream.cc
+++ /dev/null
@@ -1 +0,0 @@
-#include "../lib/html-styled-ostream.c"
diff --git a/libtextstyle/woe32dll/c++noop-styled-ostream.cc b/libtextstyle/woe32dll/c++noop-styled-ostream.cc
deleted file mode 100644
index e74fab162..000000000
--- a/libtextstyle/woe32dll/c++noop-styled-ostream.cc
+++ /dev/null
@@ -1 +0,0 @@
-#include "../lib/noop-styled-ostream.c"
diff --git a/libtextstyle/woe32dll/c++term-styled-ostream.cc b/libtextstyle/woe32dll/c++term-styled-ostream.cc
deleted file mode 100644
index cd0786b79..000000000
--- a/libtextstyle/woe32dll/c++term-styled-ostream.cc
+++ /dev/null
@@ -1 +0,0 @@
-#include "../lib/term-styled-ostream.c"