diff options
author | Behdad Esfahbod <behdad@gnome.org> | 2005-11-03 21:13:13 +0000 |
---|---|---|
committer | Behdad Esfahbod <behdad@src.gnome.org> | 2005-11-03 21:13:13 +0000 |
commit | 180425705216d4d7dfa698ee46a3d026deafa5c4 (patch) | |
tree | d5a6999d976279f7c3281e5602f4f39d38407317 /pango/Makefile.am | |
parent | 0fead16e7533b63b0e6af2e55ccfe31056921085 (diff) | |
download | pango-180425705216d4d7dfa698ee46a3d026deafa5c4.tar.gz |
Updated to FriBidi version 0.10.7 patched to handle UTF-8 directly. Moved
2005-11-03 Behdad Esfahbod <behdad@gnome.org>
* docs/tmpl/main.sgml, pango/Makefile.am, pango/pango-context.c
(itemize_state_init), pango/pango-utils.c, pango/pango-utils.h,
pango/pangox.c (itemize_string_foreach), pango/mini-fribidi/*:
Updated to FriBidi version 0.10.7 patched to handle UTF-8 directly.
Moved pango_log2vis_get_embedding_levels to pango-utils.c instead
of mini-fribidi. (#317192, review by Matthias Clasen)
Diffstat (limited to 'pango/Makefile.am')
-rw-r--r-- | pango/Makefile.am | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index 4f00c730..da89b91e 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -8,7 +8,9 @@ if HAVE_FREETYPE OPENTYPE_SUBDIR=opentype endif -SUBDIRS = $(OPENTYPE_SUBDIR) mini-fribidi +FRIBIDI_SUBDIR=mini-fribidi + +SUBDIRS = $(OPENTYPE_SUBDIR) $(FRIBIDI_SUBDIR) DIST_SUBDIRS = mini-fribidi opentype @@ -42,8 +44,11 @@ endif lib_LTLIBRARIES = libpango-1.0.la libpango_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) -libpango_1_0_la_LIBADD = $(GLIB_LIBS) mini-fribidi/libmini-fribidi.la $(libm) -libpango_1_0_la_DEPENDENCIES = mini-fribidi/libmini-fribidi.la +libpango_1_0_la_LIBADD = $(GLIB_LIBS) $(libm) +libpango_1_0_la_DEPENDENCIES = + +libpango_1_0_la_LIBADD += mini-fribidi/libmini-fribidi.la +libpango_1_0_la_DEPENDENCIES += mini-fribidi/libmini-fribidi.la if OS_WIN32 libpango_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pango.def -Wl,pango-win32-res.o |