summaryrefslogtreecommitdiff
path: root/pango/Makefile.am
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2008-08-05 23:12:13 +0000
committerTor Lillqvist <tml@src.gnome.org>2008-08-05 23:12:13 +0000
commit32d2f52bf481f6e7df178d53b67721846deb9120 (patch)
tree13bbd03b9779a44f258ebcc5d9240940ee1e90fd /pango/Makefile.am
parent5da782e5070262f6b8494ee987cde3a8d7d51d78 (diff)
downloadpango-32d2f52bf481f6e7df178d53b67721846deb9120.tar.gz
On Windows set LIB_EXE_MACHINE_FLAG to X86 or X64 depending on host
2008-08-06 Tor Lillqvist <tml@novell.com> * configure.in: On Windows set LIB_EXE_MACHINE_FLAG to X86 or X64 depending on host architecture. * pango/Makefile.am: Use it when running lib.exe. svn path=/trunk/; revision=2670
Diffstat (limited to 'pango/Makefile.am')
-rw-r--r--pango/Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am
index fbb947b6..f3191a4f 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -403,16 +403,16 @@ uninstall-ms-lib:
endif
pango-$(PANGO_API_VERSION).lib: libpango-$(PANGO_API_VERSION).la $(srcdir)/pango.def
- lib -name:libpango-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pango.def -out:$@
+ lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libpango-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pango.def -out:$@
pangoft2-$(PANGO_API_VERSION).lib: libpangoft2-$(PANGO_API_VERSION).la $(srcdir)/pangoft2.def
- lib -name:libpangoft2-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangoft2.def -out:$@
+ lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libpangoft2-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangoft2.def -out:$@
pangowin32-$(PANGO_API_VERSION).lib: libpangowin32-$(PANGO_API_VERSION).la $(srcdir)/pangowin32.def
- lib -name:libpangowin32-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangowin32.def -out:$@
+ lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libpangowin32-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangowin32.def -out:$@
pangocairo-$(PANGO_API_VERSION).lib: libpangocairo-$(PANGO_API_VERSION).la $(srcdir)/pangocairo.def
- lib -name:libpangocairo-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangocairo.def -out:$@
+ lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libpangocairo-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangocairo.def -out:$@
# ------------------- pango-querymodules -------------------