diff options
Diffstat (limited to 'modules')
-rw-r--r-- | modules/arabic/Makefile.am | 6 | ||||
-rw-r--r-- | modules/basic/Makefile.am | 8 | ||||
-rw-r--r-- | modules/hangul/Makefile.am | 6 | ||||
-rw-r--r-- | modules/hebrew/Makefile.am | 6 | ||||
-rw-r--r-- | modules/indic/Makefile.am | 6 | ||||
-rw-r--r-- | modules/tamil/Makefile.am | 6 | ||||
-rw-r--r-- | modules/thai/Makefile.am | 6 |
7 files changed, 22 insertions, 22 deletions
diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am index 7786a0aa..a26cb44c 100644 --- a/modules/arabic/Makefile.am +++ b/modules/arabic/Makefile.am @@ -1,9 +1,9 @@ ## Process this file with automake to create Makefile.in. -pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS) -pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs) +pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS) +pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs) pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs) -pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs) +pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) if HAVE_XFT if INCLUDE_ARABIC_XFT diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am index 5bbbab07..68e62970 100644 --- a/modules/basic/Makefile.am +++ b/modules/basic/Makefile.am @@ -2,11 +2,11 @@ basic_sources = basic-x.c -pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS) -pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs) +pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS) +pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs) pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs) -pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs) -pangowin32libs = $(top_builddir)/pango/libpangowin32.la $(pangolibs) +pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) +pangowin32libs = $(top_builddir)/pango/libpangowin32-$(PANGO_API_VERSION).la $(pangolibs) if HAVE_XFT if INCLUDE_BASIC_XFT diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am index 4163f4b6..12df843c 100644 --- a/modules/hangul/Makefile.am +++ b/modules/hangul/Makefile.am @@ -2,10 +2,10 @@ sources = hangul-x.c -pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS) -pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs) +pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS) +pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs) pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs) -pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs) +pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) if HAVE_X if INCLUDE_HANGUL_X diff --git a/modules/hebrew/Makefile.am b/modules/hebrew/Makefile.am index aab8aace..ab7ffcaa 100644 --- a/modules/hebrew/Makefile.am +++ b/modules/hebrew/Makefile.am @@ -5,10 +5,10 @@ hebrew_x_sources = $(common_sources) hebrew-x.c hebrew_xft_sources = $(common_sources) hebrew-xft.c hebrew_ft2_sources = $(common_sources) hebrew-ft2.c -pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS) -pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs) +pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS) +pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs) pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs) -pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs) +pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) if HAVE_XFT if INCLUDE_BASIC_XFT diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am index 51aeeb42..1961f881 100644 --- a/modules/indic/Makefile.am +++ b/modules/indic/Makefile.am @@ -8,10 +8,10 @@ sources = \ devanagari-x.c \ pango-indic-script.h -pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS) -pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs) +pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS) +pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs) pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs) -pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs) +pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) if HAVE_X diff --git a/modules/tamil/Makefile.am b/modules/tamil/Makefile.am index eb6c6a3a..3d5e6744 100644 --- a/modules/tamil/Makefile.am +++ b/modules/tamil/Makefile.am @@ -1,9 +1,9 @@ ## Process this file with automake to create Makefile.in. -pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS) -pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs) +pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS) +pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs) pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs) -pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs) +pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) if HAVE_XFT if INCLUDE_TAMIL_XFT diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am index f32ffb51..8d4c9f97 100644 --- a/modules/thai/Makefile.am +++ b/modules/thai/Makefile.am @@ -2,10 +2,10 @@ sources = thai-x.c -pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS) -pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs) +pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS) +pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs) pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs) -pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs) +pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) if HAVE_X if INCLUDE_THAI_X |