diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-07-12 20:35:28 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-07-12 20:35:28 +0000 |
| commit | e7046e78fd4eb6c5bac67b37d4184c816aa8c0f1 (patch) | |
| tree | d9130361f570feef1bff1920cd6f04475ee0218f /pango | |
| parent | 5bf4e956f5fecf77e2988294a4f4d390f89a51e9 (diff) | |
| download | pango-e7046e78fd4eb6c5bac67b37d4184c816aa8c0f1.tar.gz | |
Add an explicit dependency on libpangoxft.la, to fix parallel make problem
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.
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/Makefile.am | 46 |
1 files changed, 24 insertions, 22 deletions
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 |