summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2007-01-31 00:40:25 +0000
committerTor Lillqvist <tml@src.gnome.org>2007-01-31 00:40:25 +0000
commitaca1ce6334c9aa1b667ee950d32803338d0e46d7 (patch)
tree636b1716a67eac4fa563e42eef696eb2313413a9
parent19ec90fcd3775d3c8d37ae269b21df5344a53da1 (diff)
downloadpango-aca1ce6334c9aa1b667ee950d32803338d0e46d7.tar.gz
Use pangocairo.def only on Win32, not Cygwin. (#402373, "paul")
2007-01-31 Tor Lillqvist <tml@novell.com> * pango/Makefile.am: Use pangocairo.def only on Win32, not Cygwin. (#402373, "paul") svn path=/branches/pango-1-14/; revision=2191
-rw-r--r--ChangeLog5
-rw-r--r--pango/Makefile.am2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e0c41e6..e31548a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-31 Tor Lillqvist <tml@novell.com>
+
+ * pango/Makefile.am: Use pangocairo.def only on Win32, not
+ Cygwin. (#402373, "paul")
+
2007-01-30 Tor Lillqvist <tml@novell.com>
* pango-zip.sh.in: Include also the COPYING file in the zipfiles.
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 0e004c44..7cc3df46 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -268,8 +268,10 @@ libpangocairo_1_0_la_SOURCES = \
pangocairo-private.h
if HAVE_CAIRO_WIN32
+if OS_WIN32
libpangocairo_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangocairo.def
libpangocairo_1_0_la_DEPENDENCIES += pangocairo.def
+endif
libpangocairo_1_0_la_LIBADD += libpangowin32-$(PANGO_API_VERSION).la $(WIN32_LIBS)
libpangocairo_1_0_la_DEPENDENCIES += libpangowin32-$(PANGO_API_VERSION).la