Drop autotools

We will just use meson from now on.

19 files changed, 0 insertions, 2573 deletions

diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 16d8c8d3..00000000
--- a/Makefile.am
+++ /dev/null
@@ -1,86 +0,0 @@
-## Process this file with automake to create Makefile.in.
-
-SUBDIRS= pango utils examples docs tools tests win32
-
-meson_dist_files = \
-	pango/pango-features.h.meson \
-	utils/meson.build \
-	meson.build \
-	meson_options.txt \
-	pango/meson.build \
-	docs/meson.build \
-	docs/xml/meson.build \
-	docs/xml/gtkdocentities.ent.in \
-	examples/meson.build \
-	tools/meson.build \
-	tests/meson.build \
-	tests/gen-all-unicode.py \
-	tests/gen-installed-test.py \
-	$()
-
-EXTRA_DIST = 			\
-	autogen.sh		\
-	pango.pc.in		\
-	pangocairo.pc.in	\
-	pangoxft.pc.in		\
-	pangoft2.pc.in		\
-	pangowin32.pc.in	\
-	MAINTAINERS		\
-	HACKING			\
-	README.win32		\
-	config.h.win32		\
-	pango.doap		\
-	$(meson_dist_files)
-
-MAINTAINERCLEANFILES = \
-	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
-	$(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
-	$(srcdir)/INSTALL \
-	$(srcdir)/omf.make \
-	$(srcdir)/xmldocs.make \
-	$(srcdir)/gtk-doc.make \
-	$(srcdir)/ChangeLog
-
-### ChangeLog generation
-
-CHANGELOG_START = "`git describe --abbrev=0 | sed -e 's|\([0-9]*\)\.\([0-9]*\)\.[0-9]*|\1.\2.0^^|'`"
-
-ChangeLog: $(srcdir)/ChangeLog
-$(srcdir)/ChangeLog:
-	$(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
-	  (GIT_DIR=$(top_srcdir)/.git ./missing --run \
-	   git log $(CHANGELOG_START).. --stat) | fmt --split-only > $@.tmp \
-	  && mv -f $@.tmp $@ \
-	  || ($(RM) $@.tmp; \
-	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
-	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
-	else \
-	  test -f $@ || \
-	  (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
-	  echo A git checkout and git-log is required to generate this file >> $@); \
-	fi
-.PHONY: $(srcdir)/ChangeLog
-
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = pango.pc
-
-if HAVE_CAIRO
-pkgconfig_DATA += pangocairo.pc
-endif
-
-if HAVE_XFT
-pkgconfig_DATA += pangoxft.pc
-endif
-
-if HAVE_FREETYPE
-pkgconfig_DATA += pangoft2.pc
-endif
-
-if HAVE_WIN32
-pkgconfig_DATA += pangowin32.pc
-endif
-
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-doc-cross-references --enable-introspection
-
--include $(top_srcdir)/git.mk
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 02501fa5..00000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,55 +0,0 @@
-
-# Checks the location of the XML Catalog
-# Usage:
-#   JH_PATH_XML_CATALOG([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# Defines XMLCATALOG and XML_CATALOG_FILE substitutions
-AC_DEFUN([JH_PATH_XML_CATALOG],
-[
-  # check for the presence of the XML catalog
-  AC_ARG_WITH([xml-catalog],
-              AC_HELP_STRING([--with-xml-catalog=CATALOG],
-                             [path to xml catalog to use]),,
-              [with_xml_catalog=/etc/xml/catalog])
-  jh_found_xmlcatalog=true
-  XML_CATALOG_FILE="$with_xml_catalog"
-  AC_SUBST([XML_CATALOG_FILE])
-  AC_MSG_CHECKING([for XML catalog ($XML_CATALOG_FILE)])
-  if test -f "$XML_CATALOG_FILE"; then
-    AC_MSG_RESULT([found])
-  else
-    jh_found_xmlcatalog=false
-    AC_MSG_RESULT([not found])
-  fi
-
-  # check for the xmlcatalog program
-  AC_PATH_PROG(XMLCATALOG, xmlcatalog, no)
-  if test "x$XMLCATALOG" = xno; then
-    jh_found_xmlcatalog=false
-  fi
-
-  if $jh_found_xmlcatalog; then
-    ifelse([$1],,[:],[$1])
-  else
-    ifelse([$2],,[AC_MSG_ERROR([could not find XML catalog])],[$2])
-  fi
-])
-
-# Checks if a particular URI appears in the XML catalog
-# Usage:
-#   JH_CHECK_XML_CATALOG(URI, [FRIENDLY-NAME], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-AC_DEFUN([JH_CHECK_XML_CATALOG],
-[
-  AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
-  AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
-  if $jh_found_xmlcatalog && \
-     AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
-    AC_MSG_RESULT([found])
-    ifelse([$3],,,[$3
-])dnl
-  else
-    AC_MSG_RESULT([not found])
-    ifelse([$4],,
-       [AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],
-       [$4])
-  fi
-])
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index bc7c59c9..00000000
--- a/autogen.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-test -n "$srcdir" || srcdir=`dirname "$0"`
-test -n "$srcdir" || srcdir=.
-
-olddir=`pwd`
-cd "$srcdir"
-
-GTKDOCIZE=`which gtkdocize`
-if test -z $GTKDOCIZE; then
-	echo "*** No GTK-Doc found, please install it ***"
-	exit 1
-else
-	gtkdocize || exit $?
-fi
-
-AUTORECONF=`which autoreconf`
-if test -z $AUTORECONF; then
-	echo "*** No autoreconf found, please install it ***"
-	exit 1
-else
-	ACLOCAL="aclocal $ACLOCAL_FLAGS" autoreconf --force --install || exit $?
-fi
-
-
-cd "$olddir"
-test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
diff --git a/config.h.win32.in b/config.h.win32.in
deleted file mode 100644
index 4f05e112..00000000
--- a/config.h.win32.in
+++ /dev/null
@@ -1,153 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
-/* Actually, this version of config.h is manually edited from the above */
-
-/* Have usable Cairo library and font backend */
-#define HAVE_CAIRO 1
-
-/* Whether Cairo can use FreeType for fonts */
-/* HAVE_CAIRO_FREETYPE */
-
-/* Whether Cairo has PDF support */
-#define HAVE_CAIRO_PDF 1
-
-/* Whether Cairo has PNG support */
-#define HAVE_CAIRO_PNG 1
-
-/* Whether Cairo has PS support */
-#define HAVE_CAIRO_PS 1
-
-/* Whether Cairo can use Quartz for fonts */
-/* #undef HAVE_CAIRO_QUARTZ */
-
-/* Whether Cairo can use the Win32 GDI for fonts */
-#define HAVE_CAIRO_WIN32 1
-
-/* Whether Cairo has Xlib support */
-/* #undef HAVE_CAIRO_XLIB */
-
-/* Whether CoreText is available on the system */
-/* #undef HAVE_CORE_TEXT */
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_DIRENT_H */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if you have the `flockfile' function. */
-/* #undef HAVE_FLOCKFILE */
-
-/* Have FreeType 2 library */
-#ifndef PANGO_VISUALC_NO_FC
-#define HAVE_FREETYPE 1
-#endif
-
-/* Define to 1 if you have the `getpagesize' function. */
-/* #undef HAVE_GETPAGESIZE */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-/*#undef HAVE_INTTYPES_H */
-
-/* Define to 1 if you have the <memory.h> header file. */
-/* #undef HAVE_MEMORY_H */
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_NDIR_H */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#if (!defined (_MSC_VER) || (_MSC_VER >= 1600))
-#define HAVE_STDINT_H 1
-#endif
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-/* #undef HAVE_STRINGS_H */
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strtok_r' function. */
-/* #undef HAVE_STRTOK_R */
-
-/* Define to 1 if you have the `sysconf' function. */
-/* #undef HAVE_SYSCONF */
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-/* #undef HAVE_SYS_MMAN_H */
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-/* #undef HAVE_UNISTD_H */
-
-/* Have Xft library */
-/* #undef HAVE_XFT */
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "pango"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=pango"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "pango"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "pango @PANGO_VERSION@"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "pango"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "@PANGO_VERSION@"
-
-/* PANGO binary age */
-#define PANGO_BINARY_AGE @PANGO_BINARY_AGE@
-
-/* PANGO interface age */
-#define PANGO_INTERFACE_AGE @PANGO_INTERFACE_AGE@
-
-/* PANGO major version */
-#define PANGO_VERSION_MAJOR @PANGO_VERSION_MAJOR@
-
-/* PANGO micro version */
-#define PANGO_VERSION_MICRO @PANGO_VERSION_MICRO@
-
-/* PANGO minor version */
-#define PANGO_VERSION_MINOR @PANGO_VERSION_MINOR@
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "@PANGO_VERSION@"
-
-/* defines how to decorate public symbols while building */
-#ifdef _MSC_VER
-#define _PANGO_EXTERN __declspec(dllexport) extern
-#else
-#define _PANGO_EXTERN __attribute__((visibility("default"))) __declspec(dllexport) extern
-#endif
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index cdbe74dd..00000000
--- a/configure.ac
+++ /dev/null
@@ -1,704 +0,0 @@
-dnl Process this file with autoconf to create configure.
-AC_PREREQ(2.56)
-
-dnl ==========================================================================
-dnl                               Versioning
-dnl ==========================================================================
-
-dnl Making releases:
-dnl   PANGO_VERSION_MICRO += 1;
-dnl   PANGO_INTERFACE_AGE += 1;
-dnl   PANGO_BINARY_AGE += 1;
-dnl if any functions have been added, set PANGO_INTERFACE_AGE to 0.
-dnl if backwards compatibility has been broken,
-dnl set PANGO_BINARY_AGE _and_ PANGO_INTERFACE_AGE to 0.
-
-dnl
-dnl We do the version number components as m4 macros
-dnl so that we can base configure --help output off
-dnl of them.
-dnl
-
-dnl The triplet
-m4_define([pango_version_major], [1])
-m4_define([pango_version_minor], [42])
-m4_define([pango_version_micro], [2])
-
-m4_define([pango_version],
-          [pango_version_major.pango_version_minor.pango_version_micro])
-dnl The X.Y in -lpango-X.Y line. This is expected to stay 1.0 until Pango 2.
-m4_define([pango_api_version], [1.0])
-m4_if(m4_eval(pango_version_minor % 2), [1],
-      [
-	dnl for unstable releases
-	m4_define([pango_interface_age], [0])
-      ],
-      [
-	dnl for stable releases
-	m4_define([pango_interface_age], pango_version_micro)
-      ])
-dnl Number of releases since we've broken binary compatibility.
-m4_define([pango_binary_age],
-          [m4_eval(100 * pango_version_minor + pango_version_micro)])
-
-
-AC_INIT(pango, pango_version(),
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=pango])
-
-AC_CONFIG_SRCDIR([pango.pc.in])
-
-dnl -Wno-portability tells automake to stop complaining about the
-dnl usage of GNU Make specific features.
-AM_INIT_AUTOMAKE(1.9 gnits dist-xz no-dist-gzip -Wno-portability)
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-AC_CONFIG_HEADERS([config.h])
-
-
-PANGO_VERSION_MAJOR=pango_version_major()
-PANGO_VERSION_MINOR=pango_version_minor()
-PANGO_VERSION_MICRO=pango_version_micro()
-PANGO_VERSION=pango_version()
-PANGO_API_VERSION=pango_api_version()
-PANGO_INTERFACE_AGE=pango_interface_age()
-PANGO_BINARY_AGE=pango_binary_age()
-
-AC_SUBST(PANGO_VERSION_MAJOR)
-AC_SUBST(PANGO_VERSION_MINOR)
-AC_SUBST(PANGO_VERSION_MICRO)
-AC_SUBST(PANGO_VERSION)
-AC_SUBST(PANGO_API_VERSION)
-AC_SUBST(PANGO_INTERFACE_AGE)
-AC_SUBST(PANGO_BINARY_AGE)
-
-AC_DEFINE(PANGO_BINARY_AGE, pango_binary_age(), [PANGO binary age])
-AC_DEFINE(PANGO_INTERFACE_AGE, pango_interface_age(), [PANGO interface age])
-AC_DEFINE(PANGO_VERSION_MAJOR, pango_version_major(), [PANGO major version])
-AC_DEFINE(PANGO_VERSION_MINOR, pango_version_minor(), [PANGO minor version])
-AC_DEFINE(PANGO_VERSION_MICRO, pango_version_micro(), [PANGO micro version])
-
-dnl libtool versioning
-m4_define([lt_current], [m4_eval(100 * pango_version_minor + pango_version_micro - pango_interface_age)])
-m4_define([lt_revision], [pango_interface_age])
-m4_define([lt_age], [m4_eval(pango_binary_age - pango_interface_age)])
-VERSION_INFO="lt_current():lt_revision():lt_age()"
-PANGO_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age)
-
-AC_SUBST(PANGO_CURRENT_MINUS_AGE)
-
-dnl ==========================================================================
-
-AC_CANONICAL_HOST
-
-AC_MSG_CHECKING([for native Win32])
-case "$host" in
-  *-*-mingw*)
-    pango_os_win32=yes
-    case "$host" in
-      x86_64-*-*)
-	LIB_EXE_MACHINE_FLAG=X64
-	;;
-      *)
-	LIB_EXE_MACHINE_FLAG=X86
-	;;
-    esac
-    ;;
-  *)
-    pango_os_win32=no
-    ;;
-esac
-AC_MSG_RESULT([$pango_os_win32])
-
-AC_SUBST(LIB_EXE_MACHINE_FLAG)
-
-AM_CONDITIONAL(OS_WIN32, test "$pango_os_win32" = "yes")
-
-AC_PROG_CC
-
-dnl
-dnl Check for a working C++ compiler, but do not bail out, if none is found.
-dnl We use this for an automated test for C++ header correctness.
-dnl
-AC_CHECK_TOOLS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc)
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=)
-AM_CONDITIONAL(HAVE_CXX, test "$CXX" != "")
-AC_LANG_RESTORE
-
-
-
-
-AC_CHECK_FUNCS(sysconf getpagesize)
-AC_CHECK_HEADERS(unistd.h sys/mman.h)
-
-
-#
-# Win32 stuff
-#
-
-AC_LIBTOOL_WIN32_DLL
-AM_DISABLE_STATIC
-
-AM_PROG_LIBTOOL
-dnl when using libtool 2.x create libtool early, because it's used in configure
-m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
-
-AC_MSG_CHECKING([for some Win32 platform])
-case "$host" in
-  *-*-mingw*|*-*-cygwin*)
-    pango_platform_win32=yes
-    ;;
-  *)
-    pango_platform_win32=no
-    ;;
-esac
-AC_MSG_RESULT([$pango_platform_win32])
-AM_CONDITIONAL(PLATFORM_WIN32, test "$pango_platform_win32" = "yes")
-
-if test "$pango_platform_win32" = "yes"; then
-  AC_CHECK_TOOL(WINDRES, windres, no)
-  if test "$WINDRES" = no; then
-    AC_MSG_ERROR([*** Could not find an implementation of windres in your PATH.])
-  fi
-  AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
-fi
-AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
-
-changequote(,)dnl
-if test "x$GCC" = "xyes"; then
-  case " $CFLAGS " in
-  *[\ \	]-Wall[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wall" ;;
-  esac
-fi
-changequote([,])dnl
-
-dnl declare --enable-* args and collect ac_help strings
-
-m4_define([debug_default],
-          m4_if(m4_eval(pango_version_minor() % 2), [1], [yes], [minimum]))
-
-AC_ARG_ENABLE(debug,
-              AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
-                             [turn on debugging @<:@default=debug_default()@:>@]),
-	      ,
-              enable_debug=debug_default())
-
-if test "x$enable_debug" = "xyes"; then
-  PANGO_DEBUG_FLAGS="-DPANGO_ENABLE_DEBUG"
-else
-  PANGO_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS"
-
-  if test "x$enable_debug" = "xno"; then
-    PANGO_DEBUG_FLAGS="$GLIB_DEBUG_FLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS $PANGO_DEBUG_FLAGS"
-  fi
-fi
-
-AC_SUBST(PANGO_DEBUG_FLAGS)
-
-AC_ARG_ENABLE(rebuilds,
-              [AC_HELP_STRING([--disable-rebuilds],
-                              [disable all source autogeneration rules])],,
-              [enable_rebuilds=yes])
-
-AM_CONDITIONAL(CROSS_COMPILING, [test $cross_compiling = yes])
-
-
-#
-# Checks for HarfBuzz
-#
-have_harfbuzz=false
-PKG_CHECK_MODULES(HARFBUZZ, harfbuzz >= 1.4.2, have_harfbuzz=true, :)
-AM_CONDITIONAL(HAVE_HARFBUZZ, $have_harfbuzz)
-
-#
-# Check for fontconfig
-#
-have_fontconfig=false
-if $have_harfbuzz ; then
-  PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.11.91, have_fontconfig=true, :)
-fi
-if $have_fontconfig ; then
-  pango_save_libs=$LIBS
-  LIBS="$LIBS $FONTCONFIG_LIBS"
-  AC_CHECK_FUNCS(FcWeightFromOpenTypeDouble)
-  LIBS=$pango_save_libs
-fi
-
-#
-# Checks for FreeType
-#
-have_freetype=false
-if $have_fontconfig ; then
-  # The first version of freetype with a .pc file is 2.1.5.  That's recent
-  # enough for all the functions we use I guess.  No version check needed.
-  PKG_CHECK_MODULES(FREETYPE, freetype2, have_freetype=true, :)
-fi
-if $have_freetype ; then
-  AC_DEFINE(HAVE_FREETYPE, 1, [Have FreeType 2 library])
-fi
-AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype)
-
-#
-# Checks for Xft/XRender
-#
-have_xft=false
-AC_ARG_WITH(xft,
-  AS_HELP_STRING([--with-xft], [build xft backend]),
-  [], [with_xft=yes])
-if $have_freetype ; then
-  PKG_CHECK_MODULES(XFT, xft >= 2.0.0 xrender, have_xft=true, :)
-fi
-if test "x$with_xft" = xyes && $have_xft ; then
-  AC_DEFINE(HAVE_XFT, 1, [Have Xft library])
-fi
-AM_CONDITIONAL(HAVE_XFT, test "x$with_xft" = xyes && $have_xft )
-
-#
-# Checks for Win32
-#
-have_win32=false
-# The following doesn't work with autoconf-2.13, so we check $host instead
-# AC_CHECK_LIB(gdi32, GetTextMetricsA@8, have_win32=true, : )
-case "$host" in
-  *-*-mingw*|*-*-cygwin*) have_win32=true ;;
-esac
-AM_CONDITIONAL(HAVE_WIN32, $have_win32)
-
-# Ensure MSVC-compatible struct packing convention is used when
-# compiling for Win32 with gcc.
-# What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while
-# gcc2 uses "-fnative-struct".
-if test "$pango_os_win32" = "yes"; then
-  if test x"$GCC" = xyes; then
-    msnative_struct=''
-    AC_MSG_CHECKING([how to get MSVC-compatible struct packing])
-    if test -z "$ac_cv_prog_CC"; then
-      our_gcc="$CC"
-    else
-      our_gcc="$ac_cv_prog_CC"
-    fi
-    case `$our_gcc --version | sed -e 's,\..*,.,' -e q` in
-      2.)
-	if $our_gcc -v --help 2>/dev/null | grep fnative-struct >/dev/null; then
-	  msnative_struct='-fnative-struct'
-	fi
-	;;
-      *)
-	if $our_gcc -v --help 2>/dev/null | grep ms-bitfields >/dev/null; then
-	  msnative_struct='-mms-bitfields'
-	fi
-	;;
-    esac
-    if test x"$msnative_struct" = x ; then
-      AC_MSG_RESULT([no way])
-      AC_MSG_WARN([produced libraries might be incompatible with MSVC-compiled code])
-    else
-      CFLAGS="$CFLAGS $msnative_struct"
-      AC_MSG_RESULT([${msnative_struct}])
-    fi
-  fi
-fi
-
-#
-# Checks for CoreText
-#
-
-AC_MSG_CHECKING([for CoreText availability])
-pango_save_libs=$LIBS
-LIBS="$LIBS -framework ApplicationServices"
-AC_TRY_LINK([#include <Carbon/Carbon.h>], [CTGetCoreTextVersion ();],
-[have_core_text=yes], [have_core_text=no])
-LIBS=$pango_save_libs
-
-if test "$have_core_text" = "yes"; then
-  AC_DEFINE(HAVE_CORE_TEXT, 1, [Whether CoreText is available on the system])
-fi
-
-AC_MSG_RESULT([$have_core_text])
-
-AM_CONDITIONAL(HAVE_CORE_TEXT, test "$have_core_text" = "yes")
-
-#
-# Checks for Cairo
-#
-have_cairo=false
-have_cairo_png=false
-have_cairo_ps=false
-have_cairo_pdf=false
-have_cairo_xlib=false
-have_cairo_freetype=false
-have_cairo_win32=false
-have_cairo_quartz=false
-cairo_required=1.12.10
-
-AC_ARG_WITH(cairo,
-	    AS_HELP_STRING([--without-cairo], [Do not use cairo]),
-	    :, with_cairo=auto)
-AS_IF([test x$with_cairo != xno], [
-  PKG_CHECK_MODULES(CAIRO, cairo >= $cairo_required, have_cairo=true, :)
-])
-
-if $have_cairo ; then
-  pango_save_libs=$LIBS
-  LIBS="$LIBS $CAIRO_LIBS"
-  pango_save_ldflags=$LDFLAGS
-  LDFLAGS="$LDFLAGS $CAIRO_LIBS"
-
-  have_cairo=false
-  cairo_font_backends=""
-
-  if $have_freetype; then
-    PKG_CHECK_EXISTS(cairo-ft >= $cairo_required, have_cairo_freetype=true, :)
-  fi
-  if $have_cairo_freetype; then
-    AC_DEFINE(HAVE_CAIRO_FREETYPE, 1, [Whether Cairo can use FreeType for fonts])
-    cairo_font_backends="freetype $cairo_font_backends"
-    have_cairo=true
-  fi
-
-  if $have_win32; then
-    PKG_CHECK_EXISTS(cairo-win32 >= $cairo_required, have_cairo_win32=true, :)
-  fi
-  if $have_cairo_win32; then
-    AC_DEFINE(HAVE_CAIRO_WIN32, 1, [Whether Cairo can use the Win32 GDI for fonts])
-    cairo_font_backends="win32 $cairo_font_backends"
-    have_cairo=true
-  fi
-
-  if test $have_core_text; then
-    PKG_CHECK_EXISTS(cairo-quartz-font >= $cairo_required, have_cairo_quartz=true, :)
-  fi
-  if $have_cairo_quartz; then
-    AC_DEFINE(HAVE_CAIRO_QUARTZ, 1, [Whether Cairo can use Quartz for fonts])
-    cairo_font_backends="quartz $cairo_font_backends"
-    have_cairo=true
-  fi
-
-  AC_MSG_CHECKING([which cairo font backends could be used])
-  if $have_cairo ; then
-    AC_MSG_RESULT([$cairo_font_backends])
-  else
-    if test x${with_cairo} != xauto; then
-      AC_MSG_ERROR([cairo support requested, but not present])
-    fi
-    AC_MSG_RESULT([none])
-    AC_MSG_NOTICE([Disabling cairo support])
-  fi
-
-  if $have_cairo ; then
-    AC_DEFINE(HAVE_CAIRO, 1, [Have usable Cairo library and font backend])
-
-    PKG_CHECK_EXISTS(cairo-png >= $cairo_required, have_cairo_png=true, :)
-    if $have_cairo_png; then
-      AC_DEFINE(HAVE_CAIRO_PNG, 1, [Whether Cairo has PNG support])
-    fi
-  
-    PKG_CHECK_EXISTS(cairo-ps >= $cairo_required, have_cairo_ps=true, :)
-    if $have_cairo_ps; then
-      AC_DEFINE(HAVE_CAIRO_PS, 1, [Whether Cairo has PS support])
-    fi
-  
-    PKG_CHECK_EXISTS(cairo-pdf >= $cairo_required, have_cairo_pdf=true, :)
-    if $have_cairo_pdf; then
-      AC_DEFINE(HAVE_CAIRO_PDF, 1, [Whether Cairo has PDF support])
-    fi
-  
-    PKG_CHECK_EXISTS(cairo-xlib >= $cairo_required, have_cairo_xlib=true, :)
-    if $have_cairo_xlib; then
-      AC_DEFINE(HAVE_CAIRO_XLIB, 1, [Whether Cairo has Xlib support])
-    fi
-  fi
-
-  LIBS=$pango_save_libs
-  LDFLAGS=$pango_save_ldflags
-
-  PKGCONFIG_CAIRO_REQUIRES=
-  if $have_cairo_freetype;  then
-    PKGCONFIG_CAIRO_REQUIRES="$PKGCONFIG_CAIRO_REQUIRES pangoft2"
-  fi
-  if $have_cairo_win32;  then
-    PKGCONFIG_CAIRO_REQUIRES="$PKGCONFIG_CAIRO_REQUIRES pangowin32"
-  fi
-  AC_SUBST(PKGCONFIG_CAIRO_REQUIRES)
-fi
-
-# To compensate for Meson builds on MSVC where pkg-config files may well not be
-# available for cairo, harfbuzz, freetype2 and fontconfig
-CAIRO_PC="cairo"
-FREETYPE2_PC="freetype2"
-FONTCONFIG_PC="fontconfig"
-HARFBUZZ_PC="harfbuzz"
-AC_SUBST(CAIRO_PC)
-AC_SUBST(FREETYPE2_PC)
-AC_SUBST(FONTCONFIG_PC)
-AC_SUBST(HARFBUZZ_PC)
-CAIRO_LIB=
-FREETYPE2_LIB=
-FONTCONFIG_LIB=
-HARFBUZZ_LIB=
-AC_SUBST(CAIRO_LIB)
-AC_SUBST(FREETYPE2_LIB)
-AC_SUBST(FONTCONFIG_LIB)
-AC_SUBST(HARFBUZZ_LIB)
-
-AM_CONDITIONAL(HAVE_CAIRO, $have_cairo)
-AM_CONDITIONAL(HAVE_CAIRO_PNG, $have_cairo_png)
-AM_CONDITIONAL(HAVE_CAIRO_PS, $have_cairo_ps)
-AM_CONDITIONAL(HAVE_CAIRO_PDF, $have_cairo_pdf)
-AM_CONDITIONAL(HAVE_CAIRO_XLIB, $have_cairo_xlib)
-AM_CONDITIONAL(HAVE_CAIRO_WIN32, $have_cairo_win32)
-AM_CONDITIONAL(HAVE_CAIRO_FREETYPE, $have_cairo_freetype)
-AM_CONDITIONAL(HAVE_CAIRO_QUARTZ, $have_cairo_quartz)
-
-
-#
-# We must have some backend defined
-#
-if $have_freetype || `test "x$with_xft" = xyes && $have_xft` || $have_cairo || $have_win32 ; then : ; else
-  AC_MSG_ERROR([*** Could not enable any backends.
-*** Must have at least one backend to build Pango.])
-fi
-
-#
-# Checks for GLib
-#
-GLIB_REQUIRED_VERSION=2.33.12
-GLIB_MODULES="glib-2.0 >= $GLIB_REQUIRED_VERSION gobject-2.0 gthread-2.0"
-
-PKG_CHECK_MODULES(GLIB, $GLIB_MODULES, :,
-  AC_MSG_ERROR([
-*** Glib $GLIB_REQUIRED_VERSION or better is required. The latest version of 
-*** Glib is always available from ftp://ftp.gtk.org/.]))
-
-# Setup GLIB_MKENUMS to use glib-mkenums even if GLib is uninstalled.
-GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-AC_SUBST(GLIB_MKENUMS)
-
-# Checks for FriBiDi
-FRIBIDI_REQUIRED_VERSION=0.19.7
-PKG_CHECK_MODULES(FRIBIDI, fribidi >= $FRIBIDI_REQUIRED_VERSION)
-
-#
-# Checks for LibThai
-#
-LIBTHAI_REQUIRED_VERSION=0.1.9
-have_libthai=false
-PKG_CHECK_MODULES(LIBTHAI, libthai >= $LIBTHAI_REQUIRED_VERSION, have_libthai=true, :)
-if $have_libthai; then
-	AC_DEFINE(HAVE_LIBTHAI, 1, [Whether libthai is available])
-	pango_save_libs=$LIBS
-	LIBS="$LIBS $LIBTHAI_LIBS"
-	AC_CHECK_FUNCS(th_brk_find_breaks)
-	LIBS=$pango_save_libs
-fi
-
-#
-# Checks for GObject Introspection
-#
-
-GOBJECT_INTROSPECTION_CHECK([0.9.5])
-
-
-#
-# We use flockfile to implement pango_getline() - should be moved to GLib
-# strtok_r isn't present on some systems
-#
-AC_CHECK_FUNCS(flockfile strtok_r)
-
-dnl **************************
-dnl *** Checks for gtk-doc ***
-dnl **************************
-
-if $have_cairo ; then : ; else
-   if  test x$enable_gtk_doc = xyes ; then
-      AC_MSG_WARN([Cairo not present, disabling doc building])      
-      enable_gtk_doc=no
-   fi
-fi
-
-GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
-
-AC_ARG_ENABLE(doc-cross-references,
-              AC_HELP_STRING([--disable-doc-cross-references],
-                             [cross reference glib and cairo symbols @<:@default=yes@:>@]),
-	      enable_doc_cross_references=$enableval,
-	      enable_doc_cross_references=yes)
-
-if test "x$enable_doc_cross_references" != xno ; then
-	GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
-	CAIRO_PREFIX="`$PKG_CONFIG --variable=prefix cairo`"
-	AC_SUBST(GLIB_PREFIX)
-	AC_SUBST(CAIRO_PREFIX)
-fi
-AM_CONDITIONAL(ENABLE_DOC_CROSS_REFERENCES, test x$enable_doc_cross_references != xno)
-
-dnl ********************************************************
-dnl * Options to pass to libtool
-dnl ********************************************************
-
-# Note that -module isn't included here since automake needs to see it to know
-# that something like pango-basic-fc.la is a valid libtool archive
-#
-LIBRARY_LIBTOOL_OPTIONS="-version-info $VERSION_INFO"
-if test "$pango_platform_win32" = yes; then
-    # We currently use .def files on Windows
-    LIBRARY_LIBTOOL_OPTIONS="$LIBRARY_LIBTOOL_OPTIONS -no-undefined"
-else
-    # libtool option to control which symbols are exported
-    # right now, symbols starting with '_' are not exported
-    LIBRARY_LIBTOOL_OPTIONS="$LIBRARY_LIBTOOL_OPTIONS "'-export-symbols-regex "^pango_.*"'
-fi
-AC_SUBST(LIBRARY_LIBTOOL_OPTIONS)
-
-dnl
-dnl Check for -Bsymbolic-functions linker flag used to avoid
-dnl intra-library PLT jumps, if available.
-dnl
-AC_ARG_ENABLE(Bsymbolic,
-              [AS_HELP_STRING([--disable-Bsymbolic],
-                              [avoid linking with -Bsymbolic])],,
-              [SAVED_LDFLAGS="${LDFLAGS}"
-               AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
-               LDFLAGS=-Wl,-Bsymbolic-functions
-               AC_TRY_LINK([], [int main (void) { return 0; }],
-                           AC_MSG_RESULT(yes)
-                           enable_Bsymbolic=yes,
-                           AC_MSG_RESULT(no)
-                           enable_Bsymbolic=no)
-               LDFLAGS="${SAVED_LDFLAGS}"])
-
-if test "x${enable_Bsymbolic}" = "xyes"; then
-  LIBRARY_LIBTOOL_OPTIONS="$LIBRARY_LIBTOOL_OPTIONS -Wl,-Bsymbolic-functions"
-fi
-
-dnl ********************************************************
-dnl * Installed test                                       *
-dnl ********************************************************
-
-AC_ARG_ENABLE(installed_tests,
-              AS_HELP_STRING([--enable-installed-tests],
-                             [Install test programs (default: no)]),,
-              [enable_installed_tests=no])
-AM_CONDITIONAL(BUILDOPT_INSTALL_TESTS, test x$enable_installed_tests = xyes)
-
-
-dnl *********************************************************************
-dnl * Check for -fvisibility=hidden to determine if we can do GNU-style *
-dnl * visibility attributes for symbol export control                   *
-dnl *********************************************************************
-
-PANGO_HIDDEN_VISIBILITY_CFLAGS=""
-case "$host" in
-  *-*-mingw*)
-    dnl on mingw32 we do -fvisibility=hidden and __declspec(dllexport)
-    AC_DEFINE([_PANGO_EXTERN], [__attribute__((visibility("default"))) __declspec(dllexport) extern],
-              [defines how to decorate public symbols while building])
-    CFLAGS="${CFLAGS} -fvisibility=hidden"
-    ;;
-  *)
-    dnl on other compilers, check if we can do -fvisibility=hidden
-    SAVED_CFLAGS="${CFLAGS}"
-    CFLAGS="-fvisibility=hidden"
-    AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
-    AC_TRY_COMPILE([], [return 0],
-                   AC_MSG_RESULT(yes)
-                   enable_fvisibility_hidden=yes,
-                   AC_MSG_RESULT(no)
-                   enable_fvisibility_hidden=no)
-    CFLAGS="${SAVED_CFLAGS}"
-
-    AS_IF([test "${enable_fvisibility_hidden}" = "yes"], [
-      AC_DEFINE([_PANGO_EXTERN], [__attribute__((visibility("default"))) extern],
-                [defines how to decorate public symbols while building])
-      PANGO_HIDDEN_VISIBILITY_CFLAGS="-fvisibility=hidden"
-    ])
-    ;;
-esac
-AC_SUBST(PANGO_HIDDEN_VISIBILITY_CFLAGS)
-
-
-AC_HEADER_DIRENT
-AC_CHECK_HEADERS(unistd.h)
-
-# Check whether MSVC toolset is explicitly set
-AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x])
-AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x])
-
-# Honor aclocal flags
-ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-dnl ===========================================================================
-AC_CONFIG_COMMANDS([pango/pango-features.h],
-          [featuresfile=pango/pango-features.h
-           outfile=$featuresfile.tmp
-           AC_MSG_NOTICE([creating $featuresfile])
-           cat >$outfile <<_EOF
-/* Generated by configure. Do not edit */
-#ifndef PANGO_FEATURES_H
-#define PANGO_FEATURES_H
-
-#define PANGO_VERSION_MAJOR $PANGO_VERSION_MAJOR
-#define PANGO_VERSION_MINOR $PANGO_VERSION_MINOR
-#define PANGO_VERSION_MICRO $PANGO_VERSION_MICRO
-
-#define PANGO_VERSION_STRING "$PANGO_VERSION_MAJOR.$PANGO_VERSION_MINOR.$PANGO_VERSION_MICRO"
-
-_EOF
-	# TODO: define macros for enabled features/backends here
-
-        echo '' >>$outfile
-        echo '#endif' >>$outfile
-
-        if cmp -s $outfile $featuresfile; then
-          AC_MSG_NOTICE([$featuresfile is unchanged])
-          rm -f $outfile
-        else
-          mv $outfile $featuresfile
-        fi
-],[
-        PANGO_VERSION_MAJOR=$PANGO_VERSION_MAJOR
-        PANGO_VERSION_MINOR=$PANGO_VERSION_MINOR
-        PANGO_VERSION_MICRO=$PANGO_VERSION_MICRO
-])
-
-AC_CONFIG_FILES([
-Makefile
-pango/Makefile
-pango/pango.rc
-pango/pangoft2.rc
-pango/pangowin32.rc
-pango/pangocairo.rc
-pango/pangoxft.rc
-utils/Makefile
-examples/Makefile
-docs/Makefile
-docs/version.xml
-tools/Makefile
-tests/Makefile
-win32/Makefile
-win32/vs9/Makefile
-win32/vs9/pango-version-paths.vsprops
-win32/vs10/Makefile
-win32/vs10/pango-version-paths.props
-win32/vs11/Makefile
-win32/vs12/Makefile
-win32/vs14/Makefile
-win32/vs15/Makefile
-pango.pc
-pangowin32.pc
-pangoft2.pc
-pangoxft.pc
-pangocairo.pc
-config.h.win32
-])
-
-AC_OUTPUT
-
-backends=""
-if $have_cairo ; then backends="$backends Cairo"; fi
-if $have_win32 ; then backends="$backends Win32"; fi
-if test "x$with_xft" = xyes && $have_xft ; then backends="$backends Xft"; fi
-if $have_freetype && $have_fontconfig ; then backends="$backends FreeType"; fi
-
-echo "configuration:
-	backends:$backends"
diff --git a/docs/Makefile.am b/docs/Makefile.am
deleted file mode 100644
index 58263561..00000000
--- a/docs/Makefile.am
+++ /dev/null
@@ -1,143 +0,0 @@
-## Process this file with automake to create Makefile.in.
-
-# The name of the module.
-DOC_MODULE=pango
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=pango-docs.sgml
-
-# Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards="PANGO_DISABLE_DEPRECATED"
-
-# Extra options to supply to gtkdoc-mkdb.
-MKDB_OPTIONS=--sgml-mode --output-format=xml
-
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../pango
-
-# Used for dependencies
-HFILE_GLOB=$(top_srcdir)/pango/*.h
-CFILE_GLOB=$(top_srcdir)/pango/*.c
-
-# Headers to ignore
-IGNORE_HFILES=			\
-	pangoatsui-private.h	\
-	pangocairo-private.h	\
-	pangocairo-fc.h		\
-	pangocairo-win32.h	\
-	pangocairo-atsui.h	\
-	pango-color-table.h	\
-	pango-engine-private.h	\
-	pango-impl-utils.h	\
-	pango-glyph-item-private.h	\
-	pango-layout-private.h	\
-	pango-script-table.h	\
-	pango-script-private.h	\
-	pangofc-private.h	\
-	pangoft2-private.h	\
-	pangowin32-private.h	\
-	pangoatsui-private.h	\
-	pangox-private.h	\
-	pangoxft-private.h	\
-	pango-ot-private.h	\
-	pango-script-lang-table.h	\
-	pango-language-sample-table.h 	\
-	pangocoretext-private.h		\
-	pangoatsui-private.h
-
-# CFLAGS and LDFLAGS for compiling scan program. Only needed
-# if $(DOC_MODULE).types is non-empty.
-INCLUDES =               	\
-	-DPANGO_ENABLE_BACKEND	\
-	-DPANGO_ENABLE_ENGINE	\
-	-I$(top_srcdir)		\
-	-I$(top_builddir)	\
-	$(GLIB_CFLAGS)		\
-	$(XFT_CFLAGS)		\
-	$(CAIRO_CFLAGS)		\
-	$(FREETYPE_CFLAGS)	\
-	$(X_CFLAGS)
-
-# We're assuming here that we'll only regenerate the
-# HTML docs on Unix. We don't get introspection on Win32
-# specific types, but that isn't a big deal.
-
-GTKDOC_LIBS = $(top_builddir)/pango/libpango-1.0.la
-
-if HAVE_FREETYPE
-GTKDOC_LIBS += $(top_builddir)/pango/libpangoft2-1.0.la
-endif
-
-if HAVE_XFT
-GTKDOC_LIBS += $(top_builddir)/pango/libpangoxft-1.0.la
-endif
-
-if HAVE_CAIRO
-GTKDOC_LIBS += $(top_builddir)/pango/libpangocairo-1.0.la
-endif
-
-GTKDOC_LIBS += $(GLIB_LIBS)
-
-# Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
-content_files =				\
-	pango_markup.sgml		\
-	version.xml
-
-# Images to copy into HTML directory
-HTML_IMAGES =				\
-	layout.gif			\
-	rotated-text.png
-
-if ENABLE_DOC_CROSS_REFERENCES
-# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
-	--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
-endif
-
-include $(top_srcdir)/gtk-doc.make
-
-# This line really belongs in gtk-doc.mk
-$(REPORT_FILES): sgml-build.stamp
-
-pango.types:
-	@echo "Rebuilding $@"
-	@LANG=C; LIST=$$(grep 'pango_[_a-zA-Z0-9]*_get_type' $(HFILE_GLOB) | grep -v '\(private\|atsui\|core_text\|win32\)' | sed 's/\([^:]*:\).*\(pango[_a-zA-Z0-9]*_get_type\).*/\1\2/') && \
-	echo "$$LIST" | sed 's/.*\/\(pango\/.*\):.*/#include <\1>/' | sort -u > $@.tmp && \
-	echo >> $@.tmp && \
-	echo "$$LIST" | cut -d : -f 2 | sort -u >> $@.tmp && \
-	mv $@.tmp $@
-
-BUILT_SOURCES = pango.types
-
-########################################################################
-
-MAINTAINERCLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST +=				\
-	layout.fig			\
-	layout.eps			\
-	version.xml.in			\
-	check.docs			\
-	pango.types
-
-# force doc rebulid after configure
-dist-hook-local: dist-local-check-no-cross-references all-local
-
-#
-# Require gtk-doc when making dist
-#
-if ENABLE_DOC_CROSS_REFERENCES
-dist-local-check-no-cross-references:
-	@echo "*** --disable-doc-cross-references must be used in order to make dist"
-	@false
-else
-dist-local-check-no-cross-references:
-endif
-
-.PHONY: dist-local-check-no-cross-references
-
-if ENABLE_GTK_DOC
-TESTS = check.docs
-TESTS_ENVIRONMENT = srcdir="$(srcdir)" top_srcdir="$(top_srcdir)" MAKE="$(MAKE) $(AM_MAKEFLAGS)" DOC_MODULE="$(DOC_MODULE)" REPORT_FILES="$(REPORT_FILES)"
-endif
-
--include $(top_srcdir)/git.mk
diff --git a/examples/Makefile.am b/examples/Makefile.am
deleted file mode 100644
index 4cb54baf..00000000
--- a/examples/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-## Process this file with automake to create Makefile.in.
-
-EXTRA_DIST =			\
-	pangowin32tobmp.c
-
-INCLUDES =				\
-	-I$(top_srcdir)			\
-	$(PANGO_DEBUG_FLAGS)		\
-	$(GLIB_CFLAGS)			\
-	$(XFT_CFLAGS)			\
-	$(CAIRO_CFLAGS)			\
-	$(FREETYPE_CFLAGS)		\
-	$(X_CFLAGS)
-
-noinst_PROGRAMS =
-
-if HAVE_CAIRO_PNG
-noinst_PROGRAMS += cairosimple cairotwisted cairoshape
-
-cairosimple_LDADD =					\
-	-lm						\
-	../pango/libpango-$(PANGO_API_VERSION).la	\
-	../pango/libpangocairo-$(PANGO_API_VERSION).la	\
-	$(GLIB_LIBS)					\
-	$(CAIRO_LIBS)
-if HAVE_FREETYPE
-cairosimple_LDADD +=					\
-	../pango/libpangoft2-$(PANGO_API_VERSION).la
-endif
-cairotwisted_LDADD = $(cairosimple_LDADD)
-cairoshape_LDADD   = $(cairosimple_LDADD)
-endif
-
--include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
deleted file mode 100644
index 18c07f68..00000000
--- a/git.mk
+++ /dev/null
@@ -1,311 +0,0 @@
-# git.mk
-#
-# Copyright 2009, Red Hat, Inc.
-# Copyright 2010,2011,2012,2013 Behdad Esfahbod
-# Written by Behdad Esfahbod
-#
-# Copying and distribution of this file, with or without modification,
-# is permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-#
-# The latest version of this file can be downloaded from:
-#   https://raw.github.com/behdad/git.mk/master/git.mk
-# Bugs, etc, should be reported upstream at:
-#   https://github.com/behdad/git.mk
-#
-# To use in your project, import this file in your git repo's toplevel,
-# then do "make -f git.mk".  This modifies all Makefile.am files in
-# your project to -include git.mk.  Remember to add that line to new
-# Makefile.am files you create in your project, or just rerun the
-# "make -f git.mk".
-#
-# This enables automatic .gitignore generation.  If you need to ignore
-# more files, add them to the GITIGNOREFILES variable in your Makefile.am.
-# But think twice before doing that.  If a file has to be in .gitignore,
-# chances are very high that it's a generated file and should be in one
-# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES.
-#
-# The only case that you need to manually add a file to GITIGNOREFILES is
-# when remove files in one of mostlyclean-local, clean-local, distclean-local,
-# or maintainer-clean-local make targets.
-#
-# Note that for files like editor backup, etc, there are better places to
-# ignore them.  See "man gitignore".
-#
-# If "make maintainer-clean" removes the files but they are not recognized
-# by this script (that is, if "git status" shows untracked files still), send
-# me the output of "git status" as well as your Makefile.am and Makefile for
-# the directories involved and I'll diagnose.
-#
-# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
-# Makefile.am.sample in the git.mk git repo.
-#
-# Don't EXTRA_DIST this file.  It is supposed to only live in git clones,
-# not tarballs.  It serves no useful purpose in tarballs and clutters the
-# build dir.
-#
-# This file knows how to handle autoconf, automake, libtool, gtk-doc,
-# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu.
-#
-# This makefile provides the following targets:
-#
-# - all: "make all" will build all gitignore files.
-# - gitignore: makes all gitignore files in the current dir and subdirs.
-# - .gitignore: make gitignore file for the current dir.
-# - gitignore-recurse: makes all gitignore files in the subdirs.
-#
-# KNOWN ISSUES:
-#
-# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the
-#   submodule doesn't find us.  If you have configure.{in,ac} files in
-#   subdirs, add a proxy git.mk file in those dirs that simply does:
-#   "include $(top_srcdir)/../git.mk".  Add more ..'s to your taste.
-#   And add those files to git.  See vte/gnome-pty-helper/git.mk for
-#   example.
-#
-
-
-
-###############################################################################
-# Variables user modules may want to add to toplevel MAINTAINERCLEANFILES:
-###############################################################################
-
-#
-# Most autotools-using modules should be fine including this variable in their
-# toplevel MAINTAINERCLEANFILES:
-GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
-	$(srcdir)/aclocal.m4 \
-	$(srcdir)/autoscan.log \
-	$(srcdir)/configure.scan \
-	`AUX_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' ./configure.ac); \
-	 test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \
-	 for x in \
-		ar-lib \
-		compile \
-		config.guess \
-		config.sub \
-		depcomp \
-		install-sh \
-		ltmain.sh \
-		missing \
-		mkinstalldirs \
-		test-driver \
-	 ; do echo "$$AUX_DIR/$$x"; done` \
-	`cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \
-	head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done`
-#
-# All modules should also be fine including the following variable, which
-# removes automake-generated Makefile.in files:
-GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \
-	`cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' ./configure.ac | \
-	while read f; do \
-	  case $$f in Makefile|*/Makefile) \
-	    test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \
-	done`
-#
-# Modules that use libtool and use  AC_CONFIG_MACRO_DIR() may also include this,
-# though it's harmless to include regardless.
-GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \
-	`MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1' ./configure.ac); \
-	 if test "x$$MACRO_DIR" != "x$(srcdir)/"; then \
-		for x in \
-			libtool.m4 \
-			ltoptions.m4 \
-			ltsugar.m4 \
-			ltversion.m4 \
-			lt~obsolete.m4 \
-		; do echo "$$MACRO_DIR/$$x"; done; \
-	 fi`
-
-
-
-###############################################################################
-# Default rule is to install ourselves in all Makefile.am files:
-###############################################################################
-
-git-all: git-mk-install
-
-git-mk-install:
-	@echo "Installing git makefile"
-	@any_failed=; \
-		find "`test -z "$(top_srcdir)" && echo . || echo "$(top_srcdir)"`" -name Makefile.am | while read x; do \
-		if grep 'include .*/git.mk' $$x >/dev/null; then \
-			echo "$$x already includes git.mk"; \
-		else \
-			failed=; \
-			echo "Updating $$x"; \
-			{ cat $$x; \
-			  echo ''; \
-			  echo '-include $$(top_srcdir)/git.mk'; \
-			} > $$x.tmp || failed=1; \
-			if test x$$failed = x; then \
-				mv $$x.tmp $$x || failed=1; \
-			fi; \
-			if test x$$failed = x; then : else \
-				echo "Failed updating $$x"; >&2 \
-				any_failed=1; \
-			fi; \
-	fi; done; test -z "$$any_failed"
-
-.PHONY: git-all git-mk-install
-
-
-
-###############################################################################
-# Actual .gitignore generation:
-###############################################################################
-
-$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
-	@echo "git.mk: Generating $@"
-	@{ \
-		if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
-			for x in \
-				$(DOC_MODULE)-decl-list.txt \
-				$(DOC_MODULE)-decl.txt \
-				tmpl/$(DOC_MODULE)-unused.sgml \
-				"tmpl/*.bak" \
-				xml html \
-			; do echo "/$$x"; done; \
-			FLAVOR=$$(cd $(top_srcdir); $(AUTOCONF) --trace 'GTK_DOC_CHECK:$$2' ./configure.ac); \
-			case $$FLAVOR in *no-tmpl*) echo /tmpl;; esac; \
-		fi; \
-		if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
-			for lc in $(DOC_LINGUAS); do \
-				for x in \
-					$(if $(DOC_MODULE),$(DOC_MODULE).xml) \
-					$(DOC_PAGES) \
-					$(DOC_INCLUDES) \
-				; do echo "/$$lc/$$x"; done; \
-			done; \
-			for x in \
-				$(_DOC_OMF_ALL) \
-				$(_DOC_DSK_ALL) \
-				$(_DOC_HTML_ALL) \
-				$(_DOC_MOFILES) \
-				$(DOC_H_FILE) \
-				"*/.xml2po.mo" \
-				"*/*.omf.out" \
-			; do echo /$$x; done; \
-		fi; \
-		if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \
-			for lc in $(HELP_LINGUAS); do \
-				for x in \
-					$(HELP_FILES) \
-					"$$lc.stamp" \
-					"$$lc.mo" \
-				; do echo "/$$lc/$$x"; done; \
-			done; \
-		fi; \
-		if test "x$(gsettings_SCHEMAS)" = x; then :; else \
-			for x in \
-				$(gsettings_SCHEMAS:.xml=.valid) \
-				$(gsettings__enum_file) \
-			; do echo "/$$x"; done; \
-		fi; \
-		if test -f $(srcdir)/po/Makefile.in.in; then \
-			for x in \
-				po/Makefile.in.in \
-				po/Makefile.in.in~ \
-				po/Makefile.in \
-				po/Makefile \
-				po/Makevars.template \
-				po/POTFILES \
-				po/Rules-quot \
-				po/stamp-it \
-				po/.intltool-merge-cache \
-				"po/*.gmo" \
-				"po/*.header" \
-				"po/*.mo" \
-				"po/*.sed" \
-				"po/*.sin" \
-				po/$(GETTEXT_PACKAGE).pot \
-				intltool-extract.in \
-				intltool-merge.in \
-				intltool-update.in \
-			; do echo "/$$x"; done; \
-		fi; \
-		if test -f $(srcdir)/configure; then \
-			for x in \
-				autom4te.cache \
-				configure \
-				config.h \
-				stamp-h1 \
-				libtool \
-				config.lt \
-			; do echo "/$$x"; done; \
-		fi; \
-		if test "x$(DEJATOOL)" = x; then :; else \
-			for x in \
-				$(DEJATOOL) \
-			; do echo "/$$x.sum"; echo "/$$x.log"; done; \
-			echo /site.exp; \
-		fi; \
-		if test "x$(am__dirstamp)" = x; then :; else \
-			echo "$(am__dirstamp)"; \
-		fi; \
-		if test "x$(LTCOMPILE)" = x -a "x$(GTKDOC_RUN)" = x; then :; else \
-			for x in \
-				"*.lo" \
-				".libs" "_libs" \
-			; do echo "$$x"; done; \
-		fi; \
-		for x in \
-			.gitignore \
-			$(GITIGNOREFILES) \
-			$(CLEANFILES) \
-			$(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \
-			$(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \
-			$(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \
-			so_locations \
-			$(MOSTLYCLEANFILES) \
-			$(TEST_LOGS) \
-			$(TEST_LOGS:.log=.trs) \
-			$(TEST_SUITE_LOG) \
-			"*.$(OBJEXT)" \
-			$(DISTCLEANFILES) \
-			$(am__CONFIG_DISTCLEAN_FILES) \
-			$(CONFIG_CLEAN_FILES) \
-			TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
-			"*.tab.c" \
-			$(MAINTAINERCLEANFILES) \
-			$(BUILT_SOURCES) \
-			$(DEPDIR) \
-			$(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \
-			$(filter %_vala.stamp,$(DIST_COMMON)) \
-			$(filter %.vapi,$(DIST_COMMON)) \
-			$(filter %$(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))),$(DIST_COMMON)) \
-			Makefile \
-			Makefile.in \
-			"*.orig" \
-			"*.rej" \
-			"*.bak" \
-			"*~" \
-			".*.sw[nop]" \
-			".dirstamp" \
-		; do echo "/$$x"; done; \
-	} | \
-	sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
-	sed 's@/[.]/@/@g' | \
-	LC_ALL=C sort | uniq > $@.tmp && \
-	mv $@.tmp $@;
-
-all: $(srcdir)/.gitignore gitignore-recurse-maybe
-gitignore: $(srcdir)/.gitignore gitignore-recurse
-
-gitignore-recurse-maybe:
-	@for subdir in $(DIST_SUBDIRS); do \
-	  case " $(SUBDIRS) " in \
-	    *" $$subdir "*) :;; \
-	    *) test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir");; \
-	  esac; \
-	done
-gitignore-recurse:
-	@for subdir in $(DIST_SUBDIRS); do \
-	    test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir"); \
-	done
-
-maintainer-clean: gitignore-clean
-gitignore-clean:
-	-rm -f $(srcdir)/.gitignore
-
-.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
diff --git a/pango/Makefile.am b/pango/Makefile.am
deleted file mode 100644
index b360533d..00000000
--- a/pango/Makefile.am
+++ /dev/null
@@ -1,545 +0,0 @@
-## Process this file with automake to create Makefile.in.
-
-# We set GPATH here; this gives us semantics for GNU make
-# which are more like other make's VPATH.
-GPATH = $(srcdir)
-
-include $(INTROSPECTION_MAKEFILE)
-
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir) --add-include-path=.
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=.
-INTROSPECTION_SCANNER_ENV = CC="$(CC)"
-
-SUBDIRS =
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"Pango\"			\
-	-DPANGO_COMPILATION				\
-	-DPANGO_ENABLE_BACKEND				\
-	-DPANGO_ENABLE_ENGINE				\
-	-DSYSCONFDIR=\"$(sysconfdir)\"			\
-	-DLIBDIR=\"$(libdir)\"				\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	$(PANGO_DEBUG_FLAGS)				\
-	$(GLIB_CFLAGS)					\
-	$(XFT_CFLAGS)					\
-	$(CAIRO_CFLAGS)					\
-	$(HARFBUZZ_CFLAGS)				\
-	$(FREETYPE_CFLAGS)				\
-	$(FONTCONFIG_CFLAGS)				\
-	$(FRIBIDI_CFLAGS)				\
-	$(LIBTHAI_CFLAGS)					\
-	$(X_CFLAGS)					\
-	$(PANGO_HIDDEN_VISIBILITY_CFLAGS)
-
-BUILT_SOURCES = pango-enum-types.h pango-enum-types.c pango-features.h
-
-pangoincludedir=$(includedir)/pango-1.0/pango
-
-if OS_WIN32
-else
-libm = -lm
-endif
-
-# ------------------- libpango -------------------
-
-lib_LTLIBRARIES = libpango-1.0.la
-INTROSPECTION_GIRS += Pango-1.0.gir
-
-libpango_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
-libpango_1_0_la_LIBADD =		\
-	$(GLIB_LIBS)			\
-	$(LIBTHAI_LIBS)			\
-	$(FRIBIDI_LIBS)                 \
-	$(libm)
-libpango_1_0_la_DEPENDENCIES =
-
-if PLATFORM_WIN32
-libpango_1_0_la_LDFLAGS += -Wl,pango-win32-res.o
-libpango_1_0_la_DEPENDENCIES += pango-win32-res.o
-endif
-pango-win32-res.o: pango.rc
-	$(AM_V_GEN) $(WINDRES) $< $@
-
-libpango_1_0_la_SOURCES =			\
-	break.c					\
-	ellipsize.c				\
-	fonts.c					\
-	glyphstring.c				\
-	modules.c				\
-	pango-attributes.c			\
-	pango-bidi-type.c			\
-	pango-color.c				\
-	pango-color-table.h			\
-	pango-context.c				\
-	pango-coverage.c			\
-	pango-emoji.c				\
-	pango-emoji-private.h			\
-	pango-emoji-table.h			\
-	pango-engine.c				\
-	pango-engine-private.h			\
-	pango-fontmap.c				\
-	pango-fontset.c				\
-	pango-glyph-item.c			\
-	pango-gravity.c				\
-	pango-impl-utils.h			\
-	pango-item.c				\
-	pango-language.c			\
-	pango-language-sample-table.h		\
-	pango-layout.c				\
-	pango-layout-private.h			\
-	pango-markup.c				\
-	pango-matrix.c				\
-	pango-renderer.c			\
-	pango-script.c				\
-	pango-script-lang-table.h		\
-	pango-script-private.h			\
-	pango-tabs.c				\
-	pango-utils.c				\
-	pango-utils-internal.h			\
-	reorder-items.c				\
-	shape.c					\
-	pango-enum-types.c
-
-pango_headers =		\
-	pango.h			\
-	pango-attributes.h	\
-	pango-bidi-type.h	\
-	pango-break.h		\
-	pango-context.h		\
-	pango-coverage.h	\
-	pango-engine.h		\
-	pango-font.h		\
-	pango-fontmap.h		\
-	pango-fontset.h		\
-	pango-glyph.h		\
-	pango-glyph-item.h	\
-	pango-gravity.h		\
-	pango-item.h		\
-	pango-language.h	\
-	pango-layout.h		\
-	pango-matrix.h		\
-	pango-modules.h		\
-	pango-renderer.h	\
-	pango-script.h		\
-	pango-tabs.h		\
-	pango-types.h		\
-	pango-utils.h		\
-	pango-version-macros.h
-
-pangoinclude_HEADERS =	   \
-	$(pango_headers)   \
-	pango-features.h   \
-	pango-enum-types.h
-
-pango-enum-types.h: s-enum-types-h
-s-enum-types-h: $(pango_headers) Makefile.am pango-enum-types.h.template
-	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \
-			 --template pango-enum-types.h.template \
-			$(pango_headers) ) > pango-enum-types.h.tmp \
-			&& mv pango-enum-types.h.tmp pango-enum-types.h \
-			&& echo timestamp > $@
-
-pango-enum-types.c: s-enum-types-c
-s-enum-types-c: $(pango_headers) Makefile.am pango-enum-types.c.template
-	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \
-			 --template pango-enum-types.c.template \
-			$(pango_headers) ) > pango-enum-types.c.tmp \
-			&& mv pango-enum-types.c.tmp pango-enum-types.c \
-			&& echo timestamp > $@
-
-pango-features.h:
-	$(AM_V_GEN) cd $(top_builddir) && ./config.status pango/pango-features.h
-
-pango_introspection_files = \
-        $(libpango_1_0_la_SOURCES) \
-	    $(pango_headers) \
-	    pango-enum-types.h
-Pango-1.0.gir: libpango-1.0.la
-
-Pango_1_0_gir_PACKAGES = gobject-2.0 cairo glib-2.0
-if HAVE_CAIRO_FREETYPE
-Pango_1_0_gir_PACKAGES += freetype2
-endif
-Pango_1_0_gir_EXPORT_PACKAGES = pango
-Pango_1_0_gir_INCLUDES = GObject-2.0 cairo-1.0
-Pango_1_0_gir_LIBS = libpango-1.0.la
-Pango_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(INCLUDES)
-Pango_1_0_gir_FILES = $(filter-out %-private.h pango-color-table.h, $(pango_introspection_files))
-Pango_1_0_gir_SCANNERFLAGS = --c-include "pango/pango.h"
-
-# ------------------- libpangoft2 -------------------
-
-if HAVE_FREETYPE
-pangoinclude_HEADERS += $(pangoft2_headers)
-lib_LTLIBRARIES += libpangoft2-1.0.la
-INTROSPECTION_GIRS += PangoFT2-1.0.gir
-endif
-
-pangoft2_headers = 		\
-	pango-ot.h		\
-	pangofc-font.h		\
-	pangofc-fontmap.h	\
-	pangofc-decoder.h	\
-	pangoft2.h
-
-pangoft2_public_sources = 	\
-	pangofc-font.c	   	\
-	pangofc-fontmap.c	\
-	pangofc-decoder.c	\
-	pangofc-shape.c		\
-	pangoft2.c
-
-libpangoft2_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
-libpangoft2_1_0_la_LIBADD =			\
-	libpango-$(PANGO_API_VERSION).la	\
-	$(GLIB_LIBS)				\
-	$(HARFBUZZ_LIBS)			\
-	$(FREETYPE_LIBS)			\
-	$(FONTCONFIG_LIBS)			\
-	$(libm)
-libpangoft2_1_0_la_DEPENDENCIES =		\
-	libpango-$(PANGO_API_VERSION).la
-libpangoft2_1_0_la_SOURCES =   	\
-	$(pangoft2_public_sources) \
-	pangofc-private.h	\
-	pangoft2.h		\
-	pangoft2-private.h	\
-	pangoft2-fontmap.c	\
-	pangoft2-render.c	\
-	pango-ot-private.h	\
-	pango-ot-buffer.c	\
-	pango-ot-info.c		\
-	pango-ot-ruleset.c      \
-	pango-ot-tag.c
-
-
-if PLATFORM_WIN32
-libpangoft2_1_0_la_LDFLAGS += -Wl,pangoft2-win32-res.o
-libpangoft2_1_0_la_DEPENDENCIES += pangoft2-win32-res.o
-endif
-pangoft2-win32-res.o: pangoft2.rc
-	$(AM_V_GEN) $(WINDRES) $< $@
-
-pangoft2_introspection_files = \
-        $(pangoft2_headers) \
-        $(pangoft2_public_sources)
-
-PangoFT2-1.0.gir: libpangoft2-1.0.la
-PangoFT2-1.0.gir: Pango-1.0.gir
-
-PangoFT2_1_0_gir_PACKAGES = freetype2
-PangoFT2_1_0_gir_EXPORT_PACKAGES = pangoft2
-PangoFT2_1_0_gir_INCLUDES = GObject-2.0 cairo-1.0 freetype2-2.0 fontconfig-2.0
-PangoFT2_1_0_gir_LIBS = $(Pango_1_0_gir_LIBS) libpangoft2-1.0.la
-PangoFT2_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(INCLUDES)
-PangoFT2_1_0_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/Pango-1.0.gir --c-include "pango/pangoft2.h"
-PangoFT2_1_0_gir_FILES = $(filter-out %-private.h, $(addprefix $(srcdir)/,$(pangoft2_introspection_files)))
-
-# ------------------- libpangoxft -------------------
-
-if HAVE_XFT
-pangoinclude_HEADERS += $(pangoxft_headers)
-lib_LTLIBRARIES += libpangoxft-1.0.la
-INTROSPECTION_GIRS += PangoXft-1.0.gir
-endif
-
-pangoxft_headers = pangoxft.h pangoxft-render.h
-
-libpangoxft_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
-libpangoxft_1_0_la_LIBADD =			\
-	libpangoft2-$(PANGO_API_VERSION).la	\
-	libpango-$(PANGO_API_VERSION).la	\
-	$(GLIB_LIBS)				\
-	$(XFT_LIBS)				\
-	$(FREETYPE_LIBS)			\
-	$(FONTCONFIG_LIBS)			\
-	$(libm)
-libpangoxft_1_0_la_DEPENDENCIES =		\
-	libpangoft2-$(PANGO_API_VERSION).la	\
-	libpango-$(PANGO_API_VERSION).la
-
-if PLATFORM_WIN32
-libpangoxft_1_0_la_LDFLAGS += -Wl,pangoxft-win32-res.o
-libpangoxft_1_0_la_DEPENDENCIES += pangoxft-win32-res.o
-endif
-pangoxft-win32-res.o: pangoxft.rc
-	$(AM_V_GEN) $(WINDRES) $< $@
-
-libpangoxft_1_0_la_SOURCES =   	\
-	pangoxft-font.c		\
-	pangoxft-fontmap.c      \
-	pangoxft-private.h	\
-	pangoxft-render.c
-
-pangoxft_introspection_files = \
-    $(pangoxft_headers) \
-    $(libpangoxft_1_0_la_SOURCES)
-
-PangoXft-1.0.gir: libpangoxft-1.0.la
-PangoXft-1.0.gir: Pango-1.0.gir PangoFT2-1.0.gir
-
-PangoXft_1_0_gir_PACKAGES = gobject-2.0 freetype2
-PangoXft_1_0_gir_EXPORT_PACKAGES = pangoxft
-PangoXft_1_0_gir_INCLUDES = GObject-2.0 xft-2.0 xlib-2.0
-PangoXft_1_0_gir_LIBS = $(PangoFT2_1_0_gir_LIBS) libpangoxft-1.0.la
-PangoXft_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(INCLUDES)
-PangoXft_1_0_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/Pango-1.0.gir --include-uninstalled=$(builddir)/PangoFT2-1.0.gir --c-include "pango/pangoxft.h"
-PangoXft_1_0_gir_FILES = $(filter-out %-private.h, $(addprefix $(srcdir)/,$(pangoxft_introspection_files)))
-
-# ------------------- libpangocairo -------------------
-
-if HAVE_CAIRO
-pangoinclude_HEADERS += $(pangocairo_headers)
-lib_LTLIBRARIES += libpangocairo-1.0.la
-INTROSPECTION_GIRS += PangoCairo-1.0.gir
-endif
-
-pangocairo_headers = pangocairo.h
-
-libpangocairo_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
-libpangocairo_1_0_la_LIBADD =			\
-	libpango-$(PANGO_API_VERSION).la	\
-	$(GLIB_LIBS)				\
-	$(CAIRO_LIBS)				\
-	$(FONTCONFIG_LIBS)			\
-	$(libm)
-libpangocairo_1_0_la_DEPENDENCIES =		\
-	libpango-$(PANGO_API_VERSION).la
-pangocairo_core_sources = \
-	pangocairo-context.c    \
-	pangocairo-font.c	\
-	pangocairo-fontmap.c    \
-	pangocairo-render.c	\
-	pangocairo-private.h
-
-libpangocairo_1_0_la_SOURCES = $(pangocairo_core_sources)
-
-if HAVE_CAIRO_WIN32
-if PLATFORM_WIN32
-libpangocairo_1_0_la_LDFLAGS += -Wl,pangocairo-win32-res.o
-libpangocairo_1_0_la_DEPENDENCIES += pangocairo-win32-res.o
-endif
-pangocairo-win32-res.o: pangocairo.rc
-	$(AM_V_GEN) $(WINDRES) $< $@
-
-
-libpangocairo_1_0_la_LIBADD += libpangowin32-$(PANGO_API_VERSION).la -lgdi32
-libpangocairo_1_0_la_DEPENDENCIES += libpangowin32-$(PANGO_API_VERSION).la
-
-libpangocairo_1_0_la_SOURCES += pangocairo-win32font.c pangocairo-win32fontmap.c pangocairo-win32.h
-endif
-
-if HAVE_CAIRO_FREETYPE
-libpangocairo_1_0_la_LIBADD +=  libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS)
-libpangocairo_1_0_la_DEPENDENCIES += libpangoft2-$(PANGO_API_VERSION).la 
-PANGOCAIRO_FONT_BACKEND_GI_MODULE = PangoFT2-1.0.gir
-
-libpangocairo_1_0_la_SOURCES += \
-	pangocairo-fcfont.c	\
-	pangocairo-fcfontmap.c  \
-	pangocairo-fc.h
-endif
-
-if HAVE_CAIRO_QUARTZ
-if HAVE_CORE_TEXT
-libpangocairo_1_0_la_SOURCES += \
-	pangocoretext.h		\
-	pangocoretext.c		\
-	pangocoretext-private.h	\
-	pangocoretext-fontmap.c	\
-	pangocoretext-shape.c	\
-	pangocairo-coretext.h	\
-	pangocairo-coretextfont.c	\
-	pangocairo-coretextfont.h	\
-	pangocairo-coretextfontmap.c
-pangoinclude_HEADERS += pangocoretext.h
-
-libpangocairo_1_0_la_LDFLAGS += -framework CoreFoundation -framework ApplicationServices
-# We don't have an CoreText GIR right now, so this is just hypothetical
-# PANGOCAIRO_FONT_BACKEND_GI_MODULE = PangoCoreText-1.0.gir
-endif
-endif
-
-pangocairo_introspection_files = \
-    $(libpangocairo_1_0_la_SOURCES) \
-    $(pangocairo_headers)
-
-PangoCairo-1.0.gir: libpangocairo-1.0.la
-PangoCairo-1.0.gir: Pango-1.0.gir $(PANGOCAIRO_FONT_BACKEND_GI_MODULE)
-
-PangoCairo_1_0_gir_PACKAGES = gobject-2.0 cairo
-PangoCairo_1_0_gir_EXPORT_PACKAGES = pangocairo
-PangoCairo_1_0_gir_INCLUDES = GObject-2.0 cairo-1.0
-PangoCairo_1_0_gir_LIBS = $(Pango_1_0_gir_LIBS) libpangocairo-1.0.la
-PangoCairo_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(INCLUDES)
-PangoCairo_1_0_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/Pango-1.0.gir --c-include "pango/pangocairo.h"
-if HAVE_CAIRO_FREETYPE
-PangoCairo_1_0_gir_SCANNERFLAGS += --include-uninstalled=$(builddir)/$(PANGOCAIRO_FONT_BACKEND_GI_MODULE)
-PangoCairo_1_0_gir_LIBS += $(PangoFT2_1_0_gir_LIBS)
-endif
-PangoCairo_1_0_gir_FILES = $(filter-out %-private.h, $(addprefix $(srcdir)/,$(pangocairo_introspection_files)))
-
-# ------------------- libpangowin32 -------------------
-
-if HAVE_WIN32
-pangoinclude_HEADERS += pangowin32.h
-lib_LTLIBRARIES += libpangowin32-1.0.la
-endif
-
-libpangowin32_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
-libpangowin32_1_0_la_LIBADD =			\
-	libpango-$(PANGO_API_VERSION).la	\
-	$(GLIB_LIBS)				\
-	-lusp10 -lgdi32
-libpangowin32_1_0_la_DEPENDENCIES =		\
-	libpango-$(PANGO_API_VERSION).la
-libpangowin32_1_0_la_SOURCES =	\
-	pangowin32.h		\
-	pangowin32.c		\
-	pangowin32-private.h	\
-	pangowin32-fontcache.c	\
-	pangowin32-fontmap.c	\
-	pangowin32-shape.c
-
-if PLATFORM_WIN32
-libpangowin32_1_0_la_LDFLAGS += -Wl,pangowin32-win32-res.o
-libpangowin32_1_0_la_DEPENDENCIES += pangowin32-win32-res.o
-endif
-pangowin32-win32-res.o: pangowin32.rc
-	$(AM_V_GEN) $(WINDRES) $< $@
-
-
-# ------------------- introspection -------------------
-
-if HAVE_INTROSPECTION
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibsdir = $(libdir)/girepository-1.0
-typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-endif # HAVE_INTROSPECTION
-
-
-EXTRA_DIST =					\
-	pango-enum-types.h			\
-	pango-enum-types.h.template		\
-	pango-enum-types.c.template		\
-	pango.rc				\
-	pango.rc.in				\
-	pangoft2.rc				\
-	pangoft2.rc.in				\
-	pangowin32.rc				\
-	pangowin32.rc.in			\
-	pangocairo.rc				\
-	pangocairo.rc.in			\
-	pangoxft.rc				\
-	pangoxft.rc.in				\
-	break-arabic.c				\
-	break-indic.c				\
-	break-thai.c
-
-CLEANFILES =			\
-	pango-enum-types.h	\
-	s-enum-types-h		\
-	pango-enum-types.c	\
-	s-enum-types-c      \
-    $(INTROSPECTION_GIRS) \
-    $(INTROSPECTION_GIRS:.gir=.typelib)
-
-MOSTLYCLEANFILES = 		\
-	*.list			\
-	*.expected
-
-DISTCLEANFILES = 		\
-	pango-features.h
-
-# ------------------- MSVC Build Items ----------------
-
-MSVCPROJS = pango pangowin32 pangoft2 pangocairo
-
-pango_FILES =	\
-	$(libpango_1_0_la_SOURCES)
-pango_EXCLUDES = dummy
-pango_HEADERS_DIR = $(pangoincludedir)
-
-# We can't just use $(pangoinclude_HEADERS), due to different platforms this may run on.
-# We don't include the pangoft2 headers here, as it is optional on Windows Builds.
-pango_HEADERS_INST = 	\
-	$(pango_headers)	\
-	$(pangocairo_headers)	\
-	pangowin32.h		\
-	pango-features.h	\
-	pango-enum-types.h
-
-pango_HEADERS_EXCLUDES = dummy
-
-pangowin32_FILES = $(libpangowin32_1_0_la_SOURCES)
-pangowin32_EXCLUDES = dummy
-
-pangoft2_FILES = $(libpangoft2_1_0_la_SOURCES)
-pangoft2_EXCLUDES = dummy
-
-# Again, can't use $(libpangocairo_1_0_la_SOURCES), due to different platforms this may run on.
-pangocairo_FILES = $(pangocairo_core_sources)
-pangocairo_EXCLUDES = dummy
-
-include $(top_srcdir)/win32/Makefile.msvcproj
-
-if HAVE_INTROSPECTION
-# Introspection Items for MSVC
-MSVC_INTROSPECT_GIRS = Pango-1.0.gir PangoCairo-1.0.gir
-
-BASE_MSVC_GIR_CFLAGS =			\
-	-DG_LOG_DOMAIN=\"Pango\"	\
-	-DPANGO_ENABLE_BACKEND		\
-	-DPANGO_ENABLE_ENGINE
-
-INTROSPECTION_INTERMEDIATE_ITEMS = \
-	$(top_builddir)/win32/Pango-1.0.gir.msvc.introspect		\
-	$(top_builddir)/win32/Pango_1_0_gir_list			\
-	$(top_builddir)/win32/PangoCairo-1.0.gir.msvc.introspect	\
-	$(top_builddir)/win32/PangoCairo_1_0_gir_list
-
-Pango_1_0_gir_MSVC_FILES = $(Pango_1_0_gir_FILES)
-Pango_1_0_gir_MSVC_PACKAGES = gobject-2.0 cairo glib-2.0
-Pango_1_0_gir_MSVC_EXPORT_PACKAGES = $(Pango_1_0_gir_EXPORT_PACKAGES)
-Pango_1_0_gir_MSVC_INCLUDE_GIRS = $(Pango_1_0_gir_INCLUDES)
-Pango_1_0_gir_MSVC_LIBS = pango-1.0
-Pango_1_0_gir_MSVC_CFLAGS = -I.. $(BASE_MSVC_GIR_CFLAGS)
-Pango_1_0_gir_MSVC_SCANNERFLAGS = $(Pango_1_0_gir_SCANNERFLAGS)
-
-pangocairo_msvc_introspection_files =	\
-	$(pangocairo_core_sources)	\
-	pangocairo-win32font.c		\
-	pangocairo-win32fontmap.c	\
-	pangocairo-win32.h		\
-	$(pangocairo_headers)
-
-PangoCairo_1_0_gir_MSVC_FILES = $(filter-out %-private.h, $(pangocairo_msvc_introspection_files))
-PangoCairo_1_0_gir_MSVC_GIR_DEPS = Pango-1.0.gir
-PangoCairo_1_0_gir_MSVC_PACKAGES = $(PangoCairo_1_0_gir_PACKAGES)
-PangoCairo_1_0_gir_MSVC_EXPORT_PACKAGES = $(PangoCairo_1_0_gir_EXPORT_PACKAGES)
-PangoCairo_1_0_gir_MSVC_INCLUDE_GIRS = $(PangoCairo_1_0_gir_INCLUDES) win32-1.0
-PangoCairo_1_0_gir_MSVC_LIBS = $(Pango_1_0_gir_MSVC_LIBS) pangocairo-1.0
-PangoCairo_1_0_gir_MSVC_CFLAGS = $(Pango_1_0_gir_MSVC_CFLAGS)
-PangoCairo_1_0_gir_MSVC_SCANNERFLAGS = --include-uninstalled=./Pango-1.0.gir --c-include "pango/pangocairo.h"
-
-include $(top_srcdir)/win32/Makefile.msvc-introspection
-else
-INTROSPECTION_INTERMEDIATE_ITEMS =
-endif
-
-dist-hook: \
-	$(top_builddir)/win32/vs9/pango.vcproj		\
-	$(top_builddir)/win32/vs9/pangowin32.vcproj	\
-	$(top_builddir)/win32/vs9/pangoft2.vcproj		\
-	$(top_builddir)/win32/vs9/pangocairo.vcproj	\
-	$(top_builddir)/win32/vs9/pango.headers		\
-	$(INTROSPECTION_INTERMEDIATE_ITEMS)
-
--include $(top_srcdir)/git.mk
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index b382e520..00000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,142 +0,0 @@
-## Process this file with automake to create Makefile.in.
-
-EXTRA_DIST = 			\
-	boundaries.utf8		\
-	GraphemeBreakTest.txt
-
-DISTCLEANFILES = all-unicode.txt
-
-AM_CPPFLAGS =					\
-	-DSRCDIR=\"$(srcdir)\"			\
-	-I$(top_srcdir)				\
-	$(PANGO_DEBUG_FLAGS)			\
-	$(GLIB_CFLAGS)				\
-	$(XFT_CFLAGS)				\
-	$(CAIRO_CFLAGS)				\
-	$(FREETYPE_CFLAGS)			\
-	$(X_CFLAGS)
-
-if HAVE_XFT
-AM_CPPFLAGS += -DHAVE_X
-endif
-if HAVE_XFT
-AM_CPPFLAGS += -DHAVE_XFT
-endif
-if HAVE_FREETYPE
-AM_CPPFLAGS += -DHAVE_FREETYPE
-endif
-if HAVE_WIN32
-AM_CPPFLAGS += -DHAVE_WIN32
-endif
-
-
-if CROSS_COMPILING
-TESTS =
-else
-TESTS = $(check_PROGRAMS)
-endif
-
-TESTS_ENVIRONMENT =                    \
-   srcdir=$(srcdir)                    \
-   G_TEST_SRCDIR=$(abs_srcdir)         \
-   G_TEST_BUILDDIR=$(abs_builddir)
-
-check_PROGRAMS = 			\
-	testboundaries 			\
-	testboundaries_ucd 		\
-	testcolor 			\
-	testscript 			\
-	markup-parse 			\
-	test-layout			\
-	test-font			\
-	testattributes			\
-	$(NULL)
-
-if HAVE_CAIRO
-check_PROGRAMS += testiter test-pangocairo-threads
-endif
-if HAVE_FREETYPE
-check_PROGRAMS += test-ot-tags
-endif
-
-TEST_PANGO_LIBS = ../pango/libpango-$(PANGO_API_VERSION).la
-TEST_PANGOFT2_LIBS = $(TEST_PANGO_LIBS) ../pango/libpangoft2-$(PANGO_API_VERSION).la
-TEST_PANGOCAIRO_LIBS = $(TEST_PANGOFT2_LIBS) ../pango/libpangocairo-$(PANGO_API_VERSION).la
-
-test_layout_SOURCES = \
-	test-layout.c \
-	test-common.c \
-	test-common.h \
-	$(NULL)
-
-testattributes_SOURCES = \
-	testattributes.c \
-	test-common.c \
-	test-common.h \
-	$(NULL)
-
-gen_all_unicode_LDADD = $(GLIB_LIBS)
-testboundaries_LDADD = $(TEST_PANGO_LIBS) $(GLIB_LIBS)
-testboundaries_ucd_LDADD = $(TEST_PANGO_LIBS) $(GLIB_LIBS)
-testcolor_LDADD = $(TEST_PANGO_LIBS) $(GLIB_LIBS)
-testiter_LDADD = $(TEST_PANGOCAIRO_LIBS) $(GLIB_LIBS)
-testscript_LDADD = $(TEST_PANGO_LIBS) $(GLIB_LIBS)
-test_ot_tags_LDADD = $(TEST_PANGOFT2_LIBS) $(GLIB_LIBS)
-test_pangocairo_threads_LDADD = $(TEST_PANGOCAIRO_LIBS) $(CAIRO_LIBS) $(GLIB_LIBS)
-dump_boundaries_LDADD = $(TEST_PANGO_LIBS) $(GLIB_LIBS)
-markup_parse_LDADD = $(TEST_PANGOCAIRO_LIBS) $(GLIB_LIBS)
-test_layout_LDADD = $(TEST_PANGOCAIRO_LIBS) $(GLIB_LIBS)
-test_font_LDADD = $(TEST_PANGOCAIRO_LIBS) $(GLIB_LIBS)
-testattributes_LDADD = $(TEST_PANGOCAIRO_LIBS) $(GLIB_LIBS)
-
-if HAVE_CXX
-check_PROGRAMS += cxx-test
-endif
-cxx_test_SOURCES = cxx-test.cpp
-
-all-unicode.txt: gen-all-unicode$(EXEEXT)
-	./gen-all-unicode > all-unicode.txt
-
-noinst_PROGRAMS = $(check_PROGRAMS) gen-all-unicode dump-boundaries
-
-markup_tests = \
-	valid-1 valid-2 valid-3 valid-4 valid-5 valid-6 valid-7 valid-8 valid-9 \
-	fail-1 fail-2 fail-3 fail-4 fail-5 \
-	$(NULL)
-
-all_markup_data = \
-	$(addprefix markups/,$(markup_tests:=.markup) $(markup_tests:=.expected))
-
-layout_tests = \
-	valid-1 valid-2 \
-	$(NULL)
-
-all_layout_data = \
-	$(addprefix layouts/,$(layout_tests:=.markup) $(layout_tests:=.expected))
-	
-
-EXTRA_DIST += $(all_markup_data) $(all_layout_data)
-
-if BUILDOPT_INSTALL_TESTS
-insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)
-insttest_PROGRAMS = $(check_PROGRAMS)
-
-testdatadir = $(insttestdir)
-nobase_testdata_DATA = 		\
-	all-unicode.txt 	\
-	boundaries.utf8 	\
-	GraphemeBreakTest.txt 	\
-	$(all_markup_data)	\
-	$(all_layout_data)
-
-testmetadir = $(datadir)/installed-tests/$(PACKAGE)
-testmeta_DATA = $(check_PROGRAMS:=.test)
-
-%.test: %$(EXEEXT) Makefile
-	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
-	 echo 'Type=session' >> $@.tmp; \
-	 echo 'Exec=$(libexecdir)/installed-tests/$(PACKAGE)/$<' >> $@.tmp; \
-	 mv $@.tmp $@)
-endif
-
--include $(top_srcdir)/git.mk
diff --git a/tools/Makefile.am b/tools/Makefile.am
deleted file mode 100644
index 83d243f2..00000000
--- a/tools/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-## Process this file with automake to create Makefile.in.
-
-INCLUDES =					\
-	-I$(top_srcdir)				\
-	$(GLIB_CFLAGS)				\
-	$(FONTCONFIG_CFLAGS)			\
-	-DPANGO_DISABLE_DEPRECATED		\
-	$(PANGO_DEBUG_FLAGS)
-
-EXTRA_PROGRAMS = 		\
-	gen-script-for-lang
-
-EXTRA_DIST= 			\
-	gen-color-table.pl	\
-	gen-emoji-table.py	\
-	rgb.txt
-
-gen_script_for_lang_SOURCES = gen-script-for-lang.c
-gen_script_for_lang_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la $(FONTCONFIG_LIBS) $(GLIB_LIBS)
-
--include $(top_srcdir)/git.mk
diff --git a/utils/Makefile.am b/utils/Makefile.am
deleted file mode 100644
index 97c83413..00000000
--- a/utils/Makefile.am
+++ /dev/null
@@ -1,115 +0,0 @@
-## Process this file with automake to create Makefile.in.
-
-TEST_TEXTS =			\
-	test-arabic.txt		\
-	test-chinese.txt	\
-	test-devanagari.txt	\
-	test-feature-tag.markup \
-	test-gurmukhi.txt	\
-	test-hebrew.txt		\
-	test-ipa.txt		\
-	test-justify.txt	\
-	test-lao.txt		\
-	test-latin.txt		\
-	test-long-paragraph.txt	\
-	test-mixed.markup	\
-	test-mixed.txt		\
-	test-mongolian.txt	\
-	test-nko.txt		\
-	test-opentype-language.markup \
-	test-syriac.txt		\
-	test-tamil.txt		\
-	test-thai.txt		\
-	test-tibetan.txt	\
-	HELLO.txt		\
-	GLASS.txt
-
-EXTRA_DIST =			\
-	$(TEST_TEXTS)
-
-INCLUDES =				\
-	-I$(top_srcdir)			\
-	$(PANGO_DEBUG_FLAGS)		\
-	$(GLIB_CFLAGS)			\
-	$(XFT_CFLAGS)			\
-	$(CAIRO_CFLAGS)			\
-	$(FREETYPE_CFLAGS)		\
-	$(FONTCONFIG_CFLAGS)		\
-	$(X_CFLAGS)
-
-#########################################################
-
-bin_PROGRAMS = pango-view
-
-if HAVE_CAIRO
-bin_PROGRAMS += pango-list
-pango_list_SOURCES = pango-list.c
-pango_list_LDADD =					\
-	../pango/libpangocairo-$(PANGO_API_VERSION).la	\
-	../pango/libpango-$(PANGO_API_VERSION).la	\
-	$(GLIB_LIBS)
-endif
-
-
-pango_view_SOURCES =					\
-	viewer-render.h					\
-	viewer-render.c					\
-	viewer.h					\
-	viewer-main.c					\
-	pango-view.c
-pango_view_LDADD =					\
-	../pango/libpango-$(PANGO_API_VERSION).la	\
-	$(GLIB_LIBS)
-if HAVE_FREETYPE
-pango_view_SOURCES +=					\
-	viewer-pangoft2.c
-pango_view_LDADD +=					\
-	../pango/libpangoft2-$(PANGO_API_VERSION).la	\
-	$(FREETYPE_LIBS)				\
-	$(FONTCONFIG_LIBS)
-endif
-if HAVE_XFT
-pango_view_SOURCES +=					\
-	viewer-pangoxft.c				\
-	viewer-x.h					\
-	viewer-x.c
-pango_view_LDADD +=					\
-	../pango/libpangoft2-$(PANGO_API_VERSION).la	\
-	../pango/libpangoxft-$(PANGO_API_VERSION).la	\
-	$(XFT_LIBS)
-endif
-if HAVE_CAIRO
-pango_view_SOURCES +=					\
-	viewer-cairo.h					\
-	viewer-cairo.c					\
-	viewer-pangocairo.c
-pango_view_LDADD +=					\
-	../pango/libpangocairo-$(PANGO_API_VERSION).la	\
-	$(CAIRO_LIBS)
-endif
-
-#########################################################
-
-MAINTAINERCLEANFILES = pango-view.1.in
-EXTRA_DIST += pango-view.1.in
-CLEANFILES = pango-view.1
-
-nodist_man_MANS = pango-view.1
-
-# The indirection through pango-view.1.in is to make parallel build work.
-# See bug 587768.
-$(srcdir)/pango-view.1.in: ../configure.ac $(pango_view_SOURCES)
-	$(AM_V_GEN) $(top_srcdir)/missing --run \
-	   help2man --no-info --section=1 \
-		    --help-option="--help-all" --output="$@.tmp" \
-		    --name 'Pango text viewer' ./pango-view \
-	 && mv "$@.tmp" "$@" \
-	  || (echo Failed to update pango-view.1, the man page may be outdated >&2; \
-	      (test -f "$@" || echo help2man is required to generate this file. >> "$@"));
-pango-view.1: pango-view$(EXEEXT)
-	$(AM_V_GEN) $(MAKE) $(AM_MAKEFLAGS) pango-view.1.in && \
-	cp $(srcdir)/pango-view.1.in $@
-
-#########################################################
-
--include $(top_srcdir)/git.mk
diff --git a/win32/Makefile.am b/win32/Makefile.am
deleted file mode 100644
index 11e40dd0..00000000
--- a/win32/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-if HAVE_INTROSPECTION
-GENERATED_ITEMS = \
-	introspection.body.mak	\
-	Pango_1_0_gir_list		\
-	PangoCairo_1_0_gir_list
-
-MSVC_INTROSPECTION_INTERMEDIATE_FILES = PangoCairo-1.0.gir.msvc.introspect Pango-1.0.gir.msvc.introspect
-
-introspection.body.mak: $(MSVC_INTROSPECTION_INTERMEDIATE_FILES)
-	-$(RM) introspection.body.mak
-	for F in `ls *.msvc.introspect`; do \
-		case $$F in \
-			*)	cat $(top_builddir)/win32/$$F >>introspection.body.mak \
-			;; \
-		esac; \
-	done
-	$(RM) $(MSVC_INTROSPECTION_INTERMEDIATE_FILES)
-
-DISTCLEANFILES = $(GENERATED_ITEMS)
-
-else
-GENERATED_ITEMS =
-endif
-
-SUBDIRS =	\
-	vs9	\
-	vs10	\
-	vs11	\
-	vs12	\
-	vs14	\
-	vs15
-
-EXTRA_DIST =	\
-	unistd.h	\
-	pango-introspection-msvc.mak	\
-	introspection-msvc.mak	\
-	detectenv-msvc.mak	\
-	pangopc.py	\
-	pc_base.py	\
-	replace.py	\
-	$(GENERATED_ITEMS)
-
--include $(top_srcdir)/git.mk
diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am
deleted file mode 100644
index e654c3bb..00000000
--- a/win32/vs10/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-GENERATED_ITEMS =			\
-	pango.vcxproj			\
-	pango.vcxproj.filters		\
-	pangowin32.vcxproj		\
-	pangowin32.vcxproj.filters	\
-	pangoft2.vcxproj		\
-	pangoft2.vcxproj.filters	\
-	pangocairo.vcxproj		\
-	pangocairo.vcxproj.filters	\
-	pango-install.props
-
-EXTRA_DIST =	\
-	pango.sln				\
-	pango-build-defines.props		\
-	pango-ignore-fc.props			\
-	pango-install-bin.props			\
-	pango-install.propsin			\
-	pango-prebuild.props			\
-	pango-version-paths.props		\
-	pango.vcxprojin				\
-	pango.vcxproj.filtersin			\
-	pangoft2.vcxprojin			\
-	pangoft2.vcxproj.filtersin		\
-	pangowin32.vcxprojin			\
-	pangowin32.vcxproj.filtersin		\
-	pangocairo.vcxprojin			\
-	pangocairo.vcxproj.filtersin		\
-	pango-install.vcxproj			\
-	pango-install.vcxproj.filters		\
-	pango-introspect.vcxproj		\
-	README.txt				\
-	$(GENERATED_ITEMS)
-
-pango-install.props: $(top_srcdir)/win32/vs10/pango-install.propsin pango.vs10.headers
-	-$(RM) $(top_builddir)/win32/vs11/pango-install.props
-	-$(RM) $(top_builddir)/win32/vs12/pango-install.props
-	-$(RM) $(top_builddir)/win32/vs14/pango-install.props
-	-$(RM) $(top_builddir)/win32/vs15/pango-install.props
-	$(CPP) -P - <$(top_srcdir)/win32/vs10/pango-install.propsin >$@
-	rm pango.vs10.headers
-
-DISTCLEANFILES = $(GENERATED_ITEMS)
-
--include $(top_srcdir)/git.mk
diff --git a/win32/vs11/Makefile.am b/win32/vs11/Makefile.am
deleted file mode 100644
index 2fcbacc9..00000000
--- a/win32/vs11/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-EXTRA_DIST =	\
-	pango.sln				\
-	pango-build-defines.props		\
-	pango-ignore-fc.props			\
-	pango-install-bin.props			\
-	pango-install.props			\
-	pango-prebuild.props			\
-	pango-version-paths.props		\
-	pango.vcxproj				\
-	pango.vcxproj.filters			\
-	pangoft2.vcxproj			\
-	pangoft2.vcxproj.filters		\
-	pangowin32.vcxproj			\
-	pangowin32.vcxproj.filters		\
-	pangocairo.vcxproj			\
-	pangocairo.vcxproj.filters		\
-	pango-install.vcxproj			\
-	pango-install.vcxproj.filters		\
-	pango-introspect.vcxproj		\
-	README.txt
-
-DISTCLEANFILES = $(EXTRA_DIST)
-
-MSVC_BASE_VER = 10
-MSVC_BASE_VER_LONG = 2010
-MSVC_VER = 11
-MSVC_VER_LONG = 2012
-
-include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/win32/vs12/Makefile.am b/win32/vs12/Makefile.am
deleted file mode 100644
index 532972be..00000000
--- a/win32/vs12/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-EXTRA_DIST =	\
-	pango.sln				\
-	pango-build-defines.props		\
-	pango-ignore-fc.props			\
-	pango-install-bin.props			\
-	pango-install.props			\
-	pango-prebuild.props			\
-	pango-version-paths.props		\
-	pango.vcxproj				\
-	pango.vcxproj.filters			\
-	pangoft2.vcxproj			\
-	pangoft2.vcxproj.filters		\
-	pangowin32.vcxproj			\
-	pangowin32.vcxproj.filters		\
-	pangocairo.vcxproj			\
-	pangocairo.vcxproj.filters		\
-	pango-install.vcxproj			\
-	pango-install.vcxproj.filters		\
-	pango-introspect.vcxproj		\
-	README.txt
-
-DISTCLEANFILES = $(EXTRA_DIST)
-
-MSVC_BASE_VER = 10
-MSVC_BASE_VER_LONG = 2010
-MSVC_VER = 12
-MSVC_VER_LONG = 2013
-
-include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/win32/vs14/Makefile.am b/win32/vs14/Makefile.am
deleted file mode 100644
index 75966590..00000000
--- a/win32/vs14/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-EXTRA_DIST =	\
-	pango.sln				\
-	pango-build-defines.props		\
-	pango-ignore-fc.props			\
-	pango-install-bin.props			\
-	pango-install.props			\
-	pango-prebuild.props			\
-	pango-version-paths.props		\
-	pango.vcxproj				\
-	pango.vcxproj.filters			\
-	pangoft2.vcxproj			\
-	pangoft2.vcxproj.filters		\
-	pangowin32.vcxproj			\
-	pangowin32.vcxproj.filters		\
-	pangocairo.vcxproj			\
-	pangocairo.vcxproj.filters		\
-	pango-install.vcxproj			\
-	pango-install.vcxproj.filters		\
-	pango-introspect.vcxproj		\
-	README.txt
-
-DISTCLEANFILES = $(EXTRA_DIST)
-
-MSVC_BASE_VER = 10
-MSVC_BASE_VER_LONG = 2010
-MSVC_VER = 14
-MSVC_VER_LONG = 14
-
-include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/win32/vs15/Makefile.am b/win32/vs15/Makefile.am
deleted file mode 100644
index 3c7486ab..00000000
--- a/win32/vs15/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-EXTRA_DIST =	\
-	pango.sln				\
-	pango-build-defines.props		\
-	pango-ignore-fc.props			\
-	pango-install-bin.props			\
-	pango-install.props			\
-	pango-prebuild.props			\
-	pango-version-paths.props		\
-	pango.vcxproj				\
-	pango.vcxproj.filters			\
-	pangoft2.vcxproj			\
-	pangoft2.vcxproj.filters		\
-	pangowin32.vcxproj			\
-	pangowin32.vcxproj.filters		\
-	pangocairo.vcxproj			\
-	pangocairo.vcxproj.filters		\
-	pango-install.vcxproj			\
-	pango-install.vcxproj.filters		\
-	pango-introspect.vcxproj		\
-	README.txt
-
-DISTCLEANFILES = $(EXTRA_DIST)
-
-MSVC_BASE_VER = 10
-MSVC_BASE_VER_LONG = 2010
-MSVC_VER = 15
-MSVC_VER_LONG = 15
-MSVC_TOOLSET = 141
-
-include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/win32/vs9/Makefile.am b/win32/vs9/Makefile.am
deleted file mode 100644
index ecf9bb0a..00000000
--- a/win32/vs9/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-GENERATED_ITEMS =		\
-	pango.vcproj		\
-	pangowin32.vcproj	\
-	pangoft2.vcproj		\
-	pangocairo.vcproj	\
-	pango-install.vsprops
-
-EXTRA_DIST =	\
-	pango.sln			\
-	pango-build-defines.vsprops	\
-	pango-ignore-fc.vsprops		\
-	pango-install-bin.vsprops	\
-	pango-install.vspropsin		\
-	pango-prebuild.vsprops		\
-	pango-version-paths.vsprops	\
-	pango.vcprojin			\
-	pangoft2.vcprojin		\
-	pangocairo.vcprojin		\
-	pangowin32.vcprojin		\
-	pango-install.vcproj		\
-	pango-introspect.vcproj		\
-	stdint.h			\
-	README.txt			\
-	$(GENERATED_ITEMS)
-
-pango-install.vsprops: $(top_srcdir)/win32/vs9/pango-install.vspropsin pango.headers
-	$(CPP) -P - <$(top_srcdir)/win32/vs9/pango-install.vspropsin >$@
-	rm pango.headers
-
-DISTCLEANFILES = $(GENERATED_ITEMS)
-
--include $(top_srcdir)/git.mk