* 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.
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
+++ /dev/null
-#include "../gnulib-lib/html-styled-ostream.c"
+++ /dev/null
-#include "../gnulib-lib/term-styled-ostream.c"
## 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 \
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 \
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 \
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:
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 \
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
+++ /dev/null
-*** 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
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)
+++ /dev/null
-*** 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)
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
+++ /dev/null
---- 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
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
+++ /dev/null
-*** 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
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
+++ /dev/null
-*** 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
+++ /dev/null
-#include "../lib/html-styled-ostream.c"
+++ /dev/null
-#include "../lib/noop-styled-ostream.c"
+++ /dev/null
-#include "../lib/term-styled-ostream.c"
projects / thirdparty / gettext.git / commitdiff
