Imported Upstream version 2.6.4

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

diff --git a/util/Makefile.in b/util/Makefile.in
index 40f116f..d8f7b32 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -97,6 +97,7 @@ subdir = util
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_link_flag.m4 \
        $(top_srcdir)/m4/ax_code_coverage.m4 \
+       $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
        $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/gtk-doc.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@@ -138,16 +139,18 @@ hb_shape_LDADD = $(LDADD)
 hb_shape_DEPENDENCIES = $(top_builddir)/src/libharfbuzz.la \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1)
-am__hb_subset_SOURCES_DIST = hb-subset.cc options.cc options.hh \
-       main-font-text.hh
-am__objects_4 = hb-subset.$(OBJEXT) options.$(OBJEXT) $(am__objects_1)
+am__hb_subset_SOURCES_DIST = hb-subset.cc options.cc options-subset.cc \
+       options.hh main-font-text.hh
+am__objects_4 = hb-subset.$(OBJEXT) options.$(OBJEXT) \
+       options-subset.$(OBJEXT) $(am__objects_1)
 @HAVE_GLIB_TRUE@am_hb_subset_OBJECTS = $(am__objects_4)
 hb_subset_OBJECTS = $(am_hb_subset_OBJECTS)
 am__DEPENDENCIES_2 = $(top_builddir)/src/libharfbuzz.la \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1)
-@HAVE_GLIB_TRUE@hb_subset_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-@HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz-subset.la
+@HAVE_GLIB_TRUE@hb_subset_DEPENDENCIES =  \
+@HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz-subset.la \
+@HAVE_GLIB_TRUE@       $(am__DEPENDENCIES_2)
 am__hb_view_SOURCES_DIST = 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 \
@@ -182,7 +185,8 @@ am__depfiles_remade = ./$(DEPDIR)/ansi-print.Po \
        ./$(DEPDIR)/hb-ot-shape-closure.Po ./$(DEPDIR)/hb-shape.Po \
        ./$(DEPDIR)/hb-subset.Po ./$(DEPDIR)/hb-view.Po \
        ./$(DEPDIR)/helper-cairo-ansi.Po ./$(DEPDIR)/helper-cairo.Po \
-       ./$(DEPDIR)/options.Po ./$(DEPDIR)/view-cairo.Po
+       ./$(DEPDIR)/options-subset.Po ./$(DEPDIR)/options.Po \
+       ./$(DEPDIR)/view-cairo.Po
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -301,6 +305,8 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
 FREETYPE_DEPS = @FREETYPE_DEPS@
 FREETYPE_LIBS = @FREETYPE_LIBS@
 GCOV = @GCOV@
+GDI_CFLAGS = @GDI_CFLAGS@
+GDI_LIBS = @GDI_LIBS@
 GENHTML = @GENHTML@
 GIT = @GIT@
 GLIB_CFLAGS = @GLIB_CFLAGS@
@@ -319,6 +325,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
+HAVE_CXX11 = @HAVE_CXX11@
 HB_LIBTOOL_VERSION_INFO = @HB_LIBTOOL_VERSION_INFO@
 HB_VERSION = @HB_VERSION@
 HB_VERSION_MAJOR = @HB_VERSION_MAJOR@
@@ -477,6 +484,7 @@ HB_OT_SHAPE_CLOSURE_sources = \
 HB_SUBSET_CLI_sources = \
        hb-subset.cc \
        options.cc \
+       options-subset.cc \
        options.hh \
        main-font-text.hh \
        $(NULL)
@@ -507,8 +515,8 @@ LDADD = \
 @HAVE_GLIB_TRUE@hb_shape_SOURCES = $(HB_SHAPE_sources)
 @HAVE_GLIB_TRUE@hb_subset_SOURCES = $(HB_SUBSET_CLI_sources)
 @HAVE_GLIB_TRUE@hb_subset_LDADD = \
-@HAVE_GLIB_TRUE@       $(LDADD) \
-@HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz-subset.la
+@HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz-subset.la \
+@HAVE_GLIB_TRUE@       $(LDADD)
 
 @HAVE_GLIB_TRUE@hb_ot_shape_closure_SOURCES = $(HB_OT_SHAPE_CLOSURE_sources)
 all: all-am
@@ -640,6 +648,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hb-view.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helper-cairo-ansi.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helper-cairo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/options-subset.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/options.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/view-cairo.Po@am__quote@ # am--include-marker
 
@@ -813,6 +822,7 @@ distclean: distclean-am
        -rm -f ./$(DEPDIR)/hb-view.Po
        -rm -f ./$(DEPDIR)/helper-cairo-ansi.Po
        -rm -f ./$(DEPDIR)/helper-cairo.Po
+       -rm -f ./$(DEPDIR)/options-subset.Po
        -rm -f ./$(DEPDIR)/options.Po
        -rm -f ./$(DEPDIR)/view-cairo.Po
        -rm -f Makefile
@@ -867,6 +877,7 @@ maintainer-clean: maintainer-clean-am
        -rm -f ./$(DEPDIR)/hb-view.Po
        -rm -f ./$(DEPDIR)/helper-cairo-ansi.Po
        -rm -f ./$(DEPDIR)/helper-cairo.Po
+       -rm -f ./$(DEPDIR)/options-subset.Po
        -rm -f ./$(DEPDIR)/options.Po
        -rm -f ./$(DEPDIR)/view-cairo.Po
        -rm -f Makefile