From 9627447a32326a932b40a221103d5ed22c73cf2c Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 25 Sep 2002 19:06:52 +0000 Subject: INCLUDED_WIN32_MODULES was missing from a couple of places. (#93372) 2002-09-25 Tor Lillqvist * pango/Makefile.am: INCLUDED_WIN32_MODULES was missing from a couple of places. (#93372) --- ChangeLog | 5 +++++ ChangeLog.pre-1-10 | 5 +++++ ChangeLog.pre-1-2 | 5 +++++ ChangeLog.pre-1-4 | 5 +++++ ChangeLog.pre-1-6 | 5 +++++ ChangeLog.pre-1-8 | 5 +++++ pango/Makefile.am | 4 ++-- 7 files changed, 32 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30ca2a3c..8a50f48f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-09-25 Tor Lillqvist + + * pango/Makefile.am: INCLUDED_WIN32_MODULES was missing from a + couple of places. (#93372) + 2002-09-24 Tor Lillqvist * pango/pangowin32.c: Use PANGO_PIXELS macro throughout instead of diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 30ca2a3c..8a50f48f 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +2002-09-25 Tor Lillqvist + + * pango/Makefile.am: INCLUDED_WIN32_MODULES was missing from a + couple of places. (#93372) + 2002-09-24 Tor Lillqvist * pango/pangowin32.c: Use PANGO_PIXELS macro throughout instead of diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 30ca2a3c..8a50f48f 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,8 @@ +2002-09-25 Tor Lillqvist + + * pango/Makefile.am: INCLUDED_WIN32_MODULES was missing from a + couple of places. (#93372) + 2002-09-24 Tor Lillqvist * pango/pangowin32.c: Use PANGO_PIXELS macro throughout instead of diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 30ca2a3c..8a50f48f 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +2002-09-25 Tor Lillqvist + + * pango/Makefile.am: INCLUDED_WIN32_MODULES was missing from a + couple of places. (#93372) + 2002-09-24 Tor Lillqvist * pango/pangowin32.c: Use PANGO_PIXELS macro throughout instead of diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 30ca2a3c..8a50f48f 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +2002-09-25 Tor Lillqvist + + * pango/Makefile.am: INCLUDED_WIN32_MODULES was missing from a + couple of places. (#93372) + 2002-09-24 Tor Lillqvist * pango/pangowin32.c: Use PANGO_PIXELS macro throughout instead of diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 30ca2a3c..8a50f48f 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +2002-09-25 Tor Lillqvist + + * pango/Makefile.am: INCLUDED_WIN32_MODULES was missing from a + couple of places. (#93372) + 2002-09-24 Tor Lillqvist * pango/pangowin32.c: Use PANGO_PIXELS macro throughout instead of diff --git a/pango/Makefile.am b/pango/Makefile.am index 6c94c7ee..4b9dbfd9 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -182,7 +182,7 @@ libpangowin32_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \ $(GLIB_LIBS) \ $(no_undefined) $(pangowin32_export_symbols) libpangowin32_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la $(INCLUDED_WIN32_MODULES) $(WIN32_LIBS) $(pangowin32_win32res) -libpangowin32_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la $(pangowin32_win32res) +libpangowin32_1_0_la_DEPENDENCIES = $(INCLUDED_WIN32_MODULES) libpango-$(PANGO_API_VERSION).la $(pangowin32_win32res) pangowin32-win32res.lo : pangowin32.rc $(top_srcdir)/../glib/build/win32/lt-compile-resource pangowin32.rc pangowin32-win32res.lo @@ -307,7 +307,7 @@ if HAVE_INCLUDED_MODULES included-modules: @cd $(top_builddir)/modules && $(MAKE) $(AM_MAKEFLAGS) included-modules -$(INCLUDED_X_MODULES) $(INCLUDED_XFT_MODULES) $(INCLUDED_FT2_MODULES): included-modules +$(INCLUDED_X_MODULES) $(INCLUDED_XFT_MODULES) $(INCLUDED_FT2_MODULES) $(INCLUDED_WIN32_MODULES): included-modules @true .PHONY: included-modules -- cgit v1.2.1