From bdd7e7f65c9f97b397b4ebe2550a6c2752adfe08 Mon Sep 17 00:00:00 2001 From: James Henstridge Date: Tue, 11 Mar 2003 12:31:16 +0000 Subject: make similar changes to the ones on glib head (call gtk-docize, etc). 2003-03-11 James Henstridge * autogen.sh: make similar changes to the ones on glib head (call gtk-docize, etc). * configure.in: move some calculations into M4 macros, rather than calculating them when configure runs. Use AC_HELP_STRING where appropriate. Replace gtk-doc checks with a call to GTK_DOC_CHECK. Replace AC_OUTPUT_COMMANDS() call with a number of calls to AC_CONFIG_COMMANDS (once per created file). Get rid of the "chmod +x pango-config" bit, because there is no pango-config anymore. * Makefile.am: get rid of custom distcheck rule, and set DISTCHECK_CONFIGURE_FLAGS, which is equivalent. Use += to select which .pc files to install. * pango/Makefile.am: Add rules to rebuild module-defs* files, and remove them on clean. Reorder so that rules related to each individual library are next to each other. Use BUILT_SOURCES for built sources. * pango/opentype/Makefile.am: don't use STRIP_BEGIN/STRIP_END. * modules/*/Makefile.am: simplify module makefiles through use of +=, and regularise them a bit (fixed a few bugs in the process). * docs/Makefile.am: remove common rules, and instead include gtk-doc.make. * examples/Makefile.am: add pango.modules to CLEANFILES. * tests/Makefile.am: remove temporary files on clean. --- modules/arabic/Makefile.am | 131 +++++++++++++++-------------------- modules/basic/Makefile.am | 145 ++++++++++++++++----------------------- modules/hangul/Makefile.am | 80 +++++++++------------- modules/hebrew/Makefile.am | 119 +++++++++++++------------------- modules/indic/Makefile.am | 166 ++++++++++++++++----------------------------- modules/tamil/Makefile.am | 51 ++++++-------- modules/thai/Makefile.am | 86 ++++++++++------------- 7 files changed, 307 insertions(+), 471 deletions(-) (limited to 'modules') diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am index 0345b283..3aeafb90 100644 --- a/modules/arabic/Makefile.am +++ b/modules/arabic/Makefile.am @@ -5,21 +5,31 @@ pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $ pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs) pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) -if HAVE_XFT -if INCLUDE_ARABIC_XFT -XFT_MODULES= -XFT_INCLUDED=libpango-arabic-xft.la -XFT_PREFIX=-DXFT_MODULE_PREFIX -else -XFT_MODULES=pango-arabic-xft.la -XFT_INCLUDED= -XFT_PREFIX= -arabic_xft_libadd=$(pangoxftlibs) +INCLUDES = \ + -DPANGO_ENABLE_ENGINE \ + -DG_DISABLE_DEPRECATED \ + $(PANGO_DEBUG_FLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango/ \ + $(GLIB_CFLAGS) + +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules +module_LTLIBRARIES = +noinst_LTLIBRARIES = + +if PLATFORM_WIN32 +no_undefined = -no-undefined endif + + +if HAVE_X +INCLUDES += $(X_CFLAGS) +if INCLUDE_ARABIC_X +noinst_LTLIBRARIES += libpango-arabic-x.la +INCLUDES += -DX_MODULE_PREFIX else -XFT_MODULES= -XFT_INCLUDED= -XFT_PREFIX= +module_LTLIBRARIES += pango-arabic-x.la +endif endif x_sources = \ @@ -33,89 +43,54 @@ x_sources = \ naqshfont.h \ arconv.h +pango_arabic_x_la_LDFLAGS = -export-dynamic -avoid-version -module +pango_arabic_x_la_LIBADD = $(pangoxlibs) +pango_arabic_x_la_SOURCES = $(x_sources) +libpango_arabic_x_la_SOURCES = $(x_sources) + + +if HAVE_XFT +INCLUDES += $(XFT_CFLAGS) +if INCLUDE_ARABIC_XFT +noinst_LTLIBRARIES += libpango-arabic-xft.la +INCLUDES += -DXFT_MODULE_PREFIX +else +module_LTLIBRARIES += pango-arabic-xft.la +endif +endif + xft_sources = \ arabic-xft.c \ arabic-ot.c \ arabic-ot.h -ft2_sources = \ - arabic-ft2.c \ - arabic-ot.c \ - arabic-ot.h +pango_arabic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module +pango_arabic_xft_la_LIBADD = $(pangoxftlibs) +pango_arabic_xft_la_SOURCES = $(xft_sources) +libpango_arabic_xft_la_SOURCES = $(xft_sources) -if HAVE_X -if INCLUDE_ARABIC_X -X_MODULES= -X_INCLUDED=libpango-arabic-x.la -X_PREFIX=-DX_MODULE_PREFIX -else -X_MODULES=pango-arabic-x.la -X_INCLUDED= -X_PREFIX= -arabic_x_libadd=$(pangoxlibs) -endif -else -X_MODULES= -X_INCLUDED= -X_PREFIX= -endif if HAVE_FREETYPE +INCLUDES += $(FREETYPE_CFLAGS) if INCLUDE_ARABIC_FT2 -FT2_MODULES= -FT2_INCLUDED=libpango-arabic-ft2.la -FT2_PREFIX=-DFT2_MODULE_PREFIX -else -FT2_MODULES=pango-arabic-ft2.la -FT2_INCLUDED= -FT2_PREFIX= -arabic_ft2_libadd=$(pangoft2libs) -endif +noinst_LTLIBRARIES += libpango-arabic-ft2.la +INCLUDES += -DFT2_MODULE_PREFIX else -FT2_MODULES= -FT2_INCLUDED= -FT2_PREFIX= +module_LTLIBRARIES += pango-arabic-ft2.la endif - -if PLATFORM_WIN32 -no_undefined = -no-undefined endif -noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) $(FT2_INCLUDED) -module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) $(FT2_MODULES) -moddefine = $(X_PREFIX) $(XFT_PREFIX) $(FT2_PREFIX) -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules - -INCLUDES = \ - -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango/ \ - $(moddefine) \ - $(GLIB_CFLAGS) \ - $(XFT_CFLAGS) \ - $(FREETYPE_CFLAGS) \ - $(X_CFLAGS) - -pango_arabic_x_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_arabic_x_la_LIBADD = $(arabic_x_libadd) -pango_arabic_x_la_SOURCES = $(x_sources) - -libpango_arabic_x_la_SOURCES = $(x_sources) - -pango_arabic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_arabic_xft_la_LIBADD = $(arabic_xft_libadd) -pango_arabic_xft_la_SOURCES = $(xft_sources) - -libpango_arabic_xft_la_SOURCES = $(xft_sources) +ft2_sources = \ + arabic-ft2.c \ + arabic-ot.c \ + arabic-ot.h pango_arabic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined) -pango_arabic_ft2_la_LIBADD = $(arabic_ft2_libadd) +pango_arabic_ft2_la_LIBADD = $(pangoft2libs) pango_arabic_ft2_la_SOURCES = $(ft2_sources) - libpango_arabic_ft2_la_SOURCES = $(ft2_sources) + included-modules: $(noinst_LTLIBRARIES) .PHONY: included-modules diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am index 155b6716..f9ed1bf6 100644 --- a/modules/basic/Makefile.am +++ b/modules/basic/Makefile.am @@ -8,112 +8,84 @@ pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_L 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 -XFT_INCLUDED=libpango-basic-xft.la -XFT_MODULES= -XFT_PREFIX=-DXFT_MODULE_PREFIX -else -XFT_INCLUDED= -XFT_MODULES=pango-basic-xft.la -XFT_PREFIX= -basic_xft_libadd=$(pangoxlibs) $(pangoxftlibs) -endif -else -XFT_MODULES= -XFT_INCLUDED= -XFT_PREFIX= -endif +INCLUDES = \ + -DPANGO_ENABLE_ENGINE \ + -DG_DISABLE_DEPRECATED \ + $(PANGO_DEBUG_FLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango/ \ + $(GLIB_CFLAGS) \ + $(moddefine) -if HAVE_FREETYPE -if INCLUDE_BASIC_FT2 -FT2_INCLUDED=libpango-basic-ft2.la -FT2_MODULES= -FT2_PREFIX=-DFT2_MODULE_PREFIX -else -FT2_INCLUDED= -FT2_MODULES=pango-basic-ft2.la -FT2_PREFIX= -basic_ft2_libadd=$(pangoft2libs) -endif -else -FT2_MODULES= -FT2_INCLUDED= -FT2_PREFIX= +if PLATFORM_WIN32 +no_undefined = -no-undefined endif +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules +module_LTLIBRARIES = +noinst_LTLIBRARIES = + +moddefine = + if HAVE_X +INCLUDES += $(X_CFLAGS) if INCLUDE_BASIC_X -X_INCLUDED=libpango-basic-x.la -X_MODULES= -X_PREFIX=-DX_MODULE_PREFIX +noinst_LTLIBRARIES += libpango-basic-x.la +INCLUDES += -DX_MODULE_PREFIX else -X_INCLUDED= -X_MODULES=pango-basic-x.la -X_PREFIX= -basic_x_libadd=$(pangoxlibs) +module_LTLIBRARIES += pango-basic-x.la endif -else -X_INCLUDED= -X_MODULES= -X_PREFIX= endif -if HAVE_WIN32 -if INCLUDE_BASIC_WIN32 -WIN32_INCLUDED=libpango-basic-win32.la -WIN32_MODULES= -WIN32_PREFIX=-DWIN32_MODULE_PREFIX -else -WIN32_INCLUDED= -WIN32_MODULES=pango-basic-win32.la -WIN32_PREFIX= -basic_win32_libadd=$(pangowin32libs) -lgdi32 -endif +pango_basic_x_la_LDFLAGS = -export-dynamic -avoid-version -module +pango_basic_x_la_LIBADD = $(pangoxlibs) +pango_basic_x_la_SOURCES = basic-x.c +libpango_basic_x_la_SOURCES = basic-x.c + + +if HAVE_XFT +INCLUDES += $(XFT_CFLAGS) +if INCLUDE_BASIC_XFT +noinst_LTLIBRARIES += libpango-basic-xft.la +INCLUDES += -DXFT_MODULE_PREFIX else -WIN32_INCLUDED= -WIN32_MODULES= -WIN32_PREFIX= +module_LTLIBRARIES += pango-basic-xft.la endif - -if PLATFORM_WIN32 -no_undefined = -no-undefined endif -noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) $(FT2_INCLUDED) $(WIN32_INCLUDED) -module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) $(FT2_MODULES) $(WIN32_MODULES) -moddefine = $(X_PREFIX) $(XFT_PREFIX) $(FT2_PREFIX) $(WIN32_PREFIX) -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules - -INCLUDES = \ - -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango/ \ - $(GLIB_CFLAGS) \ - $(XFT_CFLAGS) \ - $(FREETYPE_CFLAGS) \ - $(X_CFLAGS) \ - $(moddefine) - -pango_basic_x_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_basic_x_la_LIBADD = $(basic_x_libadd) -pango_basic_x_la_SOURCES = $(basic_sources) -libpango_basic_x_la_SOURCES = $(basic_sources) - pango_basic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_basic_xft_la_LIBADD = $(basic_xft_libadd) +pango_basic_xft_la_LIBADD = $(pangoxftlibs) pango_basic_xft_la_SOURCES = basic-xft.c libpango_basic_xft_la_SOURCES = basic-xft.c + +if HAVE_FREETYPE +INCLUDES += $(FREETYPE_CFLAGS) +if INCLUDE_BASIC_FT2 +noinst_LTLIBRARIES += libpango-basic-ft2.la +INCLUDES += -DFT2_MODULE_PREFIX +else +module_LTLIBRARIES += pango-basic-ft2.la +endif +endif + pango_basic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined) -pango_basic_ft2_la_LIBADD = $(basic_ft2_libadd) +pango_basic_ft2_la_LIBADD = $(pangoft2libs) pango_basic_ft2_la_SOURCES = basic-ft2.c libpango_basic_ft2_la_SOURCES = basic-ft2.c + +if HAVE_WIN32 +if INCLUDE_BASIC_WIN32 +noinst_LTLIBRARIES += libpango-basic-win32.la +moddefine += -DWIN32_MODULE_PREFIX +else +module_LTLIBRARIES += pango-basic-win32.la +endif +endif + pango_basic_win32_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined) -pango_basic_win32_la_LIBADD = $(basic_win32_libadd) +pango_basic_win32_la_LIBADD = $(pangowin32libs) -lgdi32 pango_basic_win32_la_SOURCES = basic-win32.c libpango_basic_win32_la_SOURCES = basic-win32.c @@ -121,10 +93,11 @@ if HAVE_USP10_H basic-win32.lo: usp10.h # Do it like this to avoid getting other headers from where usp10.h is -usp10.h: @USP10_H@ - cp -p @USP10_H@ usp10.h +usp10.h: $(USP10_H) + cp -p $(USP10_H) usp10.h endif + EXTRA_DIST = \ basic-common.h \ tables-big.i \ diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am index 05b13a3a..c90b9e0a 100644 --- a/modules/hangul/Makefile.am +++ b/modules/hangul/Makefile.am @@ -5,72 +5,54 @@ pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $ pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs) pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) -x_sources = hangul-x.c hangul-defs.h -xft_sources = hangul-xft.c hangul-defs.h +INCLUDES = \ + -DPANGO_ENABLE_ENGINE \ + -DG_DISABLE_DEPRECATED \ + $(PANGO_DEBUG_FLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango/ \ + $(GLIB_CFLAGS) -if HAVE_XFT -if INCLUDE_HANGUL_XFT -XFT_INCLUDED=libpango-hangul-xft.la -XFT_MODULES= -XFT_PREFIX=-DXFT_MODULE_PREFIX -else -XFT_MODULES=pango-hangul-xft.la -XFT_INCLUDED= -XFT_PREFIX= -hangul_xft_libadd=$(pangoxftlibs) -endif -else -XFT_MODULES= -XFT_INCLUDED= -XFT_PREFIX= -endif +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules +module_LTLIBRARIES = +noinst_LTLIBRARIES = if HAVE_X +INCLUDES += $(X_CFLAGS) if INCLUDE_HANGUL_X -X_MODULES= -X_INCLUDED=libpango-hangul-x.la -X_PREFIX=-DX_MODULE_PREFIX +noinst_LTLIBRARIES += libpango-hangul-x.la +INCLUDES += -DX_MODULE_PREFIX else -X_MODULES=pango-hangul-x.la -X_INCLUDED= -X_PREFIX= -hangul_x_libadd=$(pangoxlibs) +module_LTLIBRARIES += pango-hangul-x.la endif -else -X_MODULES= -X_INCLUDED= -X_PREFIX= endif -noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) -module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) -moddefine = $(X_PREFIX) $(XFT_PREFIX) -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules - -INCLUDES = \ - -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango/ \ - $(moddefine) \ - $(GLIB_CFLAGS) \ - $(XFT_CFLAGS) \ - $(FREETYPE_CFLAGS) \ - $(X_CFLAGS) +x_sources = hangul-x.c hangul-defs.h pango_hangul_x_la_LDFLAGS = -export-dynamic -avoid-version -module +pango_hangul_x_la_LIBADD = $(pangoxlibs) pango_hangul_x_la_SOURCES = $(x_sources) -pango_hangul_x_la_LIBADD = $(hangul_x_libadd) - libpango_hangul_x_la_SOURCES = $(x_sources) + +if HAVE_XFT +INCLUDES += $(XFT_CFLAGS) +if INCLUDE_HANGUL_XFT +noinst_LTLIBRARIES += libpango-hangul-xft.la +INCLUDES += -DXFT_MODULE_PREFIX +else +module_LTLIBRARIES += pango-hangul-xft.la +endif +endif + +xft_sources = hangul-xft.c hangul-defs.h + pango_hangul_xft_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_hangul_xft_la_LIBADD = $(hangul_xft_libadd) +pango_hangul_xft_la_LIBADD = $(pangoxftlibs) pango_hangul_xft_la_SOURCES = $(xft_sources) - libpango_hangul_xft_la_SOURCES = $(xft_sources) + EXTRA_DIST = \ tables-ksc5601.i \ tables-johabfont.i \ diff --git a/modules/hebrew/Makefile.am b/modules/hebrew/Makefile.am index bbf346f2..8cc7fa7c 100644 --- a/modules/hebrew/Makefile.am +++ b/modules/hebrew/Makefile.am @@ -1,99 +1,78 @@ ## Process this file with automake to create Makefile.in. -common_sources = hebrew-shaper.c hebrew-shaper.h -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-$(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-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs) pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) -if HAVE_XFT -if INCLUDE_BASIC_XFT -XFT_INCLUDED=libpango-hebrew-xft.la -XFT_MODULES= -XFT_PREFIX=-DXFT_MODULE_PREFIX +INCLUDES = \ + -DPANGO_ENABLE_ENGINE \ + -DG_DISABLE_DEPRECATED \ + $(PANGO_DEBUG_FLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango/ \ + $(GLIB_CFLAGS) + +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules +module_LTLIBRARIES = +noinst_LTLIBRARIES = + +common_sources = hebrew-shaper.c hebrew-shaper.h + +if HAVE_X +INCLUDES += $(X_CFLAGS) +if INCLUDE_HEBREW_X +noinst_LTLIBRARIES += libpango-hebrew-x.la +INCLUDES += -DX_MODULE_PREFIX else -XFT_INCLUDED= -XFT_MODULES=pango-hebrew-xft.la -XFT_PREFIX= -hebrew_xft_libadd=$(pangoxlibs) $(pangoxftlibs) +module_LTLIBRARIES += pango-hebrew-x.la endif -else -XFT_MODULES= -XFT_INCLUDED= -XFT_PREFIX= endif -if HAVE_X -if INCLUDE_BASIC_X -X_INCLUDED=libpango-hebrew-x.la -X_MODULES= -X_PREFIX=-DX_MODULE_PREFIX +hebrew_x_sources = $(common_sources) hebrew-x.c + +pango_hebrew_x_la_LDFLAGS = -export-dynamic -avoid-version -module +pango_hebrew_x_la_LIBADD = $(pangoxlibs) +pango_hebrew_x_la_SOURCES = $(hebrew_x_sources) +libpango_hebrew_x_la_SOURCES = $(hebrew_x_sources) + + +if HAVE_XFT +INCLUDES += $(XFT_CFLAGS) +if INCLUDE_HEBREW_XFT +noinst_LTLIBRARIES += libpango-hebrew-xft.la +INCLUDES += -DXFT_MODULE_PREFIX else -X_INCLUDED= -X_MODULES=pango-hebrew-x.la -X_PREFIX= -hebrew_x_libadd=$(pangoxlibs) +module_LTLIBRARIES += pango-hebrew-xft.la endif -else -X_INCLUDED= -X_MODULES= -X_PREFIX= endif +hebrew_xft_sources = $(common_sources) hebrew-xft.c + +pango_hebrew_xft_la_LDFLAGS = -export-dynamic -avoid-version -module +pango_hebrew_xft_la_LIBADD = $(pangoxftlibs) +pango_hebrew_xft_la_SOURCES = $(hebrew_xft_sources) +libpango_hebrew_xft_la_SOURCES = $(hebrew_xft_sources) + + if HAVE_FREETYPE -if INCLUDE_BASIC_FT2 -FT2_INCLUDED=libpango-hebrew-ft2.la -FT2_MODULES= -FT2_PREFIX=-DFT2_MODULE_PREFIX +INCLUDES += $(FREETYPE_CFLAGS) +if INCLUDE_HEBREW_FT2 +noinst_LTLIBRARIES += libpango-hebrew-ft2.la +INCLUDES += -DFT2_MODULE_PREFIX else -FT2_INCLUDED= -FT2_MODULES=pango-hebrew-ft2.la -FT2_PREFIX= -hebrew_ft2_libadd=$(pangoft2libs) +module_LTLIBRARIES += pango-hebrew-ft2.la endif -else -FT2_MODULES= -FT2_INCLUDED= -FT2_PREFIX= endif if PLATFORM_WIN32 no_undefined = -no-undefined endif -noinst_LTLIBRARIES = $(X_INCLUDED) $(FT2_INCLUDED) $(XFT_INCLUDED) -module_LTLIBRARIES = $(X_MODULES) $(FT2_MODULES) $(XFT_MODULES) -moddefine = $(X_PREFIX) $(FT2_PREFIX) $(XFT_PREFIX) -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules - -INCLUDES = \ - -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango/ \ - $(GLIB_CFLAGS) \ - $(XFT_CFLAGS) \ - $(FREETYPE_CFLAGS) \ - $(X_CFLAGS) \ - $(moddefine) - -pango_hebrew_x_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_hebrew_x_la_LIBADD = $(hebrew_x_libadd) -pango_hebrew_x_la_SOURCES = $(hebrew_x_sources) -libpango_hebrew_x_la_SOURCES = $(hebrew_x_sources) - -pango_hebrew_xft_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_hebrew_xft_la_LIBADD = $(hebrew_xft_libadd) -pango_hebrew_xft_la_SOURCES = $(hebrew_xft_sources) -libpango_hebrew_xft_la_SOURCES = $(hebrew_xft_sources) +hebrew_ft2_sources = $(common_sources) hebrew-ft2.c pango_hebrew_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined) -pango_hebrew_ft2_la_LIBADD = $(hebrew_ft2_libadd) +pango_hebrew_ft2_la_LIBADD = $(pangoft2libs) pango_hebrew_ft2_la_SOURCES = $(hebrew_ft2_sources) libpango_hebrew_ft2_la_SOURCES = $(hebrew_ft2_sources) diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am index f58ad78d..4df9443f 100644 --- a/modules/indic/Makefile.am +++ b/modules/indic/Makefile.am @@ -1,155 +1,109 @@ ## Process this file with automake to create Makefile.in. -sources = \ - myanmar-x.c \ - gurmukhi-x.c \ - bengali-x.c \ - gujarati-x.c \ - devanagari-x.c \ - pango-indic-script.h - -xft_sources = \ - indic-xft.c \ - indic-ot-class-tables.c \ - indic-ot.c \ - indic-ot.h - 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-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs) pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) -if HAVE_XFT -if INCLUDE_INDIC_XFT -indic_xft_inst= -indic_xft_noinst=libpango-indic-xft.la -indic_xft_cflags=-DXFT_MODULE_PREFIX $(FREETYPE_CFLAGS) -else -indic_xft_inst=pango-indic-xft.la -indic_xft_noinst= -indic_xft_cflags= $(FREETYPE_CFLAGS) -indic_xft_libadd=$(pangoxftlibs) -endif -else -indic_xft_inst= -indic_xft_noints= -indic_xft_cflags= -endif +INCLUDES = \ + -DPANGO_ENABLE_ENGINE \ + -DG_DISABLE_DEPRECATED \ + $(PANGO_DEBUG_FLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango/ \ + $(GLIB_CFLAGS) -if HAVE_X +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules +module_LTLIBRARIES = +noinst_LTLIBRARIES = + +if HAVE_X +INCLUDES += $(X_CFLAGS) if INCLUDE_MYANMAR_X -myanmar_x_noinst=libpango-myanmar-x.la -myanmar_x_cflags=-DMYANMAR_X_MODULE_PREFIX +noinst_LTLIBRARIES += libpango-myanmar-x.la +INCLUDES += -DMYANMAR_X_MODULE_PREFIX else -myanmar_x_inst=pango-myanmar-x.la -myanmar_x_libadd=$(pangoxlibs) +module_LTLIBRARIES += pango-myanmar-x.la endif if INCLUDE_GURMUKHI_X -gurmukhi_x_noinst=libpango-gurmukhi-x.la -gurmukhi_x_cflags=-DGURMUKHI_X_MODULE_PREFIX +noinst_LTLIBRARIES += libpango-gurmukhi-x.la +INCLUDES += -DGURMUKHI_X_MODULE_PREFIX else -gurmukhi_x_inst=pango-gurmukhi-x.la -gurmukhi_x_libadd=$(pangoxlibs) +module_LTLIBRARIES += pango-gurmukhi-x.la endif if INCLUDE_BENGALI_X -bengali_x_noinst=libpango-bengali-x.la -bengali_x_cflags=-DBENGALI_X_MODULE_PREFIX +noinst_LTLIBRARIES += libpango-bengali-x.la +INCLUDES += -DBENGALI_X_MODULE_PREFIX else -bengali_x_inst=pango-bengali-x.la -bengali_x_libadd=$(pangoxlibs) +module_LTLIBRARIES += pango-bengali-x.la endif if INCLUDE_DEVANAGARI_X -devanagari_x_noinst=libpango-devanagari-x.la -devanagari_x_cflags=-DDEVANAGARI_X_MODULE_PREFIX +noinst_LTLIBRARIES += libpango-devanagari-x.la +INCLUDES += -DDEVANAGARI_X_MODULE_PREFIX else -devanagari_x_inst=pango-devanagari-x.la -devanagari_x_libadd=$(pangoxlibs) +module_LTLIBRARIES += pango-devanagari-x.la endif if INCLUDE_GUJARATI_X -gujarati_x_noinst=libpango-gujarati-x.la -gujarati_x_cflags=-DGUJARATI_X_MODULE_PREFIX +noinst_LTLIBRARIES += libpango-gujarati-x.la +INCLUDES += -DGUJARATI_X_MODULE_PREFIX else -gujarati_x_inst=pango-gujarati-x.la -gujarati_x_libadd=$(pangoxlibs) +module_LTLIBRARIES += pango-gujarati-x.la endif - -noinst_LTLIBRARIES = $(myanmar_x_noinst) $(gurmukhi_x_noinst) $(bengali_x_noinst) $(devanagari_x_noinst) $(gujarati_x_noinst) $(indic_xft_noinst) - -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules -module_LTLIBRARIES = $(myanmar_x_inst) $(gurmukhi_x_inst) $(bengali_x_inst) $(devanagari_x_inst) $(gujarati_x_inst) $(indic_xft_inst) - endif -INCLUDES = \ - -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango/ \ - $(GLIB_CFLAGS) \ - $(XFT_CFLAGS) \ - $(X_CFLAGS) \ - $(myanmar_x_cflags) \ - $(gurmukhi_x_cflags) \ - $(bengali_x_cflags) \ - $(devanagari_x_cflags) \ - $(gujarati_x_cflags) \ - $(indic_xft_cflags) - -EXTRA_DIST = \ - pango-indic-script.h - pango_devanagari_x_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_devanagari_x_la_LIBADD = $(devanagari_x_libadd) -if INCLUDE_DEVANAGARI_X -libpango_devanagari_x_la_SOURCES = devanagari-x.c -else -pango_devanagari_x_la_SOURCES = devanagari-x.c -endif +pango_devanagari_x_la_LIBADD = $(pangoxlibs) +pango_devanagari_x_la_SOURCES = devanagari-x.c pango-indic-script.h +libpango_devanagari_x_la_SOURCES = devanagari-x.c pango-indic-script.h pango_myanmar_x_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_myanmar_x_la_LIBADD = $(myanmar_x_libadd) -if INCLUDE_MYANMAR_X -libpango_myanmar_x_la_SOURCES = myanmar-x.c -else -pango_myanmar_x_la_SOURCES = myanmar-x.c -endif +pango_myanmar_x_la_LIBADD = $(pangoxlibs) +pango_myanmar_x_la_SOURCES = myanmar-x.c pango-indic-script.h +libpango_myanmar_x_la_SOURCES = myanmar-x.c pango-indic-script.h pango_gurmukhi_x_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_gurmukhi_x_la_LIBADD = $(gurmukhi_x_libadd) -if INCLUDE_GURMUKHI_X -libpango_gurmukhi_x_la_SOURCES = gurmukhi-x.c -else -pango_gurmukhi_x_la_SOURCES = gurmukhi-x.c -endif +pango_gurmukhi_x_la_LIBADD = $(pangoxlibs) +pango_gurmukhi_x_la_SOURCES = gurmukhi-x.c pango-indic-script.h +libpango_gurmukhi_x_la_SOURCES = gurmukhi-x.c pango-indic-script.h pango_bengali_x_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_bengali_x_la_LIBADD = $(bengali_x_libadd) -if INCLUDE_BENGALI_X -libpango_bengali_x_la_SOURCES = bengali-x.c -else -pango_bengali_x_la_SOURCES = bengali-x.c -endif +pango_bengali_x_la_LIBADD = $(pangoxlibs) +pango_bengali_x_la_SOURCES = bengali-x.c pango-indic-script.h +libpango_bengali_x_la_SOURCES = bengali-x.c pango-indic-script.h pango_gujarati_x_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_gujarati_x_la_LIBADD = $(gujarati_x_libadd) -if INCLUDE_GUJARATI_X -libpango_gujarati_x_la_SOURCES = gujarati-x.c +pango_gujarati_x_la_LIBADD = $(pangoxlibs) +pango_gujarati_x_la_SOURCES = gujarati-x.c pango-indic-script.h +libpango_gujarati_x_la_SOURCES = gujarati-x.c pango-indic-script.h + + +if HAVE_XFT +INCLUDES += $(XFT_CFLAGS) +if INCLUDE_INDIC_XFT +noinst_LTLIBRARIES += libpango-indic-xft.la +INCLUDES += -DXFT_MODULE_PREFIX else -pango_gujarati_x_la_SOURCES = gujarati-x.c +module_LTLIBRARIES += pango-indic-xft.la +endif endif +xft_sources = \ + indic-xft.c \ + indic-ot-class-tables.c \ + indic-ot.c \ + indic-ot.h + pango_indic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_indic_xft_la_LIBADD = $(indic_xft_libadd) +pango_indic_xft_la_LIBADD = $(pangoxftlibs) pango_indic_xft_la_SOURCES = $(xft_sources) - libpango_indic_xft_la_SOURCES = $(xft_sources) + included-modules: $(noinst_LTLIBRARIES) .PHONY: included-modules diff --git a/modules/tamil/Makefile.am b/modules/tamil/Makefile.am index 4b18fbb4..c3ecaf25 100644 --- a/modules/tamil/Makefile.am +++ b/modules/tamil/Makefile.am @@ -4,49 +4,38 @@ pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIB pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs) pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) -x_sources = \ - tamil-x.c \ - tadefs.h +INCLUDES = \ + -DPANGO_ENABLE_ENGINE \ + -DG_DISABLE_DEPRECATED \ + $(PANGO_DEBUG_FLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango/ \ + $(GLIB_CFLAGS) + +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules +module_LTLIBRARIES = +noinst_LTLIBRARIES = if HAVE_X +INCLUDES += $(X_CFLAGS) if INCLUDE_TAMIL_X -X_MODULES= -X_INCLUDED=libpango-tamil-x.la -X_PREFIX=-DX_MODULE_PREFIX +noinst_LTLIBRARIES += libpango-tamil-x.la +INCLUDES += -DX_MODULE_PREFIX else -X_MODULES=pango-tamil-x.la -X_INCLUDED= -X_PREFIX= -tamil_x_libadd=$(pangoxlibs) +module_LTLIBRARIES += pango-tamil-x.la endif -else -X_MODULES= -X_INCLUDED= -X_PREFIX= endif -noinst_LTLIBRARIES = $(X_INCLUDED) -module_LTLIBRARIES = $(X_MODULES) -moddefine = $(X_PREFIX) -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules - -INCLUDES = \ - -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango/ \ - $(moddefine) \ - $(GLIB_CFLAGS) \ - $(FREETYPE_CFLAGS) \ - $(X_CFLAGS) +x_sources = \ + tamil-x.c \ + tadefs.h pango_tamil_x_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_tamil_x_la_LIBADD = $(tamil_x_libadd) +pango_tamil_x_la_LIBADD = $(pangoxlibs) pango_tamil_x_la_SOURCES = $(x_sources) - libpango_tamil_x_la_SOURCES = $(x_sources) + included-modules: $(noinst_LTLIBRARIES) .PHONY: included-modules diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am index 6e27c439..7b66a756 100644 --- a/modules/thai/Makefile.am +++ b/modules/thai/Makefile.am @@ -1,77 +1,61 @@ ## Process this file with automake to create Makefile.in. -common_sources = thai-shaper.c thai-shaper.h -thai_x_sources = $(common_sources) thai-x.c -thai_xft_sources = $(common_sources) thai-xft.c - 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-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs) pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) -if HAVE_XFT -if INCLUDE_THAI_XFT -XFT_MODULES= -XFT_INCLUDED=libpango-thai-xft.la -XFT_PREFIX=-DXFT_MODULE_PREFIX -else -XFT_MODULES=pango-thai-xft.la -XFT_INCLUDED= -XFT_PREFIX= -thai_xft_libadd=$(pangoxftlibs) -endif -else -XFT_MODULES= -XFT_INCLUDED= -XFT_PREFIX= -endif +INCLUDES = \ + -DPANGO_ENABLE_ENGINE \ + -DG_DISABLE_DEPRECATED \ + $(PANGO_DEBUG_FLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango/ \ + $(GLIB_CFLAGS) + +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules +module_LTLIBRARIES = +noinst_LTLIBRARIES = + +common_sources = thai-shaper.c thai-shaper.h + if HAVE_X +INCLUDES += $(X_CFLAGS) if INCLUDE_THAI_X -X_MODULES= -X_INCLUDED=libpango-thai-x.la -X_PREFIX=-DX_MODULE_PREFIX +noinst_LTLIBRARIES += libpango-thai-x.la +INCLUDES += -DX_MODULE_PREFIX else -X_MODULES=pango-thai-x.la -X_INCLUDED= -X_PREFIX= -thai_x_libadd=$(pangoxlibs) +module_LTLIBRARIES += pango-thai-x.la endif -else -X_MODULES= -X_INCLUDED= -X_PREFIX= endif -noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) -module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) -moddefine = $(X_PREFIX) $(XFT_PREFIX) -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules - -INCLUDES = \ - -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango/ \ - $(moddefine) \ - $(GLIB_CFLAGS) \ - $(XFT_CFLAGS) \ - $(FREETYPE_CFLAGS) \ - $(X_CFLAGS) +thai_x_sources = $(common_sources) thai-x.c pango_thai_x_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_thai_x_la_LIBADD = $(thai_x_libadd) +pango_thai_x_la_LIBADD = $(pangoxlibs) pango_thai_x_la_SOURCES = $(thai_x_sources) - libpango_thai_x_la_SOURCES = $(thai_x_sources) + +if HAVE_XFT +INCLUDES += $(XFT_CFLAGS) +if INCLUDE_THAI_XFT +noinst_LTLIBRARIES += libpango-thai-xft.la +INCLUDES += -DXFT_MODULE_PREFIX +else +module_LTLIBRARIES += pango-thai-xft.la +endif +endif + +thai_xft_sources = $(common_sources) thai-xft.c + pango_thai_xft_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_thai_xft_la_LIBADD = $(thai_xft_libadd) +pango_thai_xft_la_LIBADD = $(pangoxftlibs) pango_thai_xft_la_SOURCES = $(thai_xft_sources) - libpango_thai_xft_la_SOURCES = $(thai_xft_sources) + included-modules: $(noinst_LTLIBRARIES) .PHONY: included-modules -- cgit v1.2.1