Fixed broken patch

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

diff --git a/Makefile.am b/Makefile.am
index 47aeb97..4a2a8c8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,8 +9,25 @@ SUBDIRS = src util test docs
 EXTRA_DIST = \
        autogen.sh \
        harfbuzz.doap \
-       Android.mk \
-       README.python \
+       README.md \
+       README.python.md \
+       BUILD.md \
+       CONFIG.md \
+       RELEASING.md \
+       TESTING.md \
+       CMakeLists.txt \
+       replace-enum-strings.cmake \
+       meson.build \
+       meson_options.txt \
+       subprojects/expat.wrap \
+       subprojects/fontconfig.wrap \
+       subprojects/freetype2.wrap \
+       subprojects/glib.wrap \
+       subprojects/libffi.wrap \
+       subprojects/proxy-libintl.wrap \
+       subprojects/zlib.wrap \
+       meson-cc-tests/intel-atomic-primitives-test.c \
+       meson-cc-tests/solaris-atomic-operations.c \
        $(NULL)
 
 MAINTAINERCLEANFILES = \
@@ -20,6 +37,7 @@ MAINTAINERCLEANFILES = \
        $(srcdir)/INSTALL \
        $(srcdir)/ChangeLog \
        $(srcdir)/gtk-doc.make \
+       $(srcdir)/m4/gtk-doc.m4 \
        $(NULL)
 
 
@@ -31,7 +49,7 @@ ChangeLog: $(srcdir)/ChangeLog
 $(srcdir)/ChangeLog:
        $(AM_V_GEN) if test -d "$(top_srcdir)/.git"; then \
          (GIT_DIR=$(top_srcdir)/.git \
-          $(GIT) log $(CHANGELOG_RANGE) --stat) | fmt --split-only > $@.tmp \
+          $(GIT) log $(CHANGELOG_RANGE) --stat) > $@.tmp \
          && mv -f $@.tmp "$(srcdir)/ChangeLog" \
          || ($(RM) $@.tmp; \
              echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
@@ -55,8 +73,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --enable-introspection \
        $(NULL)
 
-# TODO: Copy infrastructure from cairo
-
 # TAR_OPTIONS is not set as env var for 'make dist'.  How to fix that?
 TAR_OPTIONS = --owner=0 --group=0
 
@@ -65,8 +81,7 @@ dist-hook: dist-clear-sticky-bits
 dist-clear-sticky-bits:
        chmod -R a-s $(distdir)
 
-
-tar_file = $(PACKAGE_TARNAME)-$(VERSION).tar.bz2
+tar_file = $(PACKAGE_TARNAME)-$(VERSION).tar.xz
 sha256_file = $(tar_file).sha256
 gpg_file = $(sha256_file).asc
 $(sha256_file): $(tar_file)
@@ -77,5 +92,4 @@ $(gpg_file): $(sha256_file)
 
 release-files: $(tar_file) $(sha256_file) $(gpg_file)
 
-
 -include $(top_srcdir)/git.mk