Revert "Imported Upstream version 1.2.7"
[platform/upstream/harfbuzz.git] / util / Makefile.in
index f6fe331..6fecdd0 100644 (file)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -80,13 +80,13 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.sources $(srcdir)/Makefile.in \
-       $(srcdir)/Makefile.am $(top_srcdir)/depcomp
 bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
 @HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@am__append_1 = hb-view
 @HAVE_GLIB_TRUE@am__append_2 = hb-shape
 @HAVE_GLIB_TRUE@@HAVE_OT_TRUE@am__append_3 = hb-ot-shape-closure
 subdir = util
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+       $(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
        $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -108,10 +108,10 @@ PROGRAMS = $(bin_PROGRAMS)
 am__hb_ot_shape_closure_SOURCES_DIST = hb-ot-shape-closure.cc \
        options.cc options.hh main-font-text.hh
 am__objects_1 =
-am__objects_2 = hb-ot-shape-closure.$(OBJEXT) options.$(OBJEXT) \
-       $(am__objects_1)
 @HAVE_GLIB_TRUE@@HAVE_OT_TRUE@am_hb_ot_shape_closure_OBJECTS =  \
-@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@ $(am__objects_2)
+@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@ hb-ot-shape-closure.$(OBJEXT) \
+@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@ options.$(OBJEXT) \
+@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@ $(am__objects_1)
 hb_ot_shape_closure_OBJECTS = $(am_hb_ot_shape_closure_OBJECTS)
 hb_ot_shape_closure_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
@@ -124,8 +124,8 @@ am__v_lt_0 = --silent
 am__v_lt_1 = 
 am__hb_shape_SOURCES_DIST = hb-shape.cc options.cc options.hh \
        main-font-text.hh shape-consumer.hh
-am__objects_3 = hb-shape.$(OBJEXT) options.$(OBJEXT) $(am__objects_1)
-@HAVE_GLIB_TRUE@am_hb_shape_OBJECTS = $(am__objects_3)
+@HAVE_GLIB_TRUE@am_hb_shape_OBJECTS = hb-shape.$(OBJEXT) \
+@HAVE_GLIB_TRUE@       options.$(OBJEXT) $(am__objects_1)
 hb_shape_OBJECTS = $(am_hb_shape_OBJECTS)
 hb_shape_LDADD = $(LDADD)
 hb_shape_DEPENDENCIES = $(top_builddir)/src/libharfbuzz.la \
@@ -136,11 +136,13 @@ am__hb_view_SOURCES_DIST = hb-view.cc options.cc options.hh \
        ansi-print.hh helper-cairo.cc helper-cairo.hh \
        helper-cairo-ansi.cc helper-cairo-ansi.hh view-cairo.cc \
        view-cairo.hh
-am__objects_4 = hb-view.$(OBJEXT) options.$(OBJEXT) \
-       ansi-print.$(OBJEXT) helper-cairo.$(OBJEXT) \
-       helper-cairo-ansi.$(OBJEXT) view-cairo.$(OBJEXT) \
-       $(am__objects_1)
-@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@am_hb_view_OBJECTS = $(am__objects_4)
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@am_hb_view_OBJECTS = hb-view.$(OBJEXT) \
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       options.$(OBJEXT) \
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       ansi-print.$(OBJEXT) \
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       helper-cairo.$(OBJEXT) \
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       helper-cairo-ansi.$(OBJEXT) \
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       view-cairo.$(OBJEXT) \
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       $(am__objects_1)
 hb_view_OBJECTS = $(am_hb_view_OBJECTS)
 am__DEPENDENCIES_2 = $(top_builddir)/src/libharfbuzz.la \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -256,8 +258,6 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DIRECTWRITE_CXXFLAGS = @DIRECTWRITE_CXXFLAGS@
-DIRECTWRITE_LIBS = @DIRECTWRITE_LIBS@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -267,20 +267,15 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
 FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_DEPS = @FREETYPE_DEPS@
 FREETYPE_LIBS = @FREETYPE_LIBS@
 GIT = @GIT@
 GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_DEPS = @GLIB_DEPS@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
 GOBJECT_LIBS = @GOBJECT_LIBS@
 GRAPHITE2_CFLAGS = @GRAPHITE2_CFLAGS@
-GRAPHITE2_DEPS = @GRAPHITE2_DEPS@
 GRAPHITE2_LIBS = @GRAPHITE2_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -403,42 +398,11 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+NULL = 
 EXTRA_DIST = 
 CLEANFILES = 
 DISTCLEANFILES = 
 MAINTAINERCLEANFILES = 
-NULL = 
-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_SHAPE_sources = \
-       hb-shape.cc \
-       options.cc \
-       options.hh \
-       main-font-text.hh \
-       shape-consumer.hh \
-       $(NULL)
-
-HB_OT_SHAPE_CLOSURE_sources = \
-       hb-ot-shape-closure.cc \
-       options.cc \
-       options.hh \
-       main-font-text.hh \
-       $(NULL)
-
 AM_CPPFLAGS = \
        -DHB_DISABLE_DEPRECATED \
        -I$(top_srcdir)/src/ \
@@ -455,20 +419,48 @@ LDADD = \
        $(FREETYPE_LIBS) \
        $(NULL)
 
-@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@hb_view_SOURCES = $(HB_VIEW_sources)
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@hb_view_SOURCES = \
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       hb-view.cc \
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       options.cc \
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       options.hh \
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       main-font-text.hh \
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       shape-consumer.hh \
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       ansi-print.cc \
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       ansi-print.hh \
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       helper-cairo.cc \
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       helper-cairo.hh \
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       helper-cairo-ansi.cc \
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       helper-cairo-ansi.hh \
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       view-cairo.cc \
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       view-cairo.hh \
+@HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       $(NULL)
+
 @HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@hb_view_LDADD = \
 @HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       $(LDADD) \
 @HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       $(CAIRO_LIBS) \
 @HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       $(CAIRO_FT_LIBS) \
 @HAVE_CAIRO_FT_TRUE@@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@       $(NULL)
 
-@HAVE_GLIB_TRUE@hb_shape_SOURCES = $(HB_SHAPE_sources)
-@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@hb_ot_shape_closure_SOURCES = $(HB_OT_SHAPE_CLOSURE_sources)
+@HAVE_GLIB_TRUE@hb_shape_SOURCES = \
+@HAVE_GLIB_TRUE@       hb-shape.cc \
+@HAVE_GLIB_TRUE@       options.cc \
+@HAVE_GLIB_TRUE@       options.hh \
+@HAVE_GLIB_TRUE@       main-font-text.hh \
+@HAVE_GLIB_TRUE@       shape-consumer.hh \
+@HAVE_GLIB_TRUE@       $(NULL)
+
+@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@hb_ot_shape_closure_SOURCES = \
+@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@ hb-ot-shape-closure.cc \
+@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@ options.cc \
+@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@ options.hh \
+@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@ main-font-text.hh \
+@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@ $(NULL)
+
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/Makefile.sources $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \
@@ -489,7 +481,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
        esac;
-$(srcdir)/Makefile.sources:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -833,21 +824,6 @@ uninstall-am: uninstall-binPROGRAMS
 lib:
        @$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/src lib
 
-#if HAVE_OT
-#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
-#endif # HAVE_OT
-
 -include $(top_srcdir)/git.mk
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.