diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2011-06-17 15:42:16 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2011-06-17 15:42:16 -0400 |
| commit | 0b469b7eeb36ce8181b404f24eaaacaa9ec2c3fe (patch) | |
| tree | b89838087398df711b6b88337d67eac7eb02e7b8 /modules/basic/Makefile.am | |
| parent | 7f9f7184286d584398603e449271d8bbd0e2e101 (diff) | |
| parent | 26092c20b0936ff669513fbd64537123b99d036e (diff) | |
| download | pango-0b469b7eeb36ce8181b404f24eaaacaa9ec2c3fe.tar.gz | |
Merge branch 'master' into harfbuzz-ng-external
Conflicts:
configure.in
pango/opentype/hb-common.h
pango/pango-ot-info.c
Diffstat (limited to 'modules/basic/Makefile.am')
| -rw-r--r-- | modules/basic/Makefile.am | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am index 646a61ec..70e4b6b1 100644 --- a/modules/basic/Makefile.am +++ b/modules/basic/Makefile.am @@ -54,6 +54,16 @@ libpango_basic_win32_la_SOURCES = basic-win32.c libpango_basic_win32_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_win32 if HAVE_CAIRO_ATSUI +if HAVE_CORE_TEXT +INCLUDES += $(CAIRO_CFLAGS) +if INCLUDE_BASIC_CORE_TEXT +noinst_LTLIBRARIES += libpango-basic-coretext.la +else +if DYNAMIC_BASIC_CORE_TEXT +module_LTLIBRARIES += pango-basic-coretext.la +endif +endif +else INCLUDES += $(ATSUI_CFLAGS) $(CAIRO_CFLAGS) if INCLUDE_BASIC_ATSUI noinst_LTLIBRARIES += libpango-basic-atsui.la @@ -63,6 +73,13 @@ module_LTLIBRARIES += pango-basic-atsui.la endif endif endif +endif + +pango_basic_coretext_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS) -framework Carbon +pango_basic_coretext_la_LIBADD = $(pangocoretextlibs) +pango_basic_coretext_la_SOURCES = basic-coretext.c +libpango_basic_coretext_la_SOURCES = basic-coretext.c +libpango_basic_coretext_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_coretext pango_basic_atsui_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS) -framework Carbon pango_basic_atsui_la_LIBADD = $(pangoatsuilibs) |