summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2003-12-07 07:25:19 +0000
committerTor Lillqvist <tml@src.gnome.org>2003-12-07 07:25:19 +0000
commit3ee3874c3ac170553b7355beff7bdea06c4a14dc (patch)
tree4df49a780ecfe8d9e269ffc00045a43111559514
parentce1ddc3cc88b0fccd76e3ce80cb6d95e2166dd34 (diff)
downloadpango-3ee3874c3ac170553b7355beff7bdea06c4a14dc.tar.gz
Fix problems when building outside srcdir for Win32. (#122167, Jeff
2003-12-07 Tor Lillqvist <tml@iki.fi> * pango/Makefile.am: Fix problems when building outside srcdir for Win32. (#122167, Jeff Bonggren)
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--ChangeLog.pre-1-45
-rw-r--r--ChangeLog.pre-1-65
-rw-r--r--ChangeLog.pre-1-85
-rw-r--r--pango/Makefile.am18
6 files changed, 34 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index edbd00be..ddc21f8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-07 Tor Lillqvist <tml@iki.fi>
+
+ * pango/Makefile.am: Fix problems when building outside srcdir for
+ Win32. (#122167, Jeff Bonggren)
+
2003-12-05 Sven Neumann <sven@gimp.org>
* pango/pangoft2-fontmap.c (pango_ft2_font_map_new): merged fix
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index edbd00be..ddc21f8f 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+2003-12-07 Tor Lillqvist <tml@iki.fi>
+
+ * pango/Makefile.am: Fix problems when building outside srcdir for
+ Win32. (#122167, Jeff Bonggren)
+
2003-12-05 Sven Neumann <sven@gimp.org>
* pango/pangoft2-fontmap.c (pango_ft2_font_map_new): merged fix
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index edbd00be..ddc21f8f 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+2003-12-07 Tor Lillqvist <tml@iki.fi>
+
+ * pango/Makefile.am: Fix problems when building outside srcdir for
+ Win32. (#122167, Jeff Bonggren)
+
2003-12-05 Sven Neumann <sven@gimp.org>
* pango/pangoft2-fontmap.c (pango_ft2_font_map_new): merged fix
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index edbd00be..ddc21f8f 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+2003-12-07 Tor Lillqvist <tml@iki.fi>
+
+ * pango/Makefile.am: Fix problems when building outside srcdir for
+ Win32. (#122167, Jeff Bonggren)
+
2003-12-05 Sven Neumann <sven@gimp.org>
* pango/pangoft2-fontmap.c (pango_ft2_font_map_new): merged fix
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index edbd00be..ddc21f8f 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+2003-12-07 Tor Lillqvist <tml@iki.fi>
+
+ * pango/Makefile.am: Fix problems when building outside srcdir for
+ Win32. (#122167, Jeff Bonggren)
+
2003-12-05 Sven Neumann <sven@gimp.org>
* pango/pangoft2-fontmap.c (pango_ft2_font_map_new): merged fix
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 1789b8cb..31c4eec4 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -63,9 +63,9 @@ no_undefined = -no-undefined
endif
if OS_WIN32
-pango_export_symbols = -export-symbols pango.def
-pangowin32_export_symbols = -export-symbols pangowin32.def
-pangoft2_export_symbols = -export-symbols pangoft2.def
+pango_export_symbols = -export-symbols $(srcdir)/pango.def
+pangowin32_export_symbols = -export-symbols $(srcdir)/pangowin32.def
+pangoft2_export_symbols = -export-symbols $(srcdir)/pangoft2.def
pango_win32res = pango-win32res.lo
pangowin32_win32res = pangowin32-win32res.lo
@@ -314,14 +314,14 @@ CLEANFILES = \
pango-enum-types.c \
s-enum-types-c
-pango-$(PANGO_API_VERSION).lib: libpango-$(PANGO_API_VERSION).la pango.def
- lib -name:libpango-$(PANGO_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:pango.def -out:$@
+pango-$(PANGO_API_VERSION).lib: libpango-$(PANGO_API_VERSION).la $(srcdir)/pango.def
+ lib -name:libpango-$(PANGO_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:$(srcdir)/pango.def -out:$@
-pangoft2-$(PANGO_API_VERSION).lib: libpangoft2-$(PANGO_API_VERSION).la pangoft2.def
- lib -name:libpangoft2-$(PANGO_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:pangoft2.def -out:$@
+pangoft2-$(PANGO_API_VERSION).lib: libpangoft2-$(PANGO_API_VERSION).la $(srcdir)/pangoft2.def
+ lib -name:libpangoft2-$(PANGO_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:$(srcdir)/pangoft2.def -out:$@
-pangowin32-$(PANGO_API_VERSION).lib: libpangowin32-$(PANGO_API_VERSION).la pangowin32.def
- lib -name:libpangowin32-$(PANGO_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:pangowin32.def -out:$@
+pangowin32-$(PANGO_API_VERSION).lib: libpangowin32-$(PANGO_API_VERSION).la $(srcdir)/pangowin32.def
+ lib -name:libpangowin32-$(PANGO_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:$(srcdir)/pangowin32.def -out:$@
install-data-local: install-ms-lib install-libtool-import-lib