Imported Upstream version 2.3.1

[platform/upstream/harfbuzz.git] / util / Makefile.am

diff --git a/util/Makefile.am b/util/Makefile.am
index 944b1aa..e24a6f3 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -6,9 +6,18 @@ CLEANFILES =
 DISTCLEANFILES =
 MAINTAINERCLEANFILES =
 
+include Makefile.sources
+
+# Convenience targets:
+lib:
+       @$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/src lib
+libs:
+       @$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/src libs
+
 bin_PROGRAMS =
 
 AM_CPPFLAGS = \
+       -DHB_DISABLE_DEPRECATED \
        -I$(top_srcdir)/src/ \
        -I$(top_builddir)/src/ \
        $(GLIB_CFLAGS) \
@@ -23,24 +32,10 @@ LDADD = \
        $(NULL)
 
 if HAVE_GLIB
-if HAVE_FREETYPE
 
+if HAVE_FREETYPE
 if HAVE_CAIRO_FT
-hb_view_SOURCES = \
-       hb-view.cc \
-       options.cc \
-       options.hh \
-       main-font-text.hh \
-       shape-consumer.hh \
-       ansi-print.cc \
-       ansi-print.hh \
-       helper-cairo.cc \
-       helper-cairo.hh \
-       helper-cairo-ansi.cc \
-       helper-cairo-ansi.hh \
-       view-cairo.cc \
-       view-cairo.hh \
-       $(NULL)
+hb_view_SOURCES = $(HB_VIEW_sources)
 hb_view_LDADD = \
        $(LDADD) \
        $(CAIRO_LIBS) \
@@ -48,27 +43,33 @@ hb_view_LDADD = \
        $(NULL)
 bin_PROGRAMS += hb-view
 endif # HAVE_CAIRO_FT
+endif # HAVE_FREETYPE
 
-hb_shape_SOURCES = \
-       hb-shape.cc \
-       options.cc \
-       options.hh \
-       main-font-text.hh \
-       shape-consumer.hh \
-       $(NULL)
+hb_shape_SOURCES = $(HB_SHAPE_sources)
 bin_PROGRAMS += hb-shape
 
-if HAVE_OT
-hb_ot_shape_closure_SOURCES = \
-       hb-ot-shape-closure.cc \
-       options.cc \
-       options.hh \
-       main-font-text.hh \
-       $(NULL)
+hb_subset_SOURCES = $(HB_SUBSET_CLI_sources)
+hb_subset_LDADD = \
+       $(LDADD) \
+       $(top_builddir)/src/libharfbuzz-subset.la
+bin_PROGRAMS += hb-subset
+
+hb_ot_shape_closure_SOURCES = $(HB_OT_SHAPE_CLOSURE_sources)
 bin_PROGRAMS += hb-ot-shape-closure
-endif # HAVE_OT
 
-endif # HAVE_FREETYPE
 endif # HAVE_GLIB
 
+#if HAVE_FONTCONFIG
+#hb_fc_list_SOURCES = \
+#      hb-fc.cc \
+#      hb-fc.h \
+#      hb-fc-list.c \
+#      $(NULL)
+#hb_fc_list_LDADD = \
+#      $(LDADD) \
+#      $(FONTCONFIG_LIBS) \
+#      $(NULL)
+#bin_PROGRAMS += hb-fc-list
+#endif # HAVE_FONTCONFIG
+
 -include $(top_srcdir)/git.mk