diff options
Diffstat (limited to 'pango/Makefile.am')
| -rw-r--r-- | pango/Makefile.am | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index 176d70ac..de866d2c 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -10,15 +10,7 @@ INTROSPECTION_GIRS = INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir) --add-include-path=. INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=. -if HAVE_FREETYPE -OPENTYPE_SUBDIR=opentype -endif - -FRIBIDI_SUBDIR=mini-fribidi - -SUBDIRS = $(OPENTYPE_SUBDIR) $(FRIBIDI_SUBDIR) - -DIST_SUBDIRS = mini-fribidi opentype +SUBDIRS = mini-fribidi INCLUDES = \ -DG_LOG_DOMAIN=\"Pango\" \ @@ -31,6 +23,7 @@ INCLUDES = \ $(GLIB_CFLAGS) \ $(XFT_CFLAGS) \ $(CAIRO_CFLAGS) \ + $(HARFBUZZ_CFLAGS) \ $(FREETYPE_CFLAGS) \ $(X_CFLAGS) @@ -235,14 +228,13 @@ pangoft2_public_sources = \ libpangoft2_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) libpangoft2_1_0_la_LIBADD = \ - opentype/libharfbuzz.la \ libpango-$(PANGO_API_VERSION).la \ $(INCLUDED_FC_MODULES) \ $(GLIB_LIBS) \ + $(HARFBUZZ_LIBS) \ $(FREETYPE_LIBS) \ $(libm) libpangoft2_1_0_la_DEPENDENCIES = \ - opentype/libharfbuzz.la \ libpango-$(PANGO_API_VERSION).la \ $(INCLUDED_FC_MODULES) libpangoft2_1_0_la_SOURCES = \ |