Fix build error

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

diff --git a/Makefile.in b/Makefile.in
index 27d3a99..1d8a0e3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -166,9 +166,8 @@ CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
-       COPYING ChangeLog INSTALL NEWS README THANKS TODO ar-lib \
-       compile config.guess config.sub depcomp install-sh ltmain.sh \
-       missing
+       COPYING ChangeLog INSTALL NEWS README THANKS ar-lib compile \
+       config.guess config.sub install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -226,6 +225,8 @@ CAIRO_LIBS = @CAIRO_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHAFA_CFLAGS = @CHAFA_CFLAGS@
+CHAFA_LIBS = @CHAFA_LIBS@
 CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
 CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@
 CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@
@@ -243,8 +244,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@
@@ -254,8 +253,6 @@ 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@
@@ -288,7 +285,6 @@ HB_VERSION_MICRO = @HB_VERSION_MICRO@
 HB_VERSION_MINOR = @HB_VERSION_MINOR@
 HTML_DIR = @HTML_DIR@
 ICU_CFLAGS = @ICU_CFLAGS@
-ICU_CONFIG = @ICU_CONFIG@
 ICU_LIBS = @ICU_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -345,6 +341,10 @@ STRIP = @STRIP@
 UNISCRIBE_CFLAGS = @UNISCRIBE_CFLAGS@
 UNISCRIBE_LIBS = @UNISCRIBE_LIBS@
 VERSION = @VERSION@
+WASM_CFLAGS = @WASM_CFLAGS@
+WASM_LIBS = @WASM_LIBS@
+_GI_EXP_DATADIR = @_GI_EXP_DATADIR@
+_GI_EXP_LIBDIR = @_GI_EXP_LIBDIR@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -392,6 +392,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -402,12 +403,11 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 NULL = 
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src util test docs
+SUBDIRS = src util test perf docs
 EXTRA_DIST = \
        autogen.sh \
        harfbuzz.doap \
        README.md \
-       README.mingw.md \
        README.python.md \
        BUILD.md \
        CONFIG.md \
@@ -415,10 +415,15 @@ EXTRA_DIST = \
        TESTING.md \
        CMakeLists.txt \
        replace-enum-strings.cmake \
+       meson.build \
+       meson_options.txt \
+       subprojects/cairo.wrap \
+       subprojects/freetype2.wrap \
+       subprojects/glib.wrap \
+       subprojects/google-benchmark.wrap \
+       subprojects/ragel.wrap \
+       subprojects/packagefiles/ragel/meson.build \
        mingw-configure.sh \
-       mingw-ldd.py \
-       mingw32.sh \
-       mingw64.sh \
        $(NULL)
 
 MAINTAINERCLEANFILES = \
@@ -450,9 +455,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
 
 # TAR_OPTIONS is not set as env var for 'make dist'.  How to fix that?
 TAR_OPTIONS = --owner=0 --group=0
-tar_file = $(PACKAGE_TARNAME)-$(VERSION).tar.xz
-sha256_file = $(tar_file).sha256
-gpg_file = $(sha256_file).asc
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -967,26 +969,6 @@ dist-hook: dist-clear-sticky-bits
 # Clean up any sticky bits we may inherit from parent dir
 dist-clear-sticky-bits:
        chmod -R a-s $(distdir)
-$(sha256_file): $(tar_file)
-       sha256sum $^ > $@
-$(gpg_file): $(sha256_file)
-       @echo "Please enter your GPG password to sign the checksum."
-       gpg --armor --sign $^
-
-release-files: $(tar_file) $(sha256_file) $(gpg_file)
-
-dist-win:
-       @case $(host_triplet) in *-w64-mingw32) ;; *) echo "Error: Requires mingw build. See README.mingw.md.">&2; exit 1 ;; esac
-       @DIR=$(PACKAGE_TARNAME)-$(VERSION)-win`case $(host_triplet) in i686-*) echo 32 ;; x86_64-*) echo 64 ;; esac`; \
-       $(RM) -r $$DIR; $(MKDIR_P) $$DIR || exit 1; \
-       cp util/.libs/hb-{shape,view,subset}.exe $$DIR && \
-       $(top_srcdir)/mingw-ldd.py $$DIR/hb-view.exe | grep -v 'not found' | cut -d '>' -f 2 | xargs cp -t $$DIR && \
-       cp src/.libs/libharfbuzz{,-subset}-0.dll $$DIR && \
-       chmod a+x $$DIR/*.{exe,dll} && \
-       $(STRIP) $$DIR/*.{exe,dll} && \
-       zip -r $$DIR.zip $$DIR && \
-       $(RM) -r $$DIR && \
-       echo "$$DIR.zip is ready."
 
 -include $(top_srcdir)/git.mk