diff options
| author | Tor Lillqvist <tml@iki.fi> | 2003-12-07 07:29:38 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2003-12-07 07:29:38 +0000 |
| commit | c2d6a3e80e92d1f58e7d7649174d884ff96e7b00 (patch) | |
| tree | 62554e5132341145e91c4123c0dbfd9ad948cc65 | |
| parent | 536b46c5c2531ceb7eb576c3c9f99e4ba57354a6 (diff) | |
| download | pango-c2d6a3e80e92d1f58e7d7649174d884ff96e7b00.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-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 5 | ||||
| -rw-r--r-- | pango/Makefile.am | 18 |
6 files changed, 34 insertions, 9 deletions
@@ -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: initialize the fontmap's resolution diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 07c3d204..5b1e421e 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: initialize the fontmap's resolution diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 07c3d204..5b1e421e 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: initialize the fontmap's resolution diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 07c3d204..5b1e421e 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: initialize the fontmap's resolution diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 07c3d204..5b1e421e 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: initialize the fontmap's resolution diff --git a/pango/Makefile.am b/pango/Makefile.am index b0dbcb21..48455dbd 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -44,7 +44,7 @@ libpango_1_0_la_LIBADD = $(GLIB_LIBS) mini-fribidi/libmini-fribidi.la libpango_1_0_la_DEPENDENCIES = mini-fribidi/libmini-fribidi.la if OS_WIN32 -libpango_1_0_la_LDFLAGS += -export-symbols pango.def +libpango_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pango.def libpango_1_0_la_LIBADD += pango-win32res.lo endif pango-win32res.lo: pango.rc @@ -191,7 +191,7 @@ libpangoft2_1_0_la_SOURCES = \ module-defs-fc.c if OS_WIN32 -libpangoft2_1_0_la_LDFLAGS += -export-symbols pangoft2.def +libpangoft2_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangoft2.def libpangoft2_1_0_la_LIBADD += pangoft2-win32res.lo libpangoft2_1_0_la_DEPENDENCIES += pangoft2-win32res.lo endif @@ -219,7 +219,7 @@ libpangowin32_1_0_la_SOURCES = \ module-defs-win32.c if OS_WIN32 -libpangowin32_1_0_la_LDFLAGS += -export-symbols pangowin32.def +libpangowin32_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangowin32.def libpangowin32_1_0_la_LIBADD += pangowin32-win32res.lo libpangowin32_1_0_la_DEPENDENCIES += pangowin32-win32res.lo endif @@ -265,14 +265,14 @@ install-ms-lib: uninstall-ms-lib: endif -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:$@ # ------------------- pango-querymodules ------------------- |