summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2014-07-26 09:48:52 +0200
committerBehdad Esfahbod <behdad@behdad.org>2015-04-04 16:11:30 -0700
commitbc88f6809a6befdbb9a59b628ecc84901ab9d486 (patch)
treef466ce2fcdbd78eef7d78b32e60cc1cff115abbc
parentfa6dfc688c293fa02c36ee89ac5611fd5e0131a5 (diff)
downloadpango-bc88f6809a6befdbb9a59b628ecc84901ab9d486.tar.gz
[modules] Simplify build a bit
-rw-r--r--configure.ac8
-rw-r--r--modules/Makefile.am7
-rw-r--r--modules/Module.mk7
-rw-r--r--modules/arabic/Makefile.am5
-rw-r--r--modules/basic/Makefile.am8
-rw-r--r--modules/indic/Makefile.am4
-rw-r--r--modules/thai/Makefile.am4
-rw-r--r--pango/Makefile.am8
8 files changed, 11 insertions, 40 deletions
diff --git a/configure.ac b/configure.ac
index bc91395a..2c5fd04a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -470,6 +470,7 @@ AC_SUBST(GLIB_MKENUMS)
#
LIBTHAI_REQUIRED_VERSION=0.1.9
PKG_CHECK_MODULES(LIBTHAI, libthai >= $LIBTHAI_REQUIRED_VERSION, have_libthai=true, have_libthai=false)
+AM_CONDITIONAL(HAVE_LIBTHAI, $have_libthai)
#
# Checks for GObject Introspection
@@ -516,13 +517,6 @@ for module in $all_modules; do
done
IFS="$pango_save_ifs"
-AM_CONDITIONAL(INCLUDE_ARABIC_LANG, echo $all_modules | egrep '(^|,)arabic-lang($|,)' > /dev/null)
-AM_CONDITIONAL(INCLUDE_BASIC_FC, echo $all_modules | egrep '(^|,)basic-fc($|,)' > /dev/null)
-AM_CONDITIONAL(INCLUDE_BASIC_WIN32, echo $all_modules | egrep '(^|,)basic-win32($|,)' > /dev/null)
-AM_CONDITIONAL(INCLUDE_BASIC_CORE_TEXT, echo $all_modules | egrep '(^|,)basic-coretext($|,)' > /dev/null)
-AM_CONDITIONAL(INCLUDE_INDIC_LANG, echo $all_modules | egrep '(^|,)indic-lang($|,)' > /dev/null)
-AM_CONDITIONAL(INCLUDE_THAI_LANG, echo $all_modules | egrep '(^|,)thai-lang($|,)' > /dev/null)
-
#
# We use flockfile to implement pango_getline() - should be moved to GLib
# strtok_r isn't present on some systems
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 5ce95d9c..a23364be 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -11,11 +11,4 @@ EXTRA_DIST = \
module.def \
pangorc
-included-modules:
- @for d in $(SUBDIRS) ; do \
- ( cd $$d && $(MAKE) $(AM_MAKEFLAGS) included-modules ) ; \
- done
-
-.PHONY: included-modules
-
-include $(top_srcdir)/git.mk
diff --git a/modules/Module.mk b/modules/Module.mk
index 8c0397c2..bdac1018 100644
--- a/modules/Module.mk
+++ b/modules/Module.mk
@@ -5,10 +5,3 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/pango \
$(GLIB_CFLAGS)
-
-noinst_LTLIBRARIES =
-
-
-included-modules: $(noinst_LTLIBRARIES)
-
-.PHONY: included-modules
diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am
index b43bb367..cf54bd29 100644
--- a/modules/arabic/Makefile.am
+++ b/modules/arabic/Makefile.am
@@ -1,9 +1,6 @@
include $(top_srcdir)/modules/Module.mk
-
-if INCLUDE_ARABIC_LANG
-noinst_LTLIBRARIES += libpango-arabic-lang.la
-endif
+noinst_LTLIBRARIES = libpango-arabic-lang.la
libpango_arabic_lang_la_SOURCES = arabic-lang.c
libpango_arabic_lang_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_arabic_lang
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index b66ae771..6c9abba9 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -1,21 +1,19 @@
include $(top_srcdir)/modules/Module.mk
+noinst_LTLIBRARIES =
+
if HAVE_FREETYPE
INCLUDES += $(FREETYPE_CFLAGS) $(HARFBUZZ_CFLAGS)
-if INCLUDE_BASIC_FC
noinst_LTLIBRARIES += libpango-basic-fc.la
endif
-endif
libpango_basic_fc_la_SOURCES = basic-fc.c
libpango_basic_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_fc
if HAVE_WIN32
-if INCLUDE_BASIC_WIN32
noinst_LTLIBRARIES += libpango-basic-win32.la
endif
-endif
libpango_basic_win32_la_LIBADD = -lgdi32 -lusp10
libpango_basic_win32_la_SOURCES = basic-win32.c
@@ -23,10 +21,8 @@ libpango_basic_win32_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_win32
if HAVE_CORE_TEXT
INCLUDES += $(CAIRO_CFLAGS)
-if INCLUDE_BASIC_CORE_TEXT
noinst_LTLIBRARIES += libpango-basic-coretext.la
endif
-endif
libpango_basic_coretext_la_SOURCES = basic-coretext.c
libpango_basic_coretext_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_coretext
diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am
index f6f40484..df26446f 100644
--- a/modules/indic/Makefile.am
+++ b/modules/indic/Makefile.am
@@ -1,8 +1,6 @@
include $(top_srcdir)/modules/Module.mk
-if INCLUDE_INDIC_LANG
-noinst_LTLIBRARIES += libpango-indic-lang.la
-endif
+noinst_LTLIBRARIES = libpango-indic-lang.la
libpango_indic_lang_la_SOURCES = indic-lang.c
libpango_indic_lang_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_indic_lang
diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am
index 79ba7213..5fae130a 100644
--- a/modules/thai/Makefile.am
+++ b/modules/thai/Makefile.am
@@ -1,7 +1,7 @@
include $(top_srcdir)/modules/Module.mk
-if INCLUDE_THAI_LANG
-noinst_LTLIBRARIES += libpango-thai-lang.la
+if HAVE_LIBTHAI
+noinst_LTLIBRARIES = libpango-thai-lang.la
endif
libpango_thai_lang_la_SOURCES = thai-lang.c
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 61b91502..3e22ae86 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -452,13 +452,13 @@ EXTRA_DIST = \
check.defs
-included-modules:
- $(AM_V_GEN) cd $(top_builddir)/modules && $(MAKE) $(AM_MAKEFLAGS) included-modules
+modules:
+ $(AM_V_GEN) cd $(top_builddir)/modules && $(MAKE) $(AM_MAKEFLAGS)
-$(INCLUDED_LANG_MODULES) $(INCLUDED_FC_MODULES) $(INCLUDED_WIN32_MODULES) $(INCLUDED_CORE_TEXT_MODULES): included-modules
+$(INCLUDED_LANG_MODULES) $(INCLUDED_FC_MODULES) $(INCLUDED_WIN32_MODULES) $(INCLUDED_CORE_TEXT_MODULES): modules
$(AM_V_GEN) true
-.PHONY: included-modules
+.PHONY: modules
MODULE_DEF_FILES = \
module-defs.h \