diff options
author | Behdad Esfahbod <behdad@gnome.org> | 2006-02-13 19:03:39 +0000 |
---|---|---|
committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-02-13 19:03:39 +0000 |
commit | 55c263e39be388808c7bd6d275c847449b57a3a1 (patch) | |
tree | a3547dd07c984d19f943304c3c6bd394dfea78d1 | |
parent | 74565226a4312f72192773bcaca97409ca4c2954 (diff) | |
download | pango-55c263e39be388808c7bd6d275c847449b57a3a1.tar.gz |
Pass 1.6 and gnu options to automake.
2006-02-13 Behdad Esfahbod <behdad@gnome.org>
* configure.in: Pass 1.6 and gnu options to automake.
* modules/Makefile.am: Distribute Module.mk.
* modules/Module.mk: Common bits for writing module Makefil.am's.
* modules/*/Makefile.am: Include Module.mk instead of copying common
bits.
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | modules/Makefile.am | 1 | ||||
-rw-r--r-- | modules/Module.mk | 35 | ||||
-rw-r--r-- | modules/arabic/Makefile.am | 24 | ||||
-rw-r--r-- | modules/basic/Makefile.am | 27 | ||||
-rw-r--r-- | modules/hangul/Makefile.am | 23 | ||||
-rw-r--r-- | modules/hebrew/Makefile.am | 24 | ||||
-rw-r--r-- | modules/indic/Makefile.am | 25 | ||||
-rw-r--r-- | modules/khmer/Makefile.am | 24 | ||||
-rw-r--r-- | modules/syriac/Makefile.am | 23 | ||||
-rw-r--r-- | modules/thai/Makefile.am | 24 | ||||
-rw-r--r-- | modules/tibetan/Makefile.am | 23 |
13 files changed, 57 insertions, 209 deletions
@@ -1,3 +1,14 @@ +2006-02-13 Behdad Esfahbod <behdad@gnome.org> + + * configure.in: Pass 1.6 and gnu options to automake. + + * modules/Makefile.am: Distribute Module.mk. + + * modules/Module.mk: Common bits for writing module Makefil.am's. + + * modules/*/Makefile.am: Include Module.mk instead of copying common + bits. + 2006-02-11 Behdad Esfahbod <behdad@gnome.org> Bug 330795 – pango_renderer_draw_glyph segfaults when trying to call diff --git a/configure.in b/configure.in index b4bcdfdd..056a11fa 100644 --- a/configure.in +++ b/configure.in @@ -42,7 +42,7 @@ AC_INIT(pango, [pango_version], AC_CONFIG_SRCDIR([ChangeLog]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE(1.6 gnu) AM_CONFIG_HEADER([config.h]) diff --git a/modules/Makefile.am b/modules/Makefile.am index a9ffbfbe..df5800ad 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -12,6 +12,7 @@ SUBDIRS = \ tibetan EXTRA_DIST = \ + Module.mk \ module.def \ pangorc diff --git a/modules/Module.mk b/modules/Module.mk new file mode 100644 index 00000000..aa504700 --- /dev/null +++ b/modules/Module.mk @@ -0,0 +1,35 @@ +pangolibs = \ + $(GLIB_LIBS) \ + $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la +pangoxlibs = \ + $(pangolibs) \ + $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la \ + $(X_LIBS) +pangoft2libs = \ + $(pangolibs) \ + $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la \ + $(FREETYPE_LIBS) +pangowin32libs = \ + $(pangolibs) \ + $(top_builddir)/pango/libpangowin32-$(PANGO_API_VERSION).la +pangoatsuilibs = \ + $(pangolibs) \ + $(top_builddir)/pango/libpangocairo-$(PANGO_API_VERSION).la + +INCLUDES = \ + -DG_LOG_DOMAIN=\"Pango\" \ + -DPANGO_ENABLE_ENGINE \ + $(PANGO_DEBUG_FLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango \ + $(GLIB_CFLAGS) + +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules +module_LTLIBRARIES = +noinst_LTLIBRARIES = + + +included-modules: $(noinst_LTLIBRARIES) +dynamic-modules: $(module_LTLIBRARIES) + +.PHONY: included-modules dynamic-modules diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am index ec632972..ca129b8d 100644 --- a/modules/arabic/Makefile.am +++ b/modules/arabic/Makefile.am @@ -1,20 +1,4 @@ -## Process this file with automake to create Makefile.in. - -pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS) -pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) - -INCLUDES = \ - -DG_LOG_DOMAIN=\"Pango\" \ - -DPANGO_ENABLE_ENGINE \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango \ - $(GLIB_CFLAGS) - -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules -module_LTLIBRARIES = -noinst_LTLIBRARIES = - +include $(top_srcdir)/modules/Module.mk if HAVE_FREETYPE INCLUDES += $(FREETYPE_CFLAGS) @@ -37,9 +21,3 @@ pango_arabic_fc_la_LIBADD = $(pangoft2libs) pango_arabic_fc_la_SOURCES = $(fc_sources) libpango_arabic_fc_la_SOURCES = $(fc_sources) libpango_arabic_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_arabic_fc - - -included-modules: $(noinst_LTLIBRARIES) -dynamic-modules: $(module_LTLIBRARIES) - -.PHONY: included-modules dynamic-modules diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am index f3a35aed..422360ed 100644 --- a/modules/basic/Makefile.am +++ b/modules/basic/Makefile.am @@ -1,24 +1,4 @@ -## Process this file with automake to create Makefile.in. - -basic_sources = basic-x.c - -pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS) -pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs) -pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) -pangowin32libs = $(top_builddir)/pango/libpangowin32-$(PANGO_API_VERSION).la $(pangolibs) -pangoatsuilibs = $(top_builddir)/pango/libpangocairo-$(PANGO_API_VERSION).la $(pangolibs) - -INCLUDES = \ - -DG_LOG_DOMAIN=\"Pango\" \ - -DPANGO_ENABLE_ENGINE \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango \ - $(GLIB_CFLAGS) - -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules -module_LTLIBRARIES = -noinst_LTLIBRARIES = +include $(top_srcdir)/modules/Module.mk if HAVE_X INCLUDES += $(X_CFLAGS) @@ -101,8 +81,3 @@ EXTRA_DIST = \ basic-common.h \ tables-big.i \ tables-small.i - -included-modules: $(noinst_LTLIBRARIES) -dynamic-modules: $(module_LTLIBRARIES) - -.PHONY: included-modules dynamic-modules diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am index bb0f2469..3b3c52fa 100644 --- a/modules/hangul/Makefile.am +++ b/modules/hangul/Makefile.am @@ -1,20 +1,4 @@ -## Process this file with automake to create Makefile.in. - -pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS) -pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) - -INCLUDES = \ - -DG_LOG_DOMAIN=\"Pango\" \ - -DPANGO_ENABLE_ENGINE \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango \ - $(GLIB_CFLAGS) - -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules -module_LTLIBRARIES = -noinst_LTLIBRARIES = - +include $(top_srcdir)/modules/Module.mk if HAVE_FREETYPE INCLUDES += $(FREETYPE_CFLAGS) @@ -38,8 +22,3 @@ libpango_hangul_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_hangul_fc EXTRA_DIST = \ tables-jamos.i - -included-modules: $(noinst_LTLIBRARIES) -dynamic-modules: $(module_LTLIBRARIES) - -.PHONY: included-modules dynamic-modules diff --git a/modules/hebrew/Makefile.am b/modules/hebrew/Makefile.am index f8450f83..e7a7b76b 100644 --- a/modules/hebrew/Makefile.am +++ b/modules/hebrew/Makefile.am @@ -1,23 +1,7 @@ -## Process this file with automake to create Makefile.in. - -pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS) -pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) - -INCLUDES = \ - -DG_LOG_DOMAIN=\"Pango\" \ - -DPANGO_ENABLE_ENGINE \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango \ - $(GLIB_CFLAGS) - -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules -module_LTLIBRARIES = -noinst_LTLIBRARIES = +include $(top_srcdir)/modules/Module.mk common_sources = hebrew-shaper.c hebrew-shaper.h - if HAVE_FREETYPE INCLUDES += $(FREETYPE_CFLAGS) if INCLUDE_HEBREW_FC @@ -36,9 +20,3 @@ pango_hebrew_fc_la_LIBADD = $(pangoft2libs) pango_hebrew_fc_la_SOURCES = $(hebrew_fc_sources) libpango_hebrew_fc_la_SOURCES = $(hebrew_fc_sources) libpango_hebrew_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_hebrew_fc - - -included-modules: $(noinst_LTLIBRARIES) -dynamic-modules: $(module_LTLIBRARIES) - -.PHONY: included-modules dynamic-modules diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am index ff073711..f2b19197 100644 --- a/modules/indic/Makefile.am +++ b/modules/indic/Makefile.am @@ -1,20 +1,4 @@ -## Process this file with automake to create Makefile.in. - -pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS) -pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) - -INCLUDES = \ - -DG_LOG_DOMAIN=\"Pango\" \ - -DPANGO_ENABLE_ENGINE \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango \ - $(GLIB_CFLAGS) - -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules -module_LTLIBRARIES = -noinst_LTLIBRARIES = - +include $(top_srcdir)/modules/Module.mk if HAVE_FREETYPE INCLUDES += $(FREETYPE_CFLAGS) @@ -40,10 +24,3 @@ pango_indic_fc_la_LIBADD = $(pangoft2libs) pango_indic_fc_la_SOURCES = $(fc_sources) libpango_indic_fc_la_SOURCES = $(fc_sources) libpango_indic_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_indic_fc - - -included-modules: $(noinst_LTLIBRARIES) -dynamic-modules: $(module_LTLIBRARIES) - -.PHONY: included-modules dynamic-modules - diff --git a/modules/khmer/Makefile.am b/modules/khmer/Makefile.am index 94b22f5f..c1618c9b 100644 --- a/modules/khmer/Makefile.am +++ b/modules/khmer/Makefile.am @@ -1,20 +1,4 @@ -## Process this file with automake to create Makefile.in. - -pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS) -pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) - -INCLUDES = \ - -DG_LOG_DOMAIN=\"Pango\" \ - -DPANGO_ENABLE_ENGINE \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango \ - $(GLIB_CFLAGS) - -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules -module_LTLIBRARIES = -noinst_LTLIBRARIES = - +include $(top_srcdir)/modules/Module.mk if HAVE_FREETYPE INCLUDES += $(FREETYPE_CFLAGS) @@ -35,9 +19,3 @@ pango_khmer_fc_la_LIBADD = $(pangoft2libs) pango_khmer_fc_la_SOURCES = $(fc_sources) libpango_khmer_fc_la_SOURCES = $(fc_sources) libpango_khmer_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_khmer_fc - - -included-modules: $(noinst_LTLIBRARIES) -dynamic-modules: $(module_LTLIBRARIES) - -.PHONY: included-modules dynamic-modules diff --git a/modules/syriac/Makefile.am b/modules/syriac/Makefile.am index 6722f00e..fd9b2a97 100644 --- a/modules/syriac/Makefile.am +++ b/modules/syriac/Makefile.am @@ -1,19 +1,4 @@ -## Process this file with automake to create Makefile.in. - -pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS) -pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) - -INCLUDES = \ - -DG_LOG_DOMAIN=\"Pango\" \ - -DPANGO_ENABLE_ENGINE \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango \ - $(GLIB_CFLAGS) - -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules -module_LTLIBRARIES = -noinst_LTLIBRARIES = +include $(top_srcdir)/modules/Module.mk if HAVE_FREETYPE INCLUDES += $(FREETYPE_CFLAGS) @@ -36,9 +21,3 @@ pango_syriac_fc_la_LIBADD = $(pangoft2libs) pango_syriac_fc_la_SOURCES = $(fc_sources) libpango_syriac_fc_la_SOURCES = $(fc_sources) libpango_syriac_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_syriac_fc - - -included-modules: $(noinst_LTLIBRARIES) -dynamic-modules: $(module_LTLIBRARIES) - -.PHONY: included-modules dynamic-modules diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am index 252240a5..1b401357 100644 --- a/modules/thai/Makefile.am +++ b/modules/thai/Makefile.am @@ -1,23 +1,7 @@ -## Process this file with automake to create Makefile.in. - -pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS) -pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) - -INCLUDES = \ - -DG_LOG_DOMAIN=\"Pango\" \ - -DPANGO_ENABLE_ENGINE \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango \ - $(GLIB_CFLAGS) - -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules -module_LTLIBRARIES = -noinst_LTLIBRARIES = +include $(top_srcdir)/modules/Module.mk common_sources = thai-charprop.c thai-charprop.h thai-shaper.c thai-shaper.h - if HAVE_FREETYPE INCLUDES += $(FREETYPE_CFLAGS) if INCLUDE_THAI_FC @@ -36,9 +20,3 @@ pango_thai_fc_la_LIBADD = $(pangoft2libs) pango_thai_fc_la_SOURCES = $(thai_fc_sources) libpango_thai_fc_la_SOURCES = $(thai_fc_sources) libpango_thai_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_thai_fc - - -included-modules: $(noinst_LTLIBRARIES) -dynamic-modules: $(module_LTLIBRARIES) - -.PHONY: included-modules dynamic-modules diff --git a/modules/tibetan/Makefile.am b/modules/tibetan/Makefile.am index 2dab807f..3b7959dc 100644 --- a/modules/tibetan/Makefile.am +++ b/modules/tibetan/Makefile.am @@ -1,19 +1,4 @@ -## Process this file with automake to create Makefile.in. - -pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS) -pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) - -INCLUDES = \ - -DG_LOG_DOMAIN=\"Pango\" \ - -DPANGO_ENABLE_ENGINE \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango \ - $(GLIB_CFLAGS) - -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules -module_LTLIBRARIES = -noinst_LTLIBRARIES = +include $(top_srcdir)/modules/Module.mk if HAVE_FREETYPE INCLUDES += $(FREETYPE_CFLAGS) @@ -33,9 +18,3 @@ pango_tibetan_fc_la_LIBADD = $(pangoft2libs) pango_tibetan_fc_la_SOURCES = $(tibetan_fc_sources) libpango_tibetan_fc_la_SOURCES = $(tibetan_fc_sources) libpango_tibetan_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_tibetan_fc - - -included-modules: $(noinst_LTLIBRARIES) -dynamic-modules: $(module_LTLIBRARIES) - -.PHONY: included-modules dynamic-modules |