diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 9 | ||||
| -rw-r--r-- | pango/Makefile.am | 46 |
8 files changed, 87 insertions, 22 deletions
@@ -1,3 +1,12 @@ +Thu Jul 12 16:32:42 2001 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Add + an explicit dependency on libpangoxft.la, to fix + parallel make problem (#56818) + + * pango/Makefile.am (CLEANFILES): Fix problem where + name of stamp files didn't match actual name. + 2001-07-12 Darin Adler <darin@bentspoon.com> * modules/arabic/arabic-x.c: (arabic_engine_shape): Remove stray diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 99ffc863..145e6e6d 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,12 @@ +Thu Jul 12 16:32:42 2001 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Add + an explicit dependency on libpangoxft.la, to fix + parallel make problem (#56818) + + * pango/Makefile.am (CLEANFILES): Fix problem where + name of stamp files didn't match actual name. + 2001-07-12 Darin Adler <darin@bentspoon.com> * modules/arabic/arabic-x.c: (arabic_engine_shape): Remove stray diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 99ffc863..145e6e6d 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,12 @@ +Thu Jul 12 16:32:42 2001 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Add + an explicit dependency on libpangoxft.la, to fix + parallel make problem (#56818) + + * pango/Makefile.am (CLEANFILES): Fix problem where + name of stamp files didn't match actual name. + 2001-07-12 Darin Adler <darin@bentspoon.com> * modules/arabic/arabic-x.c: (arabic_engine_shape): Remove stray diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 99ffc863..145e6e6d 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,12 @@ +Thu Jul 12 16:32:42 2001 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Add + an explicit dependency on libpangoxft.la, to fix + parallel make problem (#56818) + + * pango/Makefile.am (CLEANFILES): Fix problem where + name of stamp files didn't match actual name. + 2001-07-12 Darin Adler <darin@bentspoon.com> * modules/arabic/arabic-x.c: (arabic_engine_shape): Remove stray diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 99ffc863..145e6e6d 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,12 @@ +Thu Jul 12 16:32:42 2001 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Add + an explicit dependency on libpangoxft.la, to fix + parallel make problem (#56818) + + * pango/Makefile.am (CLEANFILES): Fix problem where + name of stamp files didn't match actual name. + 2001-07-12 Darin Adler <darin@bentspoon.com> * modules/arabic/arabic-x.c: (arabic_engine_shape): Remove stray diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 99ffc863..145e6e6d 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,12 @@ +Thu Jul 12 16:32:42 2001 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Add + an explicit dependency on libpangoxft.la, to fix + parallel make problem (#56818) + + * pango/Makefile.am (CLEANFILES): Fix problem where + name of stamp files didn't match actual name. + 2001-07-12 Darin Adler <darin@bentspoon.com> * modules/arabic/arabic-x.c: (arabic_engine_shape): Remove stray diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 99ffc863..145e6e6d 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,12 @@ +Thu Jul 12 16:32:42 2001 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Add + an explicit dependency on libpangoxft.la, to fix + parallel make problem (#56818) + + * pango/Makefile.am (CLEANFILES): Fix problem where + name of stamp files didn't match actual name. + 2001-07-12 Darin Adler <darin@bentspoon.com> * modules/arabic/arabic-x.c: (arabic_engine_shape): Remove stray diff --git a/pango/Makefile.am b/pango/Makefile.am index 5c0574e1..8cdcdcd3 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -182,32 +182,34 @@ s-enum-types-c: @REBUILD@ $(pango_headers) Makefile pango_querymodules_SOURCES = \ querymodules.c +pango_querymodules_DEPENDENCIES = libpangoxft.la + if HAVE_XFT pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft.la libpango.la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(XFT_LIBS) $(FREETYPE_LIBS) else pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpango.la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(X_LIBS) $(FREETYPE_LIBS) endif -EXTRA_DIST = \ - $(pango_built_headers) \ - module-defs-ft2.c.win32 \ - module-defs-win32.c.win32 \ - module-defs.h \ - pango.def \ - pangowin32.def \ - pangowin32.h \ - pangowin32.c \ - pangowin32-private.h \ - pangowin32-fontcache.c \ - pangowin32-fontmap.c \ - pangoft2.def \ - makefile.mingw \ - makefile.mingw.in \ - pango.rc \ - pango.rc.in \ - pangoft2.rc \ - pangoft2.rc.in \ - pangowin32.rc \ +EXTRA_DIST = \ + $(pango_built_headers) \ + module-defs-ft2.c.win32 \ + module-defs-win32.c.win32 \ + module-defs.h \ + pango.def \ + pangowin32.def \ + pangowin32.h \ + pangowin32.c \ + pangowin32-private.h \ + pangowin32-fontcache.c \ + pangowin32-fontmap.c \ + pangoft2.def \ + makefile.mingw \ + makefile.mingw.in \ + pango.rc \ + pango.rc.in \ + pangoft2.rc \ + pangoft2.rc.in \ + pangowin32.rc \ pangowin32.rc.in @@ -223,6 +225,6 @@ endif CLEANFILES = \ pango-enum-types.h \ - s-pango-enum-types.h \ + s-enum-types-h \ pango-enum-types.c \ - s-pango-enum-types.c + s-enum-types-c |