[Spice-devel] [PATCH spice-common 2/2] Remove autotools files in favor of meson

Eduardo Lima (Etrunko) etrunko at redhat.com
Thu Mar 22 17:18:19 UTC 2018


Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
---
 Makefile.am                |  28 ----
 autogen.sh                 |  17 ---
 build-aux/git-version-gen  | 158 ----------------------
 common/Makefile.am         | 144 --------------------
 configure.ac               |  74 ----------
 docs/Makefile.am           |  17 ---
 git.mk                     | 227 -------------------------------
 m4/.gitignore              |   0
 m4/ax_python_module.m4     |  49 -------
 m4/spice-deps.m4           | 327 ---------------------------------------------
 m4/spice_manual.m4         |  32 -----
 python_modules/Makefile.am |  16 ---
 tests/Makefile.am          |  70 ----------
 13 files changed, 1159 deletions(-)
 delete mode 100644 Makefile.am
 delete mode 100755 autogen.sh
 delete mode 100755 build-aux/git-version-gen
 delete mode 100644 common/Makefile.am
 delete mode 100644 configure.ac
 delete mode 100644 docs/Makefile.am
 delete mode 100644 git.mk
 delete mode 100644 m4/.gitignore
 delete mode 100644 m4/ax_python_module.m4
 delete mode 100644 m4/spice-deps.m4
 delete mode 100644 m4/spice_manual.m4
 delete mode 100644 python_modules/Makefile.am
 delete mode 100644 tests/Makefile.am

diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index ee0a1e2..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-NULL =
-ACLOCAL_AMFLAGS = -I m4
-
-SUBDIRS = python_modules common tests docs
-
-EXTRA_DIST =				\
-	spice_codegen.py		\
-	spice.proto			\
-	spice1.proto			\
-	$(NULL)
-
-DISTCLEANFILES = *.pyc
-
-MAINTAINERCLEANFILES =						\
-	$(srcdir)/INSTALL					\
-	$(srcdir)/aclocal.m4					\
-	$(srcdir)/autoscan.log					\
-	$(srcdir)/build-aux					\
-	$(srcdir)/config.h.in					\
-	$(srcdir)/m4/libtool.m4					\
-	$(srcdir)/m4/ltoptions.m4				\
-	$(srcdir)/m4/ltsugar.m4					\
-	$(srcdir)/m4/ltversion.m4				\
-	$(srcdir)/m4/lt~obsolete.m4				\
-	`find "$(srcdir)" -type f -name Makefile.in -print`	\
-	$(NULL)
-
--include $(top_srcdir)/git.mk
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 95717c7..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e # exit on errors
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-olddir=`pwd`
-cd "$srcdir"
-
-mkdir -p m4
-autoreconf --verbose --force --install
-
-cd "$olddir"
-if [ -z "$NOCONFIGURE" ]; then
-    "$srcdir"/configure --enable-maintainer-mode --enable-python-checks ${1+"$@"}
-fi
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
deleted file mode 100755
index 5617eb8..0000000
--- a/build-aux/git-version-gen
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/bin/sh
-# Print a version string.
-scriptversion=2010-06-14.19; # UTC
-
-# Copyright (C) 2007-2010 Free Software Foundation, Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
-# It may be run two ways:
-# - from a git repository in which the "git describe" command below
-#   produces useful output (thus requiring at least one signed tag)
-# - from a non-git-repo directory containing a .tarball-version file, which
-#   presumes this script is invoked like "./git-version-gen .tarball-version".
-
-# In order to use intra-version strings in your project, you will need two
-# separate generated version string files:
-#
-# .tarball-version - present only in a distribution tarball, and not in
-#   a checked-out repository.  Created with contents that were learned at
-#   the last time autoconf was run, and used by git-version-gen.  Must not
-#   be present in either $(srcdir) or $(builddir) for git-version-gen to
-#   give accurate answers during normal development with a checked out tree,
-#   but must be present in a tarball when there is no version control system.
-#   Therefore, it cannot be used in any dependencies.  GNUmakefile has
-#   hooks to force a reconfigure at distribution time to get the value
-#   correct, without penalizing normal development with extra reconfigures.
-#
-# .version - present in a checked-out repository and in a distribution
-#   tarball.  Usable in dependencies, particularly for files that don't
-#   want to depend on config.h but do want to track version changes.
-#   Delete this file prior to any autoconf run where you want to rebuild
-#   files to pick up a version string change; and leave it stale to
-#   minimize rebuild time after unrelated changes to configure sources.
-#
-# It is probably wise to add these two files to .gitignore, so that you
-# don't accidentally commit either generated file.
-#
-# Use the following line in your configure.ac, so that $(VERSION) will
-# automatically be up-to-date each time configure is run (and note that
-# since configure.ac no longer includes a version string, Makefile rules
-# should not depend on configure.ac for version updates).
-#
-# AC_INIT([GNU project],
-#         m4_esyscmd([build-aux/git-version-gen .tarball-version]),
-#         [bug-project at example])
-#
-# Then use the following lines in your Makefile.am, so that .version
-# will be present for dependencies, and so that .tarball-version will
-# exist in distribution tarballs.
-#
-# BUILT_SOURCES = $(top_srcdir)/.version
-# $(top_srcdir)/.version:
-#	echo $(VERSION) > $@-t && mv $@-t $@
-# dist-hook:
-#	echo $(VERSION) > $(distdir)/.tarball-version
-
-case $# in
-    1|2) ;;
-    *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version" \
-         '[TAG-NORMALIZATION-SED-SCRIPT]'
-       exit 1;;
-esac
-
-tarball_version_file=$1
-tag_sed_script="${2:-s/x/x/}"
-nl='
-'
-
-# Avoid meddling by environment variable of the same name.
-v=
-
-# First see if there is a tarball-only version file.
-# then try "git describe", then default.
-if test -f $tarball_version_file
-then
-    v=`cat $tarball_version_file` || exit 1
-    case $v in
-	*$nl*) v= ;; # reject multi-line output
-	[0-9]*) ;;
-	*) v= ;;
-    esac
-    test -z "$v" \
-	&& echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2
-fi
-
-if test -n "$v"
-then
-    : # use $v
-elif test -d .git \
-    && v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \
-	  || git describe --abbrev=4 HEAD 2>/dev/null` \
-    && v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \
-    && case $v in
-	 v[0-9]*) ;;
-	 *) (exit 1) ;;
-       esac
-then
-    # Is this a new git that lists number of commits since the last
-    # tag or the previous older version that did not?
-    #   Newer: v6.10-77-g0f8faeb
-    #   Older: v6.10-g0f8faeb
-    case $v in
-	*-*-*) : git describe is okay three part flavor ;;
-	*-*)
-	    : git describe is older two part flavor
-	    # Recreate the number of commits and rewrite such that the
-	    # result is the same as if we were using the newer version
-	    # of git describe.
-	    vtag=`echo "$v" | sed 's/-.*//'`
-	    numcommits=`git rev-list "$vtag"..HEAD | wc -l`
-	    v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
-	    ;;
-    esac
-
-    # Change the first '-' to a '.', so version-comparing tools work properly.
-    # Remove the "g" in git describe's output string, to save a byte.
-    v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
-else
-    v=UNKNOWN
-fi
-
-v=`echo "$v" |sed 's/^v//'`
-
-# Don't declare a version "dirty" merely because a time stamp has changed.
-git update-index --refresh > /dev/null 2>&1
-
-dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
-case "$dirty" in
-    '') ;;
-    *) # Append the suffix only if there isn't one already.
-	case $v in
-	  *-dirty) ;;
-	  *) v="$v-dirty" ;;
-	esac ;;
-esac
-
-# Omit the trailing newline, so that m4_esyscmd can use the result directly.
-echo "$v" | tr -d "$nl"
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/common/Makefile.am b/common/Makefile.am
deleted file mode 100644
index 22aec80..0000000
--- a/common/Makefile.am
+++ /dev/null
@@ -1,144 +0,0 @@
-NULL =
-
-# Avoid need for python(pyparsing) by end users
-CLIENT_MARSHALLERS =				\
-	generated_client_demarshallers.c	\
-	generated_client_demarshallers1.c	\
-	generated_client_marshallers.c		\
-	generated_client_marshallers.h		\
-	generated_client_marshallers1.c		\
-	$(NULL)
-
-SERVER_MARSHALLERS =				\
-	generated_server_demarshallers.c	\
-	generated_server_marshallers.c		\
-	generated_server_marshallers.h		\
-	$(NULL)
-
-BUILT_SOURCES = $(CLIENT_MARSHALLERS) $(SERVER_MARSHALLERS)
-
-noinst_LTLIBRARIES = libspice-common.la libspice-common-server.la libspice-common-client.la
-libspice_common_la_SOURCES =		\
-	backtrace.c			\
-	backtrace.h			\
-	bitops.h			\
-	canvas_utils.c			\
-	canvas_utils.h			\
-	client_demarshallers.h		\
-	client_marshallers.h		\
-	draw.h				\
-	lines.c				\
-	lines.h				\
-	log.c				\
-	log.h				\
-	lz.c				\
-	lz.h				\
-	lz_common.h			\
-	lz_config.h			\
-	macros.h			\
-	marshaller.c			\
-	marshaller.h			\
-	mem.c				\
-	mem.h				\
-	messages.h			\
-	pixman_utils.c			\
-	pixman_utils.h			\
-	quic.c				\
-	quic.h				\
-	quic_config.h			\
-	rect.h				\
-	region.c			\
-	region.h			\
-	ring.h				\
-	rop3.c				\
-	rop3.h				\
-	snd_codec.c			\
-	snd_codec.h			\
-	spice_common.h			\
-	ssl_verify.c			\
-	ssl_verify.h			\
-	verify.h			\
-	$(NULL)
-
-# These 2 files are not build as part of spice-common
-# build system, but modules using spice-common will build
-# them with the appropriate options. We need to let automake
-# know that these are source files so that it can properly
-# track these files dependencies
-EXTRA_libspice_common_la_SOURCES = 	\
-	sw_canvas.c			\
-	sw_canvas.h			\
-	$(NULL)
-
-libspice_common_client_la_SOURCES =		\
-	$(CLIENT_MARSHALLERS)			\
-	$(NULL)
-
-libspice_common_server_la_SOURCES =		\
-	$(SERVER_MARSHALLERS)			\
-	$(NULL)
-
-libspice_common_server_la_CFLAGS = -DFIXME_SERVER_SMARTCARD
-
-AM_CPPFLAGS =				\
-	-I$(top_srcdir)			\
-	-I$(top_builddir)		\
-	$(SPICE_COMMON_CFLAGS)		\
-	$(PROTOCOL_CFLAGS)		\
-	$(NULL)
-
-libspice_common_la_LIBADD =				\
-	$(SPICE_COMMON_LIBS)				\
-	$(NULL)
-
-MARSHALLERS_DEPS =							\
-	$(top_srcdir)/python_modules/__init__.py		\
-	$(top_srcdir)/python_modules/codegen.py		\
-	$(top_srcdir)/python_modules/demarshal.py		\
-	$(top_srcdir)/python_modules/marshal.py		\
-	$(top_srcdir)/python_modules/ptypes.py		\
-	$(top_srcdir)/python_modules/spice_parser.py	\
-	$(top_srcdir)/spice_codegen.py			\
-	$(NULL)
-
-# Note despite being autogenerated these are not part of CLEANFILES, they are
-# actually a part of EXTRA_DIST, to avoid the need for pyparser by end users
-generated_client_demarshallers.c: $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS)
-	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --client --include common/messages.h $< $@ >/dev/null
-
-generated_client_demarshallers1.c: $(top_srcdir)/spice1.proto $(MARSHALLERS_DEPS)
-	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --client --include common/messages.h --prefix 1 --ptrsize 8 $< $@ >/dev/null
-
-generated_client_marshallers.h: $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS)
-	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers -P --client --include common/messages.h -H $< $@ >/dev/null
-
-generated_client_marshallers.c: $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS)
-	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers -P --include client_marshallers.h --client $< $@ >/dev/null
-
-generated_client_marshallers1.c: $(top_srcdir)/spice1.proto $(MARSHALLERS_DEPS)
-	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers -P --include common/messages.h --include client_marshallers.h --client --prefix 1 --ptrsize 8 $< $@ >/dev/null
-
-generated_server_demarshallers.c: $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS)
-	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --server --include common/messages.h $< $@ >/dev/null
-
-STRUCTS = -M String -M Rect -M Point -M DisplayBase -M Fill -M Opaque -M Copy -M Blend -M Blackness -M Whiteness -M Invers -M Rop3 -M Stroke -M Text -M Transparent -M AlphaBlend -M Composite
-generated_server_marshallers.c: $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS)
-	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers $(STRUCTS) --server --include common/messages.h $< $@ >/dev/null
-
-generated_server_marshallers.h: $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS)
-	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers $(STRUCTS) --server --include common/messages.h -H $< $@ >/dev/null
-
-EXTRA_DIST =				\
-	$(CLIENT_MARSHALLERS)		\
-	$(SERVER_MARSHALLERS)		\
-	canvas_base.c			\
-	canvas_base.h			\
-	lz_compress_tmpl.c		\
-	lz_decompress_tmpl.c		\
-	quic_family_tmpl.c		\
-	quic_rgb_tmpl.c			\
-	quic_tmpl.c			\
-	snd_codec.h			\
-	$(NULL)
-
--include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 3da85de..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,74 +0,0 @@
-AC_PREREQ([2.63])
-
-AC_INIT([spice-common],
-        [noversion],
-        [spice-devel at lists.freedesktop.org])
-
-AC_CONFIG_SRCDIR([common/bitops.h])
-AC_CONFIG_MACRO_DIR([m4])
-AM_CONFIG_HEADER([config.h])
-AC_CONFIG_AUX_DIR([build-aux])
-
-# For automake >= 1.12
-m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-
-# Checks for programs
-AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip tar-ustar foreign -Wall -Werror])
-AM_MAINTAINER_MODE
-AM_SILENT_RULES([yes])
-LT_INIT
-SPICE_MANUAL
-
-AC_PROG_CC
-AC_PROG_CC_C99
-if test "x$ac_cv_prog_cc_c99" = xno; then
-    AC_MSG_ERROR([C99 compiler is required.])
-fi
-AM_PROG_CC_C_O
-
-SPICE_CHECK_SYSDEPS
-SPICE_EXTRA_CHECKS
-
-AC_ARG_ENABLE([alignment-checks],
-  AS_HELP_STRING([--enable-alignment-checks],
-                 [Enable runtime checks for cast alignment @<:@default=no@:>@]),
-  [],
-  enable_alignment_checks="no")
-AS_IF([test "x$enable_alignment_checks" = "xyes"],
-      [AC_DEFINE([SPICE_DEBUG_ALIGNMENT], 1, [Enable runtime checks for cast alignment])])
-
-# Checks for libraries
-PKG_CHECK_MODULES([PROTOCOL], [spice-protocol >= 0.12.12])
-
-SPICE_CHECK_PYTHON_MODULES()
-
-SPICE_CHECK_PIXMAN
-SPICE_CHECK_SMARTCARD
-SPICE_CHECK_CELT051
-SPICE_CHECK_GLIB2
-SPICE_CHECK_OPUS
-SPICE_CHECK_OPENSSL
-
-SPICE_COMMON_CFLAGS='$(PIXMAN_CFLAGS) $(SMARTCARD_CFLAGS) $(CELT051_CFLAGS) $(GLIB2_CFLAGS) $(OPUS_CFLAGS) $(OPENSSL_CFLAGS)'
-SPICE_COMMON_CFLAGS="$SPICE_COMMON_CFLAGS -DG_LOG_DOMAIN=\\\"Spice\\\""
-SPICE_COMMON_LIBS='$(PIXMAN_LIBS) $(CELT051_LIBS) $(GLIB2_LIBS) $(OPUS_LIBS) $(OPENSSL_LIBS)'
-AC_SUBST(SPICE_COMMON_CFLAGS)
-AC_SUBST(SPICE_COMMON_LIBS)
-
-# The End!
-AC_CONFIG_FILES([
-  Makefile
-  common/Makefile
-  python_modules/Makefile
-  tests/Makefile
-  docs/Makefile
-])
-
-AH_BOTTOM([
-/* argh.. this is evil */
-#if defined(FIXME_SERVER_SMARTCARD) && defined(USE_SMARTCARD)
-%:undef USE_SMARTCARD
-#endif
-])
-
-AC_OUTPUT
diff --git a/docs/Makefile.am b/docs/Makefile.am
deleted file mode 100644
index 20f46ef..0000000
--- a/docs/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-NULL =
-ASCIIDOC_FLAGS = -a icons -a toc
-
-EXTRA_DIST =					\
-	spice_protocol.txt			\
-	$(NULL)
-
-if BUILD_HTML_MANUAL
-all-local: spice_protocol.html
-
-spice_protocol.html: spice_protocol.txt
-	$(AM_V_GEN) $(ASCIIDOC) -n $(ASCIIDOC_FLAGS) -o $@ $<
-endif
-
-CLEANFILES = spice_protocol.html
-
--include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
deleted file mode 100644
index d5bf7b8..0000000
--- a/git.mk
+++ /dev/null
@@ -1,227 +0,0 @@
-# git.mk
-#
-# Copyright 2009, Red Hat, Inc.
-# Copyright 2010,2011 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.
-#
-
-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
-
-
-### .gitignore generation
-
-$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
-	$(AM_V_GEN) \
-	{ \
-		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; \
-		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 \
-				po/Makefile \
-				po/POTFILES \
-				po/stamp-it \
-				po/.intltool-merge-cache \
-				"po/*.gmo" \
-				"po/*.mo" \
-				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; \
-		for x in \
-			.gitignore \
-			$(GITIGNOREFILES) \
-			$(CLEANFILES) \
-			$(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \
-			$(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \
-			$(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \
-			so_locations \
-			.libs _libs \
-			$(MOSTLYCLEANFILES) \
-			"*.$(OBJEXT)" \
-			"*.lo" \
-			$(DISTCLEANFILES) \
-			$(am__CONFIG_DISTCLEAN_FILES) \
-			$(CONFIG_CLEAN_FILES) \
-			TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
-			"*.tab.c" \
-			$(MAINTAINERCLEANFILES) \
-			$(BUILT_SOURCES) \
-			$(DEPDIR) \
-			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" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse-maybe || echo "Skipping $$subdir");; \
-	  esac; \
-	done
-gitignore-recurse:
-	@for subdir in $(DIST_SUBDIRS); do \
-	    test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || 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/m4/.gitignore b/m4/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/m4/ax_python_module.m4 b/m4/ax_python_module.m4
deleted file mode 100644
index 3afc404..0000000
--- a/m4/ax_python_module.m4
+++ /dev/null
@@ -1,49 +0,0 @@
-# ===========================================================================
-#     http://www.gnu.org/software/autoconf-archive/ax_python_module.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PYTHON_MODULE(modname[, fatal])
-#
-# DESCRIPTION
-#
-#   Checks for Python module.
-#
-#   If fatal is non-empty then absence of a module will trigger an error.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Andrew Collier
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 6
-
-AU_ALIAS([AC_PYTHON_MODULE], [AX_PYTHON_MODULE])
-AC_DEFUN([AX_PYTHON_MODULE],[
-    if test -z $PYTHON;
-    then
-        PYTHON="python"
-    fi
-    PYTHON_NAME=`basename $PYTHON`
-    AC_MSG_CHECKING($PYTHON_NAME module: $1)
-	$PYTHON -c "import $1" 2>/dev/null
-	if test $? -eq 0;
-	then
-		AC_MSG_RESULT(yes)
-		eval AS_TR_CPP(HAVE_PYMOD_$1)=yes
-	else
-		AC_MSG_RESULT(no)
-		eval AS_TR_CPP(HAVE_PYMOD_$1)=no
-		#
-		if test -n "$2"
-		then
-			AC_MSG_ERROR(failed to find required module $1)
-			exit 1
-		fi
-	fi
-])
diff --git a/m4/spice-deps.m4 b/m4/spice-deps.m4
deleted file mode 100644
index a6f4b7b..0000000
--- a/m4/spice-deps.m4
+++ /dev/null
@@ -1,327 +0,0 @@
-# For autoconf < 2.63
-m4_ifndef([AS_VAR_APPEND],
-          AC_DEFUN([AS_VAR_APPEND], $1=$$1$2))
-m4_ifndef([AS_VAR_COPY],
-          [m4_define([AS_VAR_COPY],
-          [AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])])])
-
-
-# SPICE_WARNING(warning)
-# SPICE_PRINT_MESSAGES
-# ----------------------
-# Collect warnings and print them at the end so they are clearly visible.
-# ---------------------
-AC_DEFUN([SPICE_WARNING],[AS_VAR_APPEND([spice_warnings],["|$1"])])
-AC_DEFUN([SPICE_PRINT_MESSAGES],[
-    ac_save_IFS="$IFS"
-    IFS="|"
-    for msg in $spice_warnings; do
-        IFS="$ac_save_IFS"
-        AS_VAR_IF([msg],[],,[AC_MSG_WARN([$msg]); echo >&2])
-    done
-    IFS="$ac_save_IFS"
-])
-
-
-# SPICE_EXTRA_CHECKS()
-# --------------------
-# Check for --enable-extra-checks option
-# --------------------
-AC_DEFUN([SPICE_EXTRA_CHECKS],[
-AC_ARG_ENABLE([extra-checks],
-               AS_HELP_STRING([--enable-extra-checks=@<:@yes/no@:>@],
-                              [Enable expensive checks @<:@default=no@:>@]))
-AM_CONDITIONAL(ENABLE_EXTRA_CHECKS, test "x$enable_extra_checks" = "xyes")
-AS_IF([test "x$enable_extra_checks" = "xyes"],
-      [AC_DEFINE([ENABLE_EXTRA_CHECKS], 1, [Enable extra checks on code])])
-])
-
-
-# SPICE_CHECK_SYSDEPS()
-# ---------------------
-# Checks for header files and library functions needed by spice-common.
-# ---------------------
-AC_DEFUN([SPICE_CHECK_SYSDEPS], [
-    AC_C_BIGENDIAN
-    AC_FUNC_ALLOCA
-    AC_CHECK_HEADERS([arpa/inet.h malloc.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/socket.h unistd.h])
-
-    # Checks for typedefs, structures, and compiler characteristics
-    AC_C_INLINE
-    AC_TYPE_INT16_T
-    AC_TYPE_INT32_T
-    AC_TYPE_INT64_T
-    AC_TYPE_INT8_T
-    AC_TYPE_PID_T
-    AC_TYPE_SIZE_T
-    AC_TYPE_UINT16_T
-    AC_TYPE_UINT32_T
-    AC_TYPE_UINT64_T
-    AC_TYPE_UINT8_T
-
-    # Checks for library functions
-    # do not check malloc or realloc, since that cannot be cross-compiled checked
-    AC_FUNC_ERROR_AT_LINE
-    AC_FUNC_FORK
-    AC_CHECK_FUNCS([dup2 floor inet_ntoa memmove memset pow sqrt])
-])
-
-
-# SPICE_CHECK_SMARTCARD
-# ---------------------
-# Adds a --enable-smartcard switch in order to enable/disable smartcard
-# support, and checks if the needed libraries are available. If found, it will
-# return the flags to use in the SMARTCARD_CFLAGS and SMARTCARD_LIBS variables, and
-# it will define a USE_SMARTCARD preprocessor symbol as well as a HAVE_SMARTCARD
-# Makefile conditional.
-#----------------------
-AC_DEFUN([SPICE_CHECK_SMARTCARD], [
-    AC_ARG_ENABLE([smartcard],
-      AS_HELP_STRING([--enable-smartcard=@<:@yes/no/auto@:>@],
-                     [Enable smartcard support @<:@default=auto@:>@]),
-      [],
-      [enable_smartcard="auto"])
-
-    have_smartcard=no
-    if test "x$enable_smartcard" != "xno"; then
-      PKG_CHECK_MODULES([SMARTCARD], [libcacard >= 2.5.1], [have_smartcard=yes], [have_smartcard=no])
-      if test "x$have_smartcard" = "xno"; then
-        PKG_CHECK_MODULES([SMARTCARD], [libcacard >= 0.1.2], [have_smartcard=yes have_smartcard_012=yes], [have_smartcard=no])
-      fi
-      if test "x$enable_smartcard" != "xauto" && test "x$have_smartcard" = "xno"; then
-        AC_MSG_ERROR("Smartcard support requested but libcacard could not be found")
-      fi
-      if test "x$have_smartcard_012" = "xyes"; then
-        AC_DEFINE(USE_SMARTCARD_012, [1], [Define if supporting smartcard proxying without libcacard.h])
-      fi
-      if test "x$have_smartcard" = "xyes"; then
-        AC_DEFINE(USE_SMARTCARD, [1], [Define if supporting smartcard proxying])
-      fi
-    fi
-    AM_CONDITIONAL(HAVE_SMARTCARD, test "x$have_smartcard" = "xyes")
-])
-
-
-# SPICE_CHECK_CELT051
-# -------------------
-# Adds a --disable-celt051 switch in order to enable/disable CELT 0.5.1
-# support, and checks if the needed libraries are available. If found, it will
-# return the flags to use in the CELT051_CFLAGS and CELT051_LIBS variables, and
-# it will define a HAVE_CELT051 preprocessor symbol as well as a HAVE_CELT051
-# Makefile conditional.
-#--------------------
-AC_DEFUN([SPICE_CHECK_CELT051], [
-    AC_ARG_ENABLE([celt051],
-        [  --disable-celt051       Disable celt051 audio codec (enabled by default)],,
-        [enable_celt051="yes"])
-
-    if test "x$enable_celt051" = "xyes"; then
-        PKG_CHECK_MODULES([CELT051], [celt051 >= 0.5.1.1], [have_celt051=yes], [have_celt051=no])
-    else
-        have_celt051=no
-    fi
-
-    AM_CONDITIONAL([HAVE_CELT051], [test "x$have_celt051" = "xyes"])
-    AM_COND_IF([HAVE_CELT051], AC_DEFINE([HAVE_CELT051], 1, [Define if we have celt051 codec]))
-])
-
-
-# SPICE_CHECK_OPUS
-# ----------------
-# Check for the availability of Opus. If found, it will return the flags to use
-# in the OPUS_CFLAGS and OPUS_LIBS variables, and it will define a
-# HAVE_OPUS preprocessor symbol as well as a HAVE_OPUS Makefile conditional.
-# ----------------
-AC_DEFUN([SPICE_CHECK_OPUS], [
-    PKG_CHECK_MODULES([OPUS], [opus >= 0.9.14], [have_opus=yes], [have_opus=no])
-
-    AM_CONDITIONAL([HAVE_OPUS], [test "x$have_opus" = "xyes"])
-    if test "x$have_opus" = "xyes" ; then
-      AC_DEFINE([HAVE_OPUS], [1], [Define if we have OPUS])
-    fi
-])
-
-
-# SPICE_CHECK_PIXMAN
-# ------------------
-# Check for the availability of pixman. If found, it will return the flags to
-# use in the PIXMAN_CFLAGS and PIXMAN_LIBS variables.
-#-------------------
-AC_DEFUN([SPICE_CHECK_PIXMAN], [
-    PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.17.7)
-])
-
-
-# SPICE_CHECK_GLIB2
-# -----------------
-# Check for the availability of glib2. If found, it will return the flags to
-# use in the GLIB2_CFLAGS and GLIB2_LIBS variables.
-#------------------
-AC_DEFUN([SPICE_CHECK_GLIB2], [
-    PKG_CHECK_MODULES(GLIB2, glib-2.0 >= 2.22 gio-2.0 >= 2.22 gthread-2.0 >= 2.22)
-])
-
-# SPICE_CHECK_PYTHON_MODULES()
-# --------------------------
-# Adds a --enable-python-checks configure flags as well as checks for the
-# availability of the python modules needed by the python scripts generating
-# C code from spice.proto. These checks are not needed when building from
-# tarballs so they are disabled by default.
-#---------------------------
-AC_DEFUN([SPICE_CHECK_PYTHON_MODULES], [
-    AC_ARG_ENABLE([python-checks],
-        AS_HELP_STRING([--enable-python-checks=@<:@yes/no@:>@],
-                       [Enable checks for Python modules needed to build from git @<:@default=no@:>@]),
-                       [],
-                       [enable_python_checks="no"])
-    if test "x$enable_python_checks" != "xno"; then
-        AS_IF([test -n "$PYTHON"], # already set required PYTHON version
-              [AM_PATH_PYTHON
-               AX_PYTHON_MODULE([six], [1])
-               AX_PYTHON_MODULE([pyparsing], [1])],
-              [PYTHON=python3
-               AX_PYTHON_MODULE([six])
-               AX_PYTHON_MODULE([pyparsing])
-               test "$HAVE_PYMOD_SIX" = "yes" && test "$HAVE_PYMOD_PYPARSING" = "yes"],
-              [AM_PATH_PYTHON([3])],
-              [PYTHON=python2
-               AX_PYTHON_MODULE([six])
-               AX_PYTHON_MODULE([pyparsing])
-               test "$HAVE_PYMOD_SIX" = "yes" && test "$HAVE_PYMOD_PYPARSING" = "yes"],
-              [AM_PATH_PYTHON([2])],
-              [AC_MSG_ERROR([Python modules six and pyparsing are required])])
-    else
-        AM_PATH_PYTHON
-    fi
-])
-
-
-# SPICE_CHECK_LZ4
-# ---------------
-# Adds a --enable-lz4 switch in order to enable/disable LZ4 compression
-# support, and checks if the needed libraries are available. If found, it will
-# return the flags to use in the LZ4_CFLAGS and LZ4_LIBS variables, and
-# it will define a USE_LZ4 preprocessor symbol and a HAVE_LZ4 conditional.
-# ---------------
-AC_DEFUN([SPICE_CHECK_LZ4], [
-    AC_ARG_ENABLE([lz4],
-      AS_HELP_STRING([--enable-lz4=@<:@yes/no/auto@:>@],
-                     [Enable LZ4 compression support @<:@default=auto@:>@]),
-      [],
-      [enable_lz4="auto"])
-
-    have_lz4="no"
-    if test "x$enable_lz4" != "xno"; then
-      # LZ4_compress_default is available in liblz4 >= 129, however liblz has changed
-      # versioning scheme making the check failing. Rather check for function definition
-      PKG_CHECK_MODULES([LZ4], [liblz4], [have_lz4="yes"], [have_lz4="no"])
-
-      if test "x$have_lz4" = "xyes"; then
-        # It is necessary to set LIBS and CFLAGS before AC_CHECK_FUNC
-        old_LIBS="$LIBS"
-        old_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $LZ4_CFLAGS"
-        LIBS="$LIBS $LZ4_LIBS"
-
-        AC_CHECK_FUNC([LZ4_compress_default], [
-            AC_DEFINE(USE_LZ4, [1], [Define to build with lz4 support])],
-            [have_lz4="no"])
-        AC_CHECK_FUNCS([LZ4_compress_fast_continue])
-
-        LIBS="$old_LIBS"
-        CFLAGS="$old_CFLAGS"
-      fi
-      if test "x$enable_lz4" = "xyes" && test "x$have_lz4" = "xno"; then
-        AC_MSG_ERROR([lz4 support requested but liblz4 >= 129 could not be found])
-      fi
-    fi
-    AM_CONDITIONAL(HAVE_LZ4, test "x$have_lz4" = "xyes")
-])
-
-
-# SPICE_CHECK_GSTREAMER(VAR, version, packages-to-check-for, [action-if-found, [action-if-not-found]])
-# ---------------------
-# Checks whether the specified GStreamer modules are present and sets the
-# corresponding autoconf variables and preprocessor definitions.
-# ---------------------
-AC_DEFUN([SPICE_CHECK_GSTREAMER], [
-    AS_VAR_PUSHDEF([have_gst],[have_]m4_tolower([$1]))dnl
-    AS_VAR_PUSHDEF([gst_inspect],[GST_INSPECT_$2])dnl
-    PKG_CHECK_MODULES([$1], [$3],
-        [have_gst="yes"
-         AC_SUBST(AS_TR_SH([[$1]_CFLAGS]))
-         AC_SUBST(AS_TR_SH([[$1]_LIBS]))
-         AS_VAR_APPEND([SPICE_REQUIRES], [" $3"])
-         AC_DEFINE(AS_TR_SH([HAVE_$1]), [1], [Define if supporting GStreamer $2])
-         AC_PATH_PROG(gst_inspect, gst-inspect-$2)
-         AS_IF([test "x$gst_inspect" = x],
-               SPICE_WARNING([Cannot verify that the required runtime GStreamer $2 elements are present because gst-inspect-$2 is missing]))
-         $4],
-        [have_gst="no"
-         $5])
-    AS_VAR_POPDEF([gst_inspect])dnl
-    AS_VAR_POPDEF([have_gst])dnl
-])
-
-# SPICE_CHECK_GSTREAMER_ELEMENTS(gst-inspect, package, elements-to-check-for)
-# ---------------------
-# Checks that the specified GStreamer elements are installed. If not it
-# issues a warning and sets missing_gstreamer_elements.
-# ---------------------
-AC_DEFUN([SPICE_CHECK_GSTREAMER_ELEMENTS], [
-AS_IF([test "x$1" != x],
-      [missing=""
-       for element in $3
-       do
-           AS_VAR_PUSHDEF([cache_var],[spice_cv_prog_${1}_${element}])dnl
-           AC_CACHE_CHECK([for the $element GStreamer element], cache_var,
-                          [found=no
-                           "$1" $element >/dev/null 2>/dev/null && found=yes
-                           eval "cache_var=$found"])
-           AS_VAR_COPY(res, cache_var)
-           AS_IF([test "x$res" = "xno"], [missing="$missing $element"])
-           AS_VAR_POPDEF([cache_var])dnl
-       done
-       AS_IF([test "x$missing" != x],
-             [SPICE_WARNING([The$missing GStreamer element(s) are missing. You should be able to find them in the $2 package.])
-              missing_gstreamer_elements="yes"],
-             [test "x$missing_gstreamer_elements" = x],
-             [missing_gstreamer_elements="no"])
-      ])
-])
-
-# SPICE_CHECK_SASL
-# ----------------
-# Adds a --with-sasl switch to allow using SASL for authentication.
-# Checks whether the required library is available. If it is present,
-# it will return the flags to use in SASL_CFLAGS and SASL_LIBS variables,
-# and it will define a have_sasl configure variable and a HAVE_SASL preprocessor
-# symbol.
-# ----------------
-AC_DEFUN([SPICE_CHECK_SASL], [
-    AC_ARG_WITH([sasl],
-      [AS_HELP_STRING([--with-sasl=@<:@yes/no/auto@:>@],
-                      [use cyrus SASL for authentication @<:@default=auto@:>@])],
-                      [],
-                      [with_sasl="auto"])
-
-    have_sasl=no
-    if test "x$with_sasl" != "xno"; then
-      PKG_CHECK_MODULES([SASL], [libsasl2], [have_sasl=yes],[have_sasl=no])
-      if test "x$have_sasl" = "xno" && test "x$with_sasl" = "xyes"; then
-        AC_MSG_ERROR([Cyrus SASL support requested but libsasl2 could not be found])
-      fi
-      if test "x$have_sasl" = "xyes"; then
-        AC_DEFINE([HAVE_SASL], 1, [whether Cyrus SASL is available for authentication])
-      fi
-    fi
-])
-
-# SPICE_CHECK_OPENSSL
-# -----------------
-# Check for the availability of openssl. If found, it will return the flags to
-# use in the OPENSSL_CFLAGS and OPENSSL_LIBS variables.
-#------------------
-AC_DEFUN([SPICE_CHECK_OPENSSL], [
-    PKG_CHECK_MODULES(OPENSSL, openssl)
-])
diff --git a/m4/spice_manual.m4 b/m4/spice_manual.m4
deleted file mode 100644
index c36f6f7..0000000
--- a/m4/spice_manual.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-dnl SPICE_MANUAL
-dnl ------------
-dnl Check if user wants manuals to be compiled and
-dnl if all programs (asciidoc and a2x) are available
-dnl ------------
-dnl Shell defines:
-dnl - have_asciidoc yes or not is asciidoc program is available
-dnl Automake macros:
-dnl - A2X a2x program or empty
-dnl - ASCIIDOC asciidoc program or emtpy
-dnl - BUILD_MANUAL if asciidoc and a2x are available
-dnl - BUILD_HTML_MANUAL if asciidoc is available (html can be produced)
-dnl - BUILD_CHUNKED_MANUAL if a2x is available
-AC_DEFUN([SPICE_MANUAL],[
-    AC_ARG_ENABLE([manual],
-                   AS_HELP_STRING([--enable-manual=@<:@auto/yes/no@:>@],
-                                  [Build SPICE manual]),
-                   [],
-                   [enable_manual="auto"])
-    if test "x$enable_manual" != "xno"; then
-        AC_PATH_PROG([ASCIIDOC], [asciidoc])
-        AS_IF([test -z "$ASCIIDOC" && test "x$enable_manual" = "xyes"],
-              [AC_MSG_ERROR([asciidoc is missing and build of manual was requested])])
-        AC_PATH_PROG([A2X], [a2x])
-        AS_IF([test -z "$A2X" && test "x$enable_manual" = "xyes"],
-              [AC_MSG_ERROR([a2x is missing and build of manual was requested])])
-    fi
-    AS_IF([test -n "$ASCIIDOC"], [have_asciidoc=yes], [have_asciidoc=no])
-    AM_CONDITIONAL([BUILD_MANUAL], [test -n "$ASCIIDOC" || test -n "$A2X"])
-    AM_CONDITIONAL([BUILD_HTML_MANUAL], [test -n "$ASCIIDOC"])
-    AM_CONDITIONAL([BUILD_CHUNKED_MANUAL], [test -n "$A2X"])
-])
diff --git a/python_modules/Makefile.am b/python_modules/Makefile.am
deleted file mode 100644
index 50e1a71..0000000
--- a/python_modules/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-NULL =
-
-PYTHON_MODULES =				\
-	__init__.py				\
-	codegen.py				\
-	demarshal.py				\
-	marshal.py				\
-	ptypes.py				\
-	spice_parser.py				\
-	$(NULL)
-
-EXTRA_DIST = $(PYTHON_MODULES)
-
-DISTCLEANFILES = *.pyc
-
--include $(top_srcdir)/git.mk
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index 5abf239..0000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,70 +0,0 @@
-NULL =
-
-TESTS = test_logging test_marshallers
-noinst_PROGRAMS = $(TESTS)
-
-test_logging_SOURCES = test-logging.c
-test_logging_CFLAGS =			\
-	-I$(top_srcdir)			\
-	$(GLIB2_CFLAGS)			\
-	$(GIO_UNIX_CFLAGS)		\
-	$(PROTOCOL_CFLAGS)		\
-	$(NULL)
-test_logging_LDADD =					\
-	$(top_builddir)/common/libspice-common.la	\
-	$(GLIB2_LIBS)			\
-	$(GIO_UNIX_LIBS)		\
-	$(NULL)
-
-
-test_marshallers_SOURCES =		\
-	generated_test_marshallers.c	\
-	generated_test_marshallers.h	\
-	generated_test_demarshallers.c	\
-	test-marshallers.c		\
-	test-marshallers.h		\
-	$(NULL)
-test_marshallers_CFLAGS =		\
-	-I$(top_srcdir)			\
-	$(GLIB2_CFLAGS)			\
-	$(PROTOCOL_CFLAGS)		\
-	$(NULL)
-test_marshallers_LDADD =				\
-	$(top_builddir)/common/libspice-common.la	\
-	$(GLIB2_LIBS)			\
-	$(NULL)
-
-# Avoid need for python(pyparsing) by end users
-TEST_MARSHALLERS =				\
-	generated_test_marshallers.c		\
-	generated_test_marshallers.h		\
-	generated_test_demarshallers.c		\
-	$(NULL)
-
-BUILT_SOURCES = $(TEST_MARSHALLERS)
-
-MARSHALLERS_DEPS =							\
-	$(top_srcdir)/python_modules/__init__.py		\
-	$(top_srcdir)/python_modules/codegen.py		\
-	$(top_srcdir)/python_modules/demarshal.py		\
-	$(top_srcdir)/python_modules/marshal.py		\
-	$(top_srcdir)/python_modules/ptypes.py		\
-	$(top_srcdir)/python_modules/spice_parser.py	\
-	$(top_srcdir)/spice_codegen.py			\
-	$(NULL)
-
-# Note despite being autogenerated these are not part of CLEANFILES, they are
-# actually a part of EXTRA_DIST, to avoid the need for pyparser by end users
-generated_test_marshallers.c: $(srcdir)/test-marshallers.proto $(MARSHALLERS_DEPS)
-	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers --server --include test-marshallers.h $< $@ >/dev/null
-generated_test_marshallers.h: $(srcdir)/test-marshallers.proto $(MARSHALLERS_DEPS)
-	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers --server --include test-marshallers.h -H $< $@ >/dev/null
-generated_test_demarshallers.c: $(srcdir)/test-marshallers.proto $(MARSHALLERS_DEPS)
-	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --client --include test-marshallers.h $< $@ >/dev/null
-
-EXTRA_DIST =				\
-	$(TEST_MARSHALLERS)		\
-	test-marshallers.proto		\
-	$(NULL)
-
--include $(top_srcdir)/git.mk
-- 
2.14.3



More information about the Spice-devel mailing list