diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2014-07-26 09:48:52 +0200 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2015-04-04 16:11:30 -0700 |
| commit | bc88f6809a6befdbb9a59b628ecc84901ab9d486 (patch) | |
| tree | f466ce2fcdbd78eef7d78b32e60cc1cff115abbc /modules | |
| parent | fa6dfc688c293fa02c36ee89ac5611fd5e0131a5 (diff) | |
| download | pango-bc88f6809a6befdbb9a59b628ecc84901ab9d486.tar.gz | |
[modules] Simplify build a bit
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/Makefile.am | 7 | ||||
| -rw-r--r-- | modules/Module.mk | 7 | ||||
| -rw-r--r-- | modules/arabic/Makefile.am | 5 | ||||
| -rw-r--r-- | modules/basic/Makefile.am | 8 | ||||
| -rw-r--r-- | modules/indic/Makefile.am | 4 | ||||
| -rw-r--r-- | modules/thai/Makefile.am | 4 |
6 files changed, 6 insertions, 29 deletions
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 |