]>
Commit | Line | Data |
---|---|---|
887cb360 AM |
1 | diff -urN pango-rc2-1.0.0.org/pango/Makefile.am pango-rc2-1.0.0/pango/Makefile.am |
2 | --- pango-rc2-1.0.0.org/pango/Makefile.am Thu Mar 7 11:25:05 2002 | |
3 | +++ pango-rc2-1.0.0/pango/Makefile.am Thu Mar 7 11:27:37 2002 | |
4 | @@ -12,6 +12,7 @@ | |
5 | endif | |
6 | ||
7 | if HAVE_FRIBIDI | |
8 | +FRIBIDI_SUBDIR = | |
9 | else | |
10 | FRIBIDI_SUBDIR = mini-fribidi | |
11 | endif | |
12 | @@ -266,10 +268,8 @@ | |
9fb24163 AM |
13 | |
14 | if HAVE_XFT | |
887cb360 AM |
15 | pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft-$(PANGO_API_VERSION).la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(XFT_LIBS) $(FREETYPE_LIBS) |
16 | -pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la | |
9fb24163 | 17 | else |
887cb360 AM |
18 | pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) $(GLIB_LIBS) $(FRIBIDI_LIBS) $(X_LIBS) $(FREETYPE_LIBS) $(X_EXTRA_LIBS) |
19 | -pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) libpango-$(PANGO_API_VERSION).la | |
9fb24163 AM |
20 | endif |
21 | ||
22 | EXTRA_DIST = \ |