diff options
| author | Tor Lillqvist <tml@iki.fi> | 2004-08-26 21:41:15 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2004-08-26 21:41:15 +0000 |
| commit | d175847f6d73afc50dbf1f03a344f16b71933620 (patch) | |
| tree | 412a1f81fce4f5b3f7c536d59fca97efcf8ac830 /pango/Makefile.am | |
| parent | 58da340113c93e7e57994220c3587049ca4d9e23 (diff) | |
| download | pango-d175847f6d73afc50dbf1f03a344f16b71933620.tar.gz | |
Add pango_ot_buffer_set_zero_width_marks, again.
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.
Diffstat (limited to 'pango/Makefile.am')
| -rw-r--r-- | pango/Makefile.am | 11 |
1 files changed, 6 insertions, 5 deletions
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 |