summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--ChangeLog.pre-1-1010
-rw-r--r--ChangeLog.pre-1-610
-rw-r--r--ChangeLog.pre-1-810
-rw-r--r--pango/Makefile.am11
-rw-r--r--pango/pangoft2.def1
6 files changed, 47 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index fc72e19f..987200ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-08-26 Tor Lillqvist <tml@iki.fi>
+
+ * pango/pangoft2.def: Add pango_ot_buffer_set_zero_width_marks,
+ again.
+
+ * pango/Makefile.am: Don't use -lm on Windows.
+ (pangoinclude_HEADERS): Put them on one line, automake 1.8 (at
+ least on Windows) otherwise drops the backslashes but still
+ outputs separate lines.
+
2004-08-26 Dov Grobgeld <dov.grobgeld@weizmann.ac.il>
* modules/hebrew/hebrew-fc.c (hebrew_engine_shape): Added
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index fc72e19f..987200ca 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,13 @@
+2004-08-26 Tor Lillqvist <tml@iki.fi>
+
+ * pango/pangoft2.def: Add pango_ot_buffer_set_zero_width_marks,
+ again.
+
+ * pango/Makefile.am: Don't use -lm on Windows.
+ (pangoinclude_HEADERS): Put them on one line, automake 1.8 (at
+ least on Windows) otherwise drops the backslashes but still
+ outputs separate lines.
+
2004-08-26 Dov Grobgeld <dov.grobgeld@weizmann.ac.il>
* modules/hebrew/hebrew-fc.c (hebrew_engine_shape): Added
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index fc72e19f..987200ca 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,13 @@
+2004-08-26 Tor Lillqvist <tml@iki.fi>
+
+ * pango/pangoft2.def: Add pango_ot_buffer_set_zero_width_marks,
+ again.
+
+ * pango/Makefile.am: Don't use -lm on Windows.
+ (pangoinclude_HEADERS): Put them on one line, automake 1.8 (at
+ least on Windows) otherwise drops the backslashes but still
+ outputs separate lines.
+
2004-08-26 Dov Grobgeld <dov.grobgeld@weizmann.ac.il>
* modules/hebrew/hebrew-fc.c (hebrew_engine_shape): Added
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index fc72e19f..987200ca 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,13 @@
+2004-08-26 Tor Lillqvist <tml@iki.fi>
+
+ * pango/pangoft2.def: Add pango_ot_buffer_set_zero_width_marks,
+ again.
+
+ * pango/Makefile.am: Don't use -lm on Windows.
+ (pangoinclude_HEADERS): Put them on one line, automake 1.8 (at
+ least on Windows) otherwise drops the backslashes but still
+ outputs separate lines.
+
2004-08-26 Dov Grobgeld <dov.grobgeld@weizmann.ac.il>
* modules/hebrew/hebrew-fc.c (hebrew_engine_shape): Added
diff --git a/pango/Makefile.am b/pango/Makefile.am
index cc5fdb02..ee458a27 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -34,13 +34,17 @@ if PLATFORM_WIN32
no_undefined = -no-undefined
endif
+if OS_WIN32
+else
+libm = -lm
+endif
# ------------------- libpango -------------------
lib_LTLIBRARIES = libpango-1.0.la
libpango_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) $(no_undefined)
-libpango_1_0_la_LIBADD = $(GLIB_LIBS) mini-fribidi/libmini-fribidi.la -lm
+libpango_1_0_la_LIBADD = $(GLIB_LIBS) mini-fribidi/libmini-fribidi.la $(libm)
libpango_1_0_la_DEPENDENCIES = mini-fribidi/libmini-fribidi.la
if OS_WIN32
@@ -159,10 +163,7 @@ libpangox_1_0_la_SOURCES = \
# ------------------- libpangoft2 -------------------
if HAVE_FREETYPE
-pangoinclude_HEADERS += \
- pangoft2.h \
- pango-ot.h \
- pangofc-decoder.h
+pangoinclude_HEADERS += pangoft2.h pango-ot.h pangofc-decoder.h
lib_LTLIBRARIES += libpangoft2-1.0.la
endif
diff --git a/pango/pangoft2.def b/pango/pangoft2.def
index 65684c63..263d360c 100644
--- a/pango/pangoft2.def
+++ b/pango/pangoft2.def
@@ -40,6 +40,7 @@ EXPORTS
pango_ot_buffer_new
pango_ot_buffer_output
pango_ot_buffer_set_rtl
+ pango_ot_buffer_set_zero_width_marks
pango_ot_info_find_feature
pango_ot_info_find_language
pango_ot_info_find_script