Drop autotools support

Let's try to drop autotools support as meson is in place. There are a
few files that were not dropped though, as:
- cfg.mk
- maint.mk
- GNUmakefile
- build-aux/bracket-spacing.pl
- build-aux/gitlog-to-changelog
- build-aux/useless-if-before-free
- build-aux/vc-list-files

From the list above, build-aux/gitlog-to-changelog is currently used by
meson as part of the `dist`.

All the other files, with a few changes, will be useful for meson as,
with a few changes, we will be able have `ninja syntax-check` working.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

14 files changed, 0 insertions, 1869 deletions

diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index c9fd2c0..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,290 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
-
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-   On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
-this:
-
-     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CPP="gcc -E" CXXCPP="g++ -E"
-
-   This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
-   By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Particular systems
-==================
-
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
-     ./configure CC="cc -Ae"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
-
-     ./configure CC="cc"
-
-and if that doesn't work, try
-
-     ./configure CC="cc -nodtk"
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
-     Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
-     Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
-
-`--no-create'
-`-n'
-     Run the configure checks, but stop before creating any output
-     files.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 075c780..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,91 +0,0 @@
-
-SUBDIRS = osinfo tools docs po
-
-if ENABLE_TESTS
-SUBDIRS += tests
-endif
-
-EXTRA_DIST = \
-  COPYING.LIB \
-  libosinfo.spec \
-  libosinfo.spec.in \
-  mingw-libosinfo.spec.in \
-  build-aux/mktempd \
-  cfg.mk \
-  GNUmakefile \
-  maint.mk \
-  AUTHORS.in \
-  $(NULL)
-
-MAINTAINERCLEANFILES =				\
-	po/Makefile.in.in			\
-	po/Makevars.template			\
-	po/Rules-quot				\
-	po/boldquot.sed				\
-	po/en@boldquot.header			\
-	po/en@quot.header			\
-	po/insert-header.sin			\
-	po/quot.sed				\
-	po/remove-potcdate.sin			\
-	$(NULL)
-
-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
-
-ACLOCAL_AMFLAGS = -I m4
-
-
-CLEANFILES =
-
-if LOCAL_USB_IDS
-usb_database_DATA = usb.ids
-usb_databasedir = $(pkgdatadir)/
-usb.ids:
-	-wget -q -O $@ http://www.linux-usb.org/usb.ids
-CLEANFILES += usb.ids
-endif
-
-if LOCAL_PCI_IDS
-pci_database_DATA = pci.ids
-pci_databasedir = $(pkgdatadir)/
-pci.ids:
-	-wget -q -O $@ http://pciids.sourceforge.net/v2.2/pci.ids
-CLEANFILES += pci.ids
-endif
-
-LCOV = lcov
-GENHTML = genhtml
-
-cov: clean-cov
-	mkdir $(top_builddir)/coverage
-	$(LCOV) -c -o $(top_builddir)/coverage/libosinfo.info.tmp \
-	  -d $(top_builddir)/osinfo
-	$(LCOV) -r $(top_builddir)/coverage/libosinfo.info.tmp \
-	  -o $(top_builddir)/coverage/libosinfo.info
-	rm $(top_builddir)/coverage/libosinfo.info.tmp
-	$(GENHTML) --show-details -t "libosinfo" -o $(top_builddir)/coverage \
-	  --legend $(top_builddir)/coverage/libosinfo.info
-
-
-clean-cov:
-	rm -rf $(top_builddir)/coverage
-
-dist-hook: gen-ChangeLog gen-AUTHORS
-
-# Generate the ChangeLog file (with all entries since the switch to git)
-# and insert it into the directory we're about to use to create a tarball.
-.PHONY: gen-ChangeLog gen-AUTHORS
-gen-ChangeLog:
-	if test -d $(srcdir)/.git; then				\
-	  $(top_srcdir)/build-aux/gitlog-to-changelog		\
-	    > $(distdir)/cl-t;					\
-	  rm -f $(distdir)/ChangeLog;				\
-	  mv $(distdir)/cl-t $(distdir)/ChangeLog;		\
-	fi
-
-gen-AUTHORS:
-	$(AM_V_GEN)if test -d $(srcdir)/.git; then                      \
-	   out="`cd $(srcdir) && git log --pretty=format:'%aN <%aE>' | sort -u`" && \
-	  perl -p -e "s/#authorslist#// and print '$$out'"            \
-	     < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp &&        \
-	   mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ;           \
-	fi
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 2e7741e..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,37 +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"
-
-(test -f osinfo/osinfo_db.c) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level libosinfo directory"
-    exit 1
-}
-
-# Real ChangeLog/AUTHORS is auto-generated from GIT logs at
-# make dist time, but automake requires that it
-# exists at all times :-(
-touch ChangeLog AUTHORS
-
-aclocal --install || exit 1
-gtkdocize --copy || exit 1
-autoreconf --verbose --force --install || exit 1
-
-cd "$olddir"
-
-if [ "$NOCONFIGURE" = "" ]; then
-        $srcdir/configure "$@" || exit 1
-
-        if [ "$1" = "--help" ]; then
-                exit 0
-        else
-                echo "Now type 'make' to compile $PKG_NAME" || exit 1
-        fi
-else
-        echo "Skipping configure process."
-fi
diff --git a/build-aux/mktempd b/build-aux/mktempd
deleted file mode 100755
index ab3cf14..0000000
--- a/build-aux/mktempd
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/sh
-# Create a temporary directory, much like mktemp -d does.
-
-# Copyright (C) 2007-2012 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/>.
-
-# Written by Jim Meyering.
-
-# Usage: mktempd /tmp phoey.XXXXXXXXXX
-
-# First, try to use the mktemp program.
-# Failing that, we'll roll our own mktemp-like function:
-#  - try to get random bytes from /dev/urandom
-#  - failing that, generate output from a combination of quickly-varying
-#      sources and gzip.  Ignore non-varying gzip header, and extract
-#      "random" bits from there.
-#  - given those bits, map to file-name bytes using tr, and try to create
-#      the desired directory.
-#  - make only $MAX_TRIES attempts
-
-ME=`basename "$0"`
-die() { echo >&2 "$ME: $@"; exit 1; }
-
-MAX_TRIES=4
-
-rand_bytes()
-{
-  n=$1
-
-  chars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
-
-  dev_rand=/dev/urandom
-  if test -r "$dev_rand"; then
-    # Note: 256-length($chars) == 194; 3 copies of $chars is 186 + 8 = 194.
-    dd ibs=$n count=1 if="$dev_rand" 2>/dev/null \
-      | tr -c $chars 01234567$chars$chars$chars
-    return
-  fi
-
-  cmds='date; date +%N; free; who -a; w; ps auxww; ps ef; netstat -n'
-  data=` (eval "$cmds") 2>&1 | gzip `
-
-  n_plus_50=`expr $n + 50`
-
-  # Ensure that $data has length at least 50+$n
-  while :; do
-    len=`echo "$data"|wc -c`
-    test $n_plus_50 -le $len && break;
-    data=` (echo "$data"; eval "$cmds") 2>&1 | gzip `
-  done
-
-  echo "$data" \
-    | dd bs=1 skip=50 count=$n 2>/dev/null \
-    | tr -c $chars 01234567$chars$chars$chars
-}
-
-mktempd()
-{
-  case $# in
-  2);;
-  *) die "Usage: $ME DIR TEMPLATE";;
-  esac
-
-  destdir=$1
-  template=$2
-
-  # Disallow any trailing slash on specified destdir:
-  # it would subvert the post-mktemp "case"-based destdir test.
-  case $destdir in
-  /) ;;
-  */) die "invalid destination dir: remove trailing slash(es)";;
-  esac
-
-  case $template in
-  *XXXX) ;;
-  *) die "invalid template: $template (must have a suffix of at least 4 X's)";;
-  esac
-
-  fail=0
-
-  # First, try to use mktemp.
-  d=`env -u TMPDIR mktemp -d -t -p "$destdir" "$template" 2>/dev/null` \
-    || fail=1
-
-  # The resulting name must be in the specified directory.
-  case $d in "$destdir"*);; *) fail=1;; esac
-
-  # It must have created the directory.
-  test -d "$d" || fail=1
-
-  # It must have 0700 permissions.  Handle sticky "S" bits.
-  perms=`ls -dgo "$d" 2>/dev/null|tr S -` || fail=1
-  case $perms in drwx------*) ;; *) fail=1;; esac
-
-  test $fail = 0 && {
-    echo "$d"
-    return
-  }
-
-  # If we reach this point, we'll have to create a directory manually.
-
-  # Get a copy of the template without its suffix of X's.
-  base_template=`echo "$template"|sed 's/XX*$//'`
-
-  # Calculate how many X's we've just removed.
-  template_length=`echo "$template" | wc -c`
-  nx=`echo "$base_template" | wc -c`
-  nx=`expr $template_length - $nx`
-
-  err=
-  i=1
-  while :; do
-    X=`rand_bytes $nx`
-    candidate_dir="$destdir/$base_template$X"
-    err=`mkdir -m 0700 "$candidate_dir" 2>&1` \
-      && { echo "$candidate_dir"; return; }
-    test $MAX_TRIES -le $i && break;
-    i=`expr $i + 1`
-  done
-  die "$err"
-}
-
-mktempd "$@"
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index fd517da..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,288 +0,0 @@
-AC_INIT([libosinfo], [1.7.0], [libosinfo@redhat.com])
-AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.11.1 foreign color-tests tar-ustar])
-AC_PREREQ([2.61])
-AC_CONFIG_SRCDIR([osinfo/osinfo_db.c])
-AC_PROG_CC
-AC_PROG_LN_S
-
-LT_INIT([shared disable-static win32-dll])
-
-LIBOSINFO_COMPILE_WARNINGS
-AM_MAINTAINER_MODE([enable])
-
-# i18 support
-# FIXME: Remove AM_GNU_GETTEXT_VERSION once autoreconf supports REQUIRE_VERSION
-AM_GNU_GETTEXT_VERSION([0.19.7])
-AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.7])
-AM_GNU_GETTEXT([external])
-
-GETTEXT_PACKAGE=AC_PACKAGE_NAME
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[The name of the gettext domain])
-
-# Autoconf 2.61a.99 and earlier don't support linking a file only
-# in VPATH builds.  But since GNUmakefile is for maintainer use
-# only, it does not matter if we skip the link with older autoconf.
-# Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH
-# builds, so use a shell variable to bypass this.
-GNUmakefile=GNUmakefile
-m4_if(m4_version_compare([2.61a.100],
-        m4_defn([m4_PACKAGE_VERSION])), [1], [],
-      [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [],
-        [GNUmakefile=$GNUmakefile])])
-
-
-# Use the silent-rules feature when possible.
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-# Keep these two definitions in agreement.
-GLIB_MINIMUM_VERSION="2.44"
-GLIB_ENCODED_VERSION="GLIB_VERSION_2_44"
-
-PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= 2.6.0])
-PKG_CHECK_MODULES([LIBXSLT], [libxslt >= 1.0.0])
-PKG_CHECK_MODULES([LIBSOUP], [libsoup-2.4])
-
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= $GLIB_MINIMUM_VERSION gobject-2.0 gio-2.0])
-GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=$GLIB_ENCODED_VERSION"
-GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MAX_ALLOWED=$GLIB_ENCODED_VERSION"
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-
-GTK_DOC_CHECK([1.10],[--flavour no-tmpl])
-
-AC_ARG_ENABLE([tests],
-        AS_HELP_STRING([--enable-tests], [enable test suite]),
-        [], [enable_tests=yes])
-
-AM_CONDITIONAL([ENABLE_TESTS],[test "x$enable_tests" = "xyes"])
-
-LIBOSINFO_MAJOR_VERSION=`echo $VERSION | awk -F. '{print $1}'`
-LIBOSINFO_MINOR_VERSION=`echo $VERSION | awk -F. '{print $2}'`
-LIBOSINFO_MICRO_VERSION=`echo $VERSION | awk -F. '{print $3}'`
-LIBOSINFO_VERSION=$LIBOSINFO_MAJOR_VERSION.$LIBOSINFO_MINOR_VERSION.$LIBOSINFO_MICRO_VERSION$LIBOSINFO_MICRO_VERSION_SUFFIX
-LIBOSINFO_VERSION_NUMBER=`expr $LIBOSINFO_MAJOR_VERSION \* 1000000 + $LIBOSINFO_MINOR_VERSION \* 1000 + $LIBOSINFO_MICRO_VERSION`
-
-# In libtool terminology we need to figure out:
-#
-# CURRENT
-#     The most recent interface number that this library implements.
-#
-# REVISION
-#     The implementation number of the CURRENT interface.
-#
-# AGE
-#     The difference between the newest and oldest interfaces that this
-#     library implements.
-#
-# In other words, the library implements all the interface numbers
-# in the range from number `CURRENT - AGE' to `CURRENT'.
-#
-# Libtool assigns the soname version from `CURRENT - AGE', and we
-# don't want that to ever change in libosinfo. ie it must always be
-# zero, to produce libosinfo.so.0.
-#
-# We would, however, like the libosinfo version number reflected
-# in the so version'd symlinks, and this is based on AGE.REVISION
-# eg  libosinfo.so.0.AGE.REVISION
-#
-# Assuming we do ever want to break soname version, this can
-# toggled. But seriously, don't ever touch this.
-LIBOSINFO_SONUM=0
-
-# The following examples show what libtool will do
-#
-# Input: 0.3.0  ->   libosinfo.so.0.3.0
-# Input: 1.0.0  ->   libosinfo.so.0.1000.0
-# Input: 2.5.8  ->   libosinfo.so.0.2005.8
-#
-AGE=`expr $LIBOSINFO_MAJOR_VERSION '*' 1000 + $LIBOSINFO_MINOR_VERSION`
-REVISION=$LIBOSINFO_MICRO_VERSION
-CURRENT=`expr $LIBOSINFO_SONUM + $AGE`
-LIBOSINFO_VERSION_INFO=$CURRENT:$REVISION:$AGE
-
-AC_SUBST([LIBOSINFO_MAJOR_VERSION])
-AC_SUBST([LIBOSINFO_MINOR_VERSION])
-AC_SUBST([LIBOSINFO_MICRO_VERSION])
-AC_SUBST([LIBOSINFO_SONUM])
-AC_SUBST([LIBOSINFO_VERSION])
-AC_SUBST([LIBOSINFO_VERSION_INFO])
-AC_SUBST([LIBOSINFO_VERSION_NUMBER])
-
-NO_UNDEFINED_LDFLAGS=
-VERSION_SCRIPT_FLAGS=
-USE_VERSION_DEFS=0
-case "$host" in
-  *-*-mingw*)
-    VERSION_SCRIPT_FLAGS="-Wl,"
-    USE_VERSION_DEFS=1
-    NO_UNDEFINED_FLAGS="-no-undefined"
-    ;;
-
-  *-*-cygwin*)
-    NO_UNDEFINED_LDFLAGS="-no-undefined"
-    ;;
-
-  *darwin*)
-    NO_UNDEFINED_LDFLAGS="-Wl,-undefined,error"
-    ;;
-
-  *-*-solaris*)
-    NO_UNDEFINED_LDFLAGS="-zdefs"
-    ;;
-
-  *)
-    NO_UNDEFINED_FLAGS="-Wl,--no-undefined"
-    VERSION_SCRIPT_FLAGS=-Wl,--version-script=
-    `ld --help 2>&1 | grep -- --version-script >/dev/null` || \
-      VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
-    ;;
-esac
-AC_SUBST([NO_UNDEFINED_FLAGS])
-AC_SUBST([VERSION_SCRIPT_FLAGS])
-AM_CONDITIONAL([USE_VERSION_DEFS], [test "$USE_VERSION_DEFS" = "1"])
-
-with_linux=no
-case $host in
-  *-*-linux*) with_linux=yes ;;
-esac
-AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"])
-
-AC_PATH_PROG([PERL], [perl])
-if test -z "$PERL"; then
-  AC_MSG_ERROR([Failed to find perl.])
-fi
-
-GOBJECT_INTROSPECTION_CHECK([0.9.7])
-
-AC_ARG_ENABLE([vala],
-              AS_HELP_STRING([--enable-vala], [enable Vala binding generation]),
-              [], [enable_vala=check])
-if test "x$enable_introspection" = "xyes" ; then
-        if test "x$enable_vala" != "xno" ; then
-                AC_PATH_PROG(VAPIGEN, vapigen, no)
-                if test "x$VAPIGEN" != "xno"; then
-                        if test "x$enable_vala" == "xcheck" ; then
-                                enable_vala=yes
-                        fi
-                        AC_SUBST(VAPIGEN)
-                else
-                        if test "x$enable_vala" == "xyes" ; then
-                                AC_MSG_ERROR([Cannot find the "vapigen" binary in your PATH])
-                        fi
-                fi
-        fi
-fi
-AM_CONDITIONAL([WITH_VALA], [test "x$enable_vala" = "xyes"])
-
-AC_ARG_ENABLE([coverage],
-        AS_HELP_STRING([--enable-coverage], [enable GCC code coverage]),
-        [], [enable_coverage=no])
-
-
-COVERAGE_CFLAGS=
-COVERAGE_LDFLAGS=
-if test "x$enable_coverage" == "xyes" ; then
-  COVERAGE_CFLAGS="-fprofile-arcs -ftest-coverage"
-  COVERAGE_LDFLAGS="$COVERAGE_CFLAGS"
-fi
-AC_SUBST(COVERAGE_CFLAGS)
-AC_SUBST(COVERAGE_LDFLAGS)
-
-
-USB_ID_FILES="/usr/share/usb.ids /usr/share/misc/usb.ids \
-              /usr/share/hwdata/usb.ids /usr/local/share/usbids/usb.ids"
-
-AC_ARG_WITH(usb-ids-path,
-              [AC_HELP_STRING([--with-usb-ids-path],
-                              [Specify the path to usb.ids @<:@default=(internal)@:>@])])
-
-AC_MSG_CHECKING([location of usb.ids database])
-local_usb_ids=0
-if test -z "$with_usb_ids_path"
-then
-  if test $host = $build
-  then
-    for FILE in $USB_ID_FILES
-    do
-      if test -f $FILE
-      then
-        with_usb_ids_path="$FILE"
-        break
-      fi
-    done
-  fi
-
-  if test -z "$with_usb_ids_path"
-  then
-    local_usb_ids=1
-  fi
-fi
-AM_CONDITIONAL([LOCAL_USB_IDS], [test "$local_usb_ids" = "1"])
-if test -n "$with_usb_ids_path"
-then
-  AC_DEFINE_UNQUOTED([USB_IDS], ["$with_usb_ids_path"], ["location of usb.ids database"])
-  AC_MSG_RESULT([$with_usb_ids_path])
-else
-  AC_MSG_RESULT([<built-in>])
-fi
-
-
-PCI_ID_FILES="/usr/share/pci.ids /usr/share/misc/pci.ids \
-              /usr/share/hwdata/pci.ids /usr/local/share/pciids/pci.ids"
-
-AC_ARG_WITH(pci-ids-path,
-              [AC_HELP_STRING([--with-pci-ids-path],
-                              [Specify the path to pci.ids @<:@default=(internal)@:>@])])
-
-AC_MSG_CHECKING([location of pci.ids database])
-local_pci_ids=0
-if test -z "$with_pci_ids_path"
-then
-  if test $host = $build
-  then
-    for FILE in $PCI_ID_FILES
-    do
-      if test -f $FILE
-      then
-        with_pci_ids_path="$FILE"
-        break
-      fi
-    done
-  fi
-
-  if test -z "$with_pci_ids_path"
-  then
-    local_pci_ids=1
-  fi
-fi
-AM_CONDITIONAL([LOCAL_PCI_IDS], [test "$local_pci_ids" = "1"])
-if test -n "$with_pci_ids_path"
-then
-  AC_DEFINE_UNQUOTED([PCI_IDS], ["$with_pci_ids_path"], ["location of pci.ids database"])
-  AC_MSG_RESULT([$with_pci_ids_path])
-else
-  AC_MSG_RESULT([<built-in>])
-fi
-
-
-# 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)
-
-AC_CONFIG_FILES([
-	Makefile
-	libosinfo.spec
-	mingw-libosinfo.spec
-	osinfo/Makefile
-	osinfo/libosinfo-1.0.pc
-	osinfo/osinfo_version.h
-	tools/Makefile
-	tests/Makefile
-	docs/Makefile
-	docs/reference/Makefile
-	po/Makefile.in
-])
-AC_OUTPUT
diff --git a/docs/Makefile.am b/docs/Makefile.am
deleted file mode 100644
index cac25f2..0000000
--- a/docs/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-
-SUBDIRS = reference
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
deleted file mode 100644
index 5b516ed..0000000
--- a/docs/reference/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-
-DOC_MODULE=Libosinfo
-
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
-
-DOC_SOURCE_DIR=$(top_srcdir)/osinfo $(top_builddir)/osinfo
-
-SCANGOBJ_OPTIONS=
-
-SCAN_OPTIONS=--rebuild-sections --rebuild-types
-
-MKDB_OPTIONS=--sgml-mode --output-format=xml
-
-MKTMPL_OPTIONS=
-
-MKHTML_OPTIONS=
-
-FIXXREF_OPTIONS=
-
-HFILE_GLOB=$(top_srcdir)/osinfo/*.h $(top_builddir)/osinfo/*.h
-CFILE_GLOB=$(top_srcdir)/osinfo/*.c $(top_builddir)/osinfo/*.c
-
-IGNORE_HFILES=
-
-HTML_IMAGES=
-
-content_files=
-
-expand_content_files=
-
-GTKDOC_CFLAGS= \
-	$(LIBXML_CFLAGS) \
-	$(GOBJECT_CFLAGS)\
-	$(GIO_CFLAGS)
-GTKDOC_LIBS = \
-	$(LIBXML_LIBS) \
-	$(GOBJECT_LIBS) \
-	$(GIO_LIBS) \
-	$(top_builddir)/osinfo/libosinfo-1.0.la
-
-include $(top_srcdir)/gtk-doc.make
diff --git a/m4/libosinfo-compile-warnings.m4 b/m4/libosinfo-compile-warnings.m4
deleted file mode 100644
index d01c975..0000000
--- a/m4/libosinfo-compile-warnings.m4
+++ /dev/null
@@ -1,142 +0,0 @@
-dnl
-dnl Enable all known GCC compiler warnings, except for those
-dnl we can't yet cope with
-dnl
-AC_DEFUN([LIBOSINFO_COMPILE_WARNINGS],[
-    dnl ******************************
-    dnl More compiler warnings
-    dnl ******************************
-
-    AC_ARG_ENABLE([werror],
-                  AS_HELP_STRING([--enable-werror], [Use -Werror (if supported)]),
-                  [set_werror="$enableval"],
-                  [if test -d $srcdir/.git; then
-                     is_git_version=true
-                     set_werror=yes
-                   else
-                     set_werror=no
-                   fi])
-
-    # List of warnings that are not relevant / wanted
-
-    # Don't care about C++ compiler compat
-    dontwarn="$dontwarn -Wc++-compat"
-    dontwarn="$dontwarn -Wabi"
-    dontwarn="$dontwarn -Wdeprecated"
-    # Don't care about ancient C standard compat
-    dontwarn="$dontwarn -Wtraditional"
-    # Don't care about ancient C standard compat
-    dontwarn="$dontwarn -Wtraditional-conversion"
-    # Ignore warnings in /usr/include
-    dontwarn="$dontwarn -Wsystem-headers"
-    # Happy for compiler to add struct padding
-    dontwarn="$dontwarn -Wpadded"
-    # GCC very confused with -O2
-    dontwarn="$dontwarn -Wunreachable-code"
-    # We explicitly need to remove const sometimes
-    dontwarn="$dontwarn -Wcast-qual"
-    # Allow vars decl in the middle of blocks
-    dontwarn="$dontwarn -Wdeclaration-after-statement"
-    # Using long long is fine
-    dontwarn="$dontwarn -Wlong-long"
-    # Unused macros are ok
-    dontwarn="$dontwarn -Wunused-macros"
-    # This isn't warning about code bugs, it is telling
-    # you about loops which the compiler can't optimize
-    # due to unpredictable boundary conditions
-    dontwarn="$dontwarn -Wunsafe-loop-optimizations"
-
-
-    # g_clear_object & G_ATOMIC_OP_USE_GCC_BUILTINS causes
-    # violations with this. XXX Fix glib ?
-    dontwarn="$dontwarn -Wbad-function-cast"
-
-    # We want to allow either a defualt, or all cases
-    # but don't require both
-    dontwarn="$dontwarn -Wswitch-default"
-    dontwarn="$dontwarn -Wswitch-enum"
-
-    # Get all possible GCC warnings
-    gl_MANYWARN_ALL_GCC([maybewarn])
-
-    # Remove the ones we don't want, blacklisted earlier
-    gl_MANYWARN_COMPLEMENT([wantwarn], [$maybewarn], [$dontwarn])
-
-    # We do "bad" function casts due to G_DEFINE_TYPE and more
-    wantwarn="$wantwarn -Wno-cast-function-type"
-
-    # Check for $CC support of each warning
-    for w in $wantwarn; do
-      gl_WARN_ADD([$w])
-    done
-
-    # GNULIB uses '-W' (aka -Wextra) which includes a bunch of stuff.
-    # Unfortunately, this means you can't simply use '-Wsign-compare'
-    # with gl_MANYWARN_COMPLEMENT
-    # So we have -W enabled, and then have to explicitly turn off...
-    gl_WARN_ADD([-Wno-sign-compare])
-
-    # Due to gutils.h bug in g_bit_storage
-    gl_WARN_ADD([-Wno-sign-conversion])
-    gl_WARN_ADD([-Wno-conversion])
-    gl_WARN_ADD([-Wno-unused-parameter])
-
-
-
-    # GNULIB expects this to be part of -Wc++-compat, but we turn
-    # that one off, so we need to manually enable this again
-    gl_WARN_ADD([-Wjump-misses-init])
-
-    # This should be < 256 really. Currently we're down to 4096,
-    # but using 1024 bytes sized buffers (mostly for virStrerror)
-    # stops us from going down further
-    gl_WARN_ADD([-Wframe-larger-than=4096])
-
-    # We don't care too much about C90 compliance
-    gl_WARN_ADD([-Wno-overlength-strings])
-
-    # Use improved glibc headers
-    AH_VERBATIM([FORTIFY_SOURCE],
-    [/* Enable compile-time and run-time bounds-checking, and some warnings,
-        without upsetting newer glibc. */
-     #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__
-     # define _FORTIFY_SOURCE 2
-     #endif
-    ])
-
-    # Extra special flags
-    dnl -fstack-protector stuff passes gl_WARN_ADD with gcc
-    dnl on Mingw32, but fails when actually used
-    case $host in
-       *-*-linux*)
-       dnl Fedora only uses -fstack-protector, but doesn't seem to
-       dnl be great overhead in adding -fstack-protector-all instead
-       dnl gl_WARN_ADD([-fstack-protector])
-       gl_WARN_ADD([-fstack-protector-all])
-       gl_WARN_ADD([--param=ssp-buffer-size=4])
-       ;;
-    esac
-    gl_WARN_ADD([-fexceptions])
-    gl_WARN_ADD([-fasynchronous-unwind-tables])
-    gl_WARN_ADD([-fdiagnostics-show-option])
-    gl_WARN_ADD([-funit-at-a-time])
-
-    # Need -fipa-pure-const in order to make -Wsuggest-attribute=pure
-    # fire even without -O.
-    gl_WARN_ADD([-fipa-pure-const])
-
-    # We should eventually enable this, but right now there are at
-    # least 75 functions triggering warnings.
-    gl_WARN_ADD([-Wno-suggest-attribute=pure])
-    gl_WARN_ADD([-Wno-suggest-attribute=const])
-
-
-    if test "$set_werror" = "yes"
-    then
-      gl_WARN_ADD([-Werror])
-    fi
-
-    WARN_LDFLAGS=$WARN_CFLAGS
-    AC_SUBST([WARN_CFLAGS])
-    AC_SUBST([WARN_LDFLAGS])
-])
diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4
deleted file mode 100644
index 3e6dd21..0000000
--- a/m4/manywarnings.m4
+++ /dev/null
@@ -1,245 +0,0 @@
-# manywarnings.m4 serial 7
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Simon Josefsson
-
-# gl_MANYWARN_COMPLEMENT(OUTVAR, LISTVAR, REMOVEVAR)
-# --------------------------------------------------
-# Copy LISTVAR to OUTVAR except for the entries in REMOVEVAR.
-# Elements separated by whitespace.  In set logic terms, the function
-# does OUTVAR = LISTVAR \ REMOVEVAR.
-AC_DEFUN([gl_MANYWARN_COMPLEMENT],
-[
-  gl_warn_set=
-  set x $2; shift
-  for gl_warn_item
-  do
-    case " $3 " in
-      *" $gl_warn_item "*)
-        ;;
-      *)
-        gl_warn_set="$gl_warn_set $gl_warn_item"
-        ;;
-    esac
-  done
-  $1=$gl_warn_set
-])
-
-# gl_MANYWARN_ALL_GCC(VARIABLE)
-# -----------------------------
-# Add all documented GCC warning parameters to variable VARIABLE.
-# Note that you need to test them using gl_WARN_ADD if you want to
-# make sure your gcc understands it.
-AC_DEFUN([gl_MANYWARN_ALL_GCC],
-[
-  dnl First, check for some issues that only occur when combining multiple
-  dnl gcc warning categories.
-  AC_REQUIRE([AC_PROG_CC])
-  if test -n "$GCC"; then
-
-    dnl Check if -W -Werror -Wno-missing-field-initializers is supported
-    dnl with the current $CC $CFLAGS $CPPFLAGS.
-    AC_MSG_CHECKING([whether -Wno-missing-field-initializers is supported])
-    AC_CACHE_VAL([gl_cv_cc_nomfi_supported], [
-      gl_save_CFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS -W -Werror -Wno-missing-field-initializers"
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM([[]], [[]])],
-        [gl_cv_cc_nomfi_supported=yes],
-        [gl_cv_cc_nomfi_supported=no])
-      CFLAGS="$gl_save_CFLAGS"])
-    AC_MSG_RESULT([$gl_cv_cc_nomfi_supported])
-
-    if test "$gl_cv_cc_nomfi_supported" = yes; then
-      dnl Now check whether -Wno-missing-field-initializers is needed
-      dnl for the { 0, } construct.
-      AC_MSG_CHECKING([whether -Wno-missing-field-initializers is needed])
-      AC_CACHE_VAL([gl_cv_cc_nomfi_needed], [
-        gl_save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS -W -Werror"
-        AC_COMPILE_IFELSE(
-          [AC_LANG_PROGRAM(
-             [[void f (void)
-               {
-                 typedef struct { int a; int b; } s_t;
-                 s_t s1 = { 0, };
-               }
-             ]],
-             [[]])],
-          [gl_cv_cc_nomfi_needed=no],
-          [gl_cv_cc_nomfi_needed=yes])
-        CFLAGS="$gl_save_CFLAGS"
-      ])
-      AC_MSG_RESULT([$gl_cv_cc_nomfi_needed])
-    fi
-
-    dnl Next, check if -Werror -Wuninitialized is useful with the
-    dnl user's choice of $CFLAGS; some versions of gcc warn that it
-    dnl has no effect if -O is not also used
-    AC_MSG_CHECKING([whether -Wuninitialized is supported])
-    AC_CACHE_VAL([gl_cv_cc_uninitialized_supported], [
-      gl_save_CFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS -Werror -Wuninitialized"
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM([[]], [[]])],
-        [gl_cv_cc_uninitialized_supported=yes],
-        [gl_cv_cc_uninitialized_supported=no])
-      CFLAGS="$gl_save_CFLAGS"])
-    AC_MSG_RESULT([$gl_cv_cc_uninitialized_supported])
-
-  fi
-
-  # List all gcc warning categories.
-  # To compare this list to your installed GCC's, run this Bash command:
-  #
-  # comm -3 \
-  #  <(sed -n 's/^  *\(-[^ ]*\) .*/\1/p' manywarnings.m4 | sort) \
-  #  <(gcc --help=warnings | sed -n 's/^  \(-[^ ]*\) .*/\1/p' | sort |
-  #      grep -v -x -f <(
-  #         awk '/^[^#]/ {print $1}' ../build-aux/gcc-warning.spec))
-
-  gl_manywarn_set=
-  for gl_manywarn_item in \
-    -W \
-    -Wabi \
-    -Waddress \
-    -Waggressive-loop-optimizations \
-    -Wall \
-    -Warray-bounds \
-    -Wattributes \
-    -Wbad-function-cast \
-    -Wbuiltin-macro-redefined \
-    -Wcast-align \
-    -Wchar-subscripts \
-    -Wclobbered \
-    -Wcomment \
-    -Wcomments \
-    -Wcoverage-mismatch \
-    -Wcpp \
-    -Wdate-time \
-    -Wdeprecated \
-    -Wdeprecated-declarations \
-    -Wdisabled-optimization \
-    -Wdiv-by-zero \
-    -Wdouble-promotion \
-    -Wempty-body \
-    -Wendif-labels \
-    -Wenum-compare \
-    -Wextra \
-    -Wformat-contains-nul \
-    -Wformat-extra-args \
-    -Wformat-nonliteral \
-    -Wformat-security \
-    -Wformat-y2k \
-    -Wformat-zero-length \
-    -Wfree-nonheap-object \
-    -Wignored-qualifiers \
-    -Wimplicit \
-    -Wimplicit-function-declaration \
-    -Wimplicit-int \
-    -Winit-self \
-    -Winline \
-    -Wint-to-pointer-cast \
-    -Winvalid-memory-model \
-    -Winvalid-pch \
-    -Wjump-misses-init \
-    -Wlogical-op \
-    -Wmain \
-    -Wmaybe-uninitialized \
-    -Wmissing-braces \
-    -Wmissing-declarations \
-    -Wmissing-field-initializers \
-    -Wmissing-include-dirs \
-    -Wmissing-parameter-type \
-    -Wmissing-prototypes \
-    -Wmultichar \
-    -Wnarrowing \
-    -Wnested-externs \
-    -Wnonnull \
-    -Wold-style-declaration \
-    -Wold-style-definition \
-    -Wopenmp-simd \
-    -Woverflow \
-    -Woverlength-strings \
-    -Woverride-init \
-    -Wpacked \
-    -Wpacked-bitfield-compat \
-    -Wparentheses \
-    -Wpointer-arith \
-    -Wpointer-sign \
-    -Wpointer-to-int-cast \
-    -Wpragmas \
-    -Wreturn-local-addr \
-    -Wreturn-type \
-    -Wsequence-point \
-    -Wshadow \
-    -Wsizeof-pointer-memaccess \
-    -Wstack-protector \
-    -Wstrict-aliasing \
-    -Wstrict-overflow \
-    -Wstrict-prototypes \
-    -Wsuggest-attribute=const \
-    -Wsuggest-attribute=format \
-    -Wsuggest-attribute=noreturn \
-    -Wsuggest-attribute=pure \
-    -Wswitch \
-    -Wswitch-default \
-    -Wsync-nand \
-    -Wsystem-headers \
-    -Wtrampolines \
-    -Wtrigraphs \
-    -Wtype-limits \
-    -Wuninitialized \
-    -Wunknown-pragmas \
-    -Wunsafe-loop-optimizations \
-    -Wunused \
-    -Wunused-but-set-parameter \
-    -Wunused-but-set-variable \
-    -Wunused-function \
-    -Wunused-label \
-    -Wunused-local-typedefs \
-    -Wunused-macros \
-    -Wunused-parameter \
-    -Wunused-result \
-    -Wunused-value \
-    -Wunused-variable \
-    -Wvarargs \
-    -Wvariadic-macros \
-    -Wvector-operation-performance \
-    -Wvla \
-    -Wvolatile-register-var \
-    -Wwrite-strings \
-    \
-    ; do
-    gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item"
-  done
-
-  # gcc --help=warnings outputs an unusual form for this option; list
-  # it here so that the above 'comm' command doesn't report a false match.
-  gl_manywarn_set="$gl_manywarn_set -Wnormalized=nfc"
-
-  # These are needed for older GCC versions.
-  if test -n "$GCC"; then
-    case `($CC --version) 2>/dev/null` in
-      'gcc (GCC) '[[0-3]].* | \
-      'gcc (GCC) '4.[[0-7]].*)
-        gl_manywarn_set="$gl_manywarn_set -fdiagnostics-show-option"
-        gl_manywarn_set="$gl_manywarn_set -funit-at-a-time"
-          ;;
-    esac
-  fi
-
-  # Disable specific options as needed.
-  if test "$gl_cv_cc_nomfi_needed" = yes; then
-    gl_manywarn_set="$gl_manywarn_set -Wno-missing-field-initializers"
-  fi
-
-  if test "$gl_cv_cc_uninitialized_supported" = no; then
-    gl_manywarn_set="$gl_manywarn_set -Wno-uninitialized"
-  fi
-
-  $1=$gl_manywarn_set
-])
diff --git a/m4/warnings.m4 b/m4/warnings.m4
deleted file mode 100644
index e3d239b..0000000
--- a/m4/warnings.m4
+++ /dev/null
@@ -1,79 +0,0 @@
-# warnings.m4 serial 11
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Simon Josefsson
-
-# gl_AS_VAR_APPEND(VAR, VALUE)
-# ----------------------------
-# Provide the functionality of AS_VAR_APPEND if Autoconf does not have it.
-m4_ifdef([AS_VAR_APPEND],
-[m4_copy([AS_VAR_APPEND], [gl_AS_VAR_APPEND])],
-[m4_define([gl_AS_VAR_APPEND],
-[AS_VAR_SET([$1], [AS_VAR_GET([$1])$2])])])
-
-
-# gl_COMPILER_OPTION_IF(OPTION, [IF-SUPPORTED], [IF-NOT-SUPPORTED],
-#                       [PROGRAM = AC_LANG_PROGRAM()])
-# -----------------------------------------------------------------
-# Check if the compiler supports OPTION when compiling PROGRAM.
-#
-# FIXME: gl_Warn must be used unquoted until we can assume Autoconf
-# 2.64 or newer.
-AC_DEFUN([gl_COMPILER_OPTION_IF],
-[AS_VAR_PUSHDEF([gl_Warn], [gl_cv_warn_[]_AC_LANG_ABBREV[]_$1])dnl
-AS_VAR_PUSHDEF([gl_Flags], [_AC_LANG_PREFIX[]FLAGS])dnl
-AS_LITERAL_IF([$1],
-  [m4_pushdef([gl_Positive], m4_bpatsubst([$1], [^-Wno-], [-W]))],
-  [gl_positive="$1"
-case $gl_positive in
-  -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-\(.*\)'` ;;
-esac
-m4_pushdef([gl_Positive], [$gl_positive])])dnl
-AC_CACHE_CHECK([whether _AC_LANG compiler handles $1], m4_defn([gl_Warn]), [
-  gl_save_compiler_FLAGS="$gl_Flags"
-  gl_AS_VAR_APPEND(m4_defn([gl_Flags]),
-    [" $gl_unknown_warnings_are_errors ]m4_defn([gl_Positive])["])
-  AC_LINK_IFELSE([m4_default([$4], [AC_LANG_PROGRAM([])])],
-                 [AS_VAR_SET(gl_Warn, [yes])],
-                 [AS_VAR_SET(gl_Warn, [no])])
-  gl_Flags="$gl_save_compiler_FLAGS"
-])
-AS_VAR_IF(gl_Warn, [yes], [$2], [$3])
-m4_popdef([gl_Positive])dnl
-AS_VAR_POPDEF([gl_Flags])dnl
-AS_VAR_POPDEF([gl_Warn])dnl
-])
-
-# gl_UNKNOWN_WARNINGS_ARE_ERRORS
-# ------------------------------
-# Clang doesn't complain about unknown warning options unless one also
-# specifies -Wunknown-warning-option -Werror.  Detect this.
-AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS],
-[gl_COMPILER_OPTION_IF([-Werror -Wunknown-warning-option],
-   [gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror'],
-   [gl_unknown_warnings_are_errors=])])
-
-# gl_WARN_ADD(OPTION, [VARIABLE = WARN_CFLAGS],
-#             [PROGRAM = AC_LANG_PROGRAM()])
-# ---------------------------------------------
-# Adds parameter to WARN_CFLAGS if the compiler supports it when
-# compiling PROGRAM.  For example, gl_WARN_ADD([-Wparentheses]).
-#
-# If VARIABLE is a variable name, AC_SUBST it.
-AC_DEFUN([gl_WARN_ADD],
-[AC_REQUIRE([gl_UNKNOWN_WARNINGS_ARE_ERRORS])
-gl_COMPILER_OPTION_IF([$1],
-  [gl_AS_VAR_APPEND(m4_if([$2], [], [[WARN_CFLAGS]], [[$2]]), [" $1"])],
-  [],
-  [$3])
-m4_ifval([$2],
-         [AS_LITERAL_IF([$2], [AC_SUBST([$2])])],
-         [AC_SUBST([WARN_CFLAGS])])dnl
-])
-
-# Local Variables:
-# mode: autoconf
-# End:
diff --git a/osinfo/Makefile.am b/osinfo/Makefile.am
deleted file mode 100644
index f97180c..0000000
--- a/osinfo/Makefile.am
+++ /dev/null
@@ -1,252 +0,0 @@
-DISTCLEANFILES =
-EXTRA_DIST = libosinfo.syms \
-	     osinfo_enum_types.h.template \
-	     osinfo_enum_types.c.template
-
-BUILT_SOURCES = osinfo_enum_types.c \
-		osinfo_enum_types.h
-
-if USE_VERSION_DEFS
-LIBOSINFO_VERSION_FILE = $(builddir)/libosinfo.def
-BUILT_SOURCES += $(LIBOSINFO_VERSION_FILE)
-
-%.def: %.syms
-	$(AM_V_GEN)rm -f -- $@-tmp $@ ; \
-	printf 'EXPORTS\n' > $@-tmp && \
-	sed -e '/^$$/d; /#/d; /:/d; /\}/d; /\*/d; /LIBOSINFO_/d; s/[ \t]*\(.*\)\;/    \1/g' $^ >> $@-tmp && \
-	chmod a-w $@-tmp && \
-	mv $@-tmp $@
-
-else
-LIBOSINFO_VERSION_FILE = $(srcdir)/libosinfo.syms
-endif
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libosinfo-1.0.pc
-
-lib_LTLIBRARIES = libosinfo-1.0.la
-
-libosinfo_1_0_la_SOURCES =
-
-libosinfo_1_0_la_LIBADD = libosinfo-impl.la
-
-libosinfo_1_0_la_LDFLAGS = \
-	$(COVERAGE_LDFLAGS) \
-	$(VERSION_SCRIPT_FLAGS)$(LIBOSINFO_VERSION_FILE) \
-        -version-info $(LIBOSINFO_VERSION_INFO) \
-	$(NO_UNDEFINED_FLAGS)
-
-EXTRA_libosinfo_1_0_la_DEPENDENCIES = libosinfo.syms
-
-noinst_LTLIBRARIES = libosinfo-impl.la
-
-libosinfo_impl_la_CFLAGS = \
-	$(WARN_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_builddir) \
-	$(LIBXML_CFLAGS) \
-	$(LIBXSLT_CFLAGS) \
-	$(GOBJECT_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(GIO_CFLAGS) \
-	$(LIBSOUP_CFLAGS) \
-	-DDATA_DIR='"$(datadir)"' \
-	-DPKG_DATA_DIR='"$(pkgdatadir)"' \
-	-DSYS_CONF_DIR='"$(sysconfdir)"' \
-	-DLOCALEDIR="\"$(datadir)/locale\"" \
-	$(NULL)
-
-libosinfo_impl_la_LIBADD = \
-	$(LIBXML_LIBS) \
-	$(LIBXSLT_LIBS) \
-	$(GOBJECT_LIBS) \
-	$(GLIB_LIBS) \
-	$(GIO_LIBS) \
-	$(LIBSOUP_LIBS) \
-	$(NULL)
-
-libosinfo_impl_includedir = $(includedir)/libosinfo-1.0/osinfo
-
-libosinfo_impl_include_HEADERS =		\
-  osinfo.h				\
-  osinfo_avatar_format.h		\
-  osinfo_db.h				\
-  osinfo_loader.h			\
-  osinfo_datamap.h			\
-  osinfo_datamaplist.h			\
-  osinfo_device.h			\
-  osinfo_devicelink.h			\
-  osinfo_devicelist.h			\
-  osinfo_devicelinklist.h		\
-  osinfo_devicelinkfilter.h		\
-  osinfo_device_driver.h		\
-  osinfo_device_driverlist.h		\
-  osinfo_entity.h			\
-  osinfo_filter.h			\
-  osinfo_firmware.h			\
-  osinfo_firmwarelist.h			\
-  osinfo_install_config.h		\
-  osinfo_install_config_param.h		\
-  osinfo_install_config_paramlist.h	\
-  osinfo_install_script.h		\
-  osinfo_install_scriptlist.h		\
-  osinfo_product.h			\
-  osinfo_productfilter.h		\
-  osinfo_productlist.h			\
-  osinfo_platform.h			\
-  osinfo_platformlist.h			\
-  osinfo_list.h				\
-  osinfo_os.h				\
-  osinfo_oslist.h			\
-  osinfo_os_variant.h			\
-  osinfo_os_variantlist.h		\
-  osinfo_deployment.h			\
-  osinfo_deploymentlist.h		\
-  osinfo_media.h			\
-  osinfo_medialist.h			\
-  osinfo_resources.h			\
-  osinfo_resourceslist.h		\
-  osinfo_tree.h				\
-  osinfo_treelist.h			\
-  osinfo_image.h			\
-  osinfo_imagelist.h		\
-  $(NULL)
-
-nodist_libosinfo_impl_include_HEADERS =	\
-  osinfo_version.h			\
-  osinfo_enum_types.h			\
-  $(NULL)
-
-libosinfo_c_files =		\
-  osinfo_avatar_format.c		\
-  osinfo_datamap.c			\
-  osinfo_datamaplist.c			\
-  osinfo_entity.c			\
-  osinfo_filter.c			\
-  osinfo_firmware.c			\
-  osinfo_firmwarelist.c			\
-  osinfo_list.c				\
-  osinfo_device.c			\
-  osinfo_devicelink.c			\
-  osinfo_devicelist.c			\
-  osinfo_devicelinklist.c		\
-  osinfo_devicelinkfilter.c		\
-  osinfo_device_driver.c		\
-  osinfo_device_driverlist.c		\
-  osinfo_install_config.c		\
-  osinfo_install_config_param.c		\
-  osinfo_install_config_paramlist.c	\
-  osinfo_install_script.c		\
-  osinfo_install_scriptlist.c		\
-  osinfo_product.c			\
-  osinfo_productfilter.c		\
-  osinfo_productlist.c			\
-  osinfo_platform.c			\
-  osinfo_platformlist.c			\
-  osinfo_oslist.c			\
-  osinfo_os.c				\
-  osinfo_os_variant.c			\
-  osinfo_os_variantlist.c		\
-  osinfo_deployment.c			\
-  osinfo_deploymentlist.c		\
-  osinfo_media.c			\
-  osinfo_medialist.c			\
-  osinfo_resources.c			\
-  osinfo_resourceslist.c		\
-  osinfo_tree.c				\
-  osinfo_treelist.c			\
-  osinfo_image.c			\
-  osinfo_imagelist.c		\
-  osinfo_db.c				\
-  osinfo_loader.c			\
-  osinfo_util_private.c		\
-  $(NULL)
-
-libosinfo_private_header_files =	\
-  osinfo_device_driver_private.h	\
-  osinfo_install_script_private.h	\
-  osinfo_product_private.h		\
-  osinfo_media_private.h		\
-  osinfo_resources_private.h		\
-  osinfo_util_private.h		\
-  ignore-value.h			\
-  $(NULL)
-
-libosinfo_impl_la_SOURCES =		\
-  $(libosinfo_c_files)			\
-  $(libosinfo_private_header_files)	\
-  $(NULL)
-
-nodist_libosinfo_impl_la_SOURCES =	\
-  osinfo_enum_types.c			\
-  $(NULL)
-
-osinfo_enum_types.h: $(libosinfo_impl_include_HEADERS) osinfo_enum_types.h.template
-	$(AM_V_GEN) ( LC_ALL= LANG=C LC_CTYPE=en_US.UTF-8 $(GLIB_MKENUMS) --template $(srcdir)/osinfo_enum_types.h.template $(libosinfo_impl_include_HEADERS:%=$(srcdir)/%) ) > $@
-
-osinfo_enum_types.c: $(OSINFO_HEADER_FILES) osinfo_enum_types.c.template osinfo_enum_types.h
-	$(AM_V_GEN) ( LC_ALL= LANG=C LC_CTYPE=en_US.UTF-8 $(GLIB_MKENUMS) --template $(srcdir)/osinfo_enum_types.c.template $(libosinfo_impl_include_HEADERS:%=$(srcdir)/%) ) > $@
-
-DISTCLEANFILES +=				\
-	osinfo_enum_types.c			\
-	osinfo_enum_types.h			\
-	$(NULL)
-
-# .libs/libosinfo.so is built by libtool as a side-effect of the Makefile
-# rule for libosinfo.la.  However, checking symbols relies on Linux ELF layout
-if WITH_LINUX
-check-symfile: libosinfo.syms libosinfo-1.0.la
-	$(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl $(srcdir)/libosinfo.syms \
-	  .libs/libosinfo-1.0.so
-else ! WITH_LINUX
-check-symfile:
-endif ! WITH_LINUX
-check-symsorting:
-	$(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl \
-		$(srcdir) $(srcdir)/libosinfo.syms
-EXTRA_DIST += check-symfile.pl check-symsorting.pl
-
-check-local: check-symfile check-symsorting
-
--include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS =
-CLEANFILES =
-
-if HAVE_INTROSPECTION
-
-Libosinfo-1.0.gir: libosinfo-1.0.la
-Libosinfo_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0 libxml2-2.0
-Libosinfo_1_0_gir_PACKAGES = gobject-2.0 gio-2.0 libxml-2.0 libxslt
-Libosinfo_1_0_gir_EXPORT_PACKAGES = libosinfo-1.0
-Libosinfo_1_0_gir_LIBS = libosinfo-1.0.la
-Libosinfo_1_0_gir_FILES = $(libosinfo_impl_include_HEADERS) $(nodist_libosinfo_impl_include_HEADERS) $(libosinfo_c_files) $(nodist_libosinfo_impl_la_SOURCES)
-Libosinfo_1_0_gir_CFLAGS = $(libosinfo_impl_la_CFLAGS)
-Libosinfo_1_0_gir_SCANNERFLAGS = --identifier-prefix=Osinfo --symbol-prefix=osinfo --c-include="osinfo/osinfo.h"
-INTROSPECTION_GIRS += Libosinfo-1.0.gir
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = Libosinfo-1.0.gir
-
-typelibdir = $(libdir)/girepository-1.0
-typelib_DATA = Libosinfo-1.0.typelib
-
-CLEANFILES += $(gir_DATA) $(typelib_DATA)
-
-if WITH_VALA
-vapidir = $(datadir)/vala/vapi
-vapi_DATA = libosinfo-1.0.vapi
-
-libosinfo-1.0.vapi: Libosinfo-1.0.gir Libosinfo-1.0.typelib
-	$(AM_V_GEN)$(VAPIGEN) \
-		--vapidir=. \
-		--pkg gobject-2.0 \
-		--pkg gio-2.0 \
-		--library libosinfo-1.0 \
-		Libosinfo-1.0.gir
-
-endif # WITH_VALA
-
-CLEANFILES += $(gir_DATA) $(typelibs_DATA) $(vapi_DATA) $(wildcard *.gcno)
-
-endif # HAVE_INTROSPECTION
diff --git a/po/Makevars b/po/Makevars
deleted file mode 100644
index bb1c54a..0000000
--- a/po/Makevars
+++ /dev/null
@@ -1,78 +0,0 @@
-# Makefile variables for PO directory in any package using GNU gettext.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
-
-# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --add-comments
-
-# This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-# package.  (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.)  Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright.  The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER = The libosinfo Authors.
-
-# This tells whether or not to prepend "GNU " prefix to the package
-# name that gets inserted into the header of the $(DOMAIN).pot file.
-# Possible values are "yes", "no", or empty.  If it is empty, try to
-# detect it automatically by scanning the files in $(top_srcdir) for
-# "GNU packagename" string.
-PACKAGE_GNU = no
-
-# This is the email address or URL to which the translators shall report
-# bugs in the untranslated strings:
-# - Strings which are not entire sentences, see the maintainer guidelines
-#   in the GNU gettext documentation, section 'Preparing Strings'.
-# - Strings which use unclear terms or require additional context to be
-#   understood.
-# - Strings which make invalid assumptions about notation of date, time or
-#   money.
-# - Pluralisation problems.
-# - Incorrect English spelling.
-# - Incorrect formatting.
-# It can be your email address, or a mailing list address where translators
-# can write to without being subscribed, or the URL of a web page through
-# which the translators can contact you.
-MSGID_BUGS_ADDRESS = https://gitlab.com/libosinfo/libosinfo/issues
-
-# This is the list of locale categories, beyond LC_MESSAGES, for which the
-# message catalogs shall be used.  It is usually empty.
-EXTRA_LOCALE_CATEGORIES =
-
-# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
-# context.  Possible values are "yes" and "no".  Set this to yes if the
-# package uses functions taking also a message context, like pgettext(), or
-# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
-USE_MSGCTXT = yes
-
-# These options get passed to msgmerge.
-# Useful options are in particular:
-#   --previous            to keep previous msgids of translated messages,
-#   --quiet               to reduce the verbosity.
-MSGMERGE_OPTIONS =
-
-# These options get passed to msginit.
-# If you want to disable line wrapping when writing PO files, add
-# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
-# MSGINIT_OPTIONS.
-MSGINIT_OPTIONS =
-
-# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
-# has changed.  Possible values are "yes" and "no".  Set this to no if
-# the POT file is checked in the repository and the version control
-# program ignores timestamps.
-PO_DEPENDS_ON_POT = no
-
-# This tells whether or not to forcibly update $(DOMAIN).pot and
-# regenerate PO files on "make dist".  Possible values are "yes" and
-# "no".  Set this to no if the POT file and PO files are maintained
-# externally.
-DIST_DEPENDS_ON_UPDATE_PO = no
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index 5d00b37..0000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,149 +0,0 @@
-
-EXTRA_DIST = dbdata
-
-check_PROGRAMS = \
-	test-entity \
-	test-device \
-	test-list \
-	test-devicelist \
-	test-devicelinklist \
-	test-filter \
-	test-firmware \
-	test-firmwarelist \
-	test-media \
-	test-product \
-	test-os \
-	test-oslist \
-	test-productfilter \
-	test-platform \
-	test-platformlist \
-	test-db \
-	test-loader \
-	test-install-script \
-	test-image \
-	test-imagelist \
-	test-tree \
-        $(NULL)
-
-COMMON_LDADD = \
-	$(COVERAGE_LDFLAGS) \
-	$(GLIB_LIBS) \
-	$(GOBJECT_LIBS) \
-	../osinfo/libosinfo-impl.la
-COMMON_CFLAGS = \
-	$(WARN_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(GOBJECT_CFLAGS) \
-	-I$(top_srcdir) \
-	-DSRCDIR="\"$(abs_top_srcdir)\"" \
-	-DBUILDDIR="\"$(abs_top_builddir)\"" \
-	$(NULL)
-
-test_entity_LDADD = $(COMMON_LDADD)
-test_entity_CFLAGS = $(COMMON_CFLAGS)
-test_entity_SOURCES = test-entity.c
-
-test_device_LDADD = $(COMMON_LDADD)
-test_device_CFLAGS = $(COMMON_CFLAGS)
-test_device_SOURCES = test-device.c
-
-test_filter_LDADD = $(COMMON_LDADD)
-test_filter_CFLAGS = $(COMMON_CFLAGS)
-test_filter_SOURCES = test-filter.c
-
-test_firmware_LDADD = $(COMMON_LDADD)
-test_firmware_CFLAGS = $(COMMON_CFLAGS)
-test_firmware_SOURCES = test-firmware.c
-
-test_firmwarelist_LDADD = $(COMMON_LDADD)
-test_firmwarelist_CFLAGS = $(COMMON_CFLAGS)
-test_firmwarelist_SOURCES = test-firmwarelist.c
-
-test_product_LDADD = $(COMMON_LDADD)
-test_product_CFLAGS = $(COMMON_CFLAGS)
-test_product_SOURCES = test-product.c
-
-test_os_LDADD = $(COMMON_LDADD)
-test_os_CFLAGS = $(COMMON_CFLAGS)
-test_os_SOURCES = test-os.c
-
-test_productfilter_LDADD = $(COMMON_LDADD)
-test_productfilter_CFLAGS = $(COMMON_CFLAGS)
-test_productfilter_SOURCES = test-productfilter.c
-
-test_platform_LDADD = $(COMMON_LDADD)
-test_platform_CFLAGS = $(COMMON_CFLAGS)
-test_platform_SOURCES = test-platform.c
-
-test_list_LDADD = $(COMMON_LDADD)
-test_list_CFLAGS = $(COMMON_CFLAGS)
-test_list_SOURCES = test-list.c
-
-test_media_LDADD = $(COMMON_LDADD)
-test_media_CFLAGS = $(COMMON_CFLAGS)
-test_media_SOURCES = test-media.c
-
-test_devicelist_LDADD = $(COMMON_LDADD)
-test_devicelist_CFLAGS = $(COMMON_CFLAGS)
-test_devicelist_SOURCES = test-devicelist.c
-
-test_devicelinklist_LDADD = $(COMMON_LDADD)
-test_devicelinklist_CFLAGS = $(COMMON_CFLAGS)
-test_devicelinklist_SOURCES = test-devicelinklist.c
-
-test_platformlist_LDADD = $(COMMON_LDADD)
-test_platformlist_CFLAGS = $(COMMON_CFLAGS)
-test_platformlist_SOURCES = test-platformlist.c
-
-test_oslist_LDADD = $(COMMON_LDADD)
-test_oslist_CFLAGS = $(COMMON_CFLAGS)
-test_oslist_SOURCES = test-oslist.c
-
-test_db_LDADD = $(COMMON_LDADD)
-test_db_CFLAGS = $(COMMON_CFLAGS)
-test_db_SOURCES = test-db.c
-
-test_loader_LDADD = $(COMMON_LDADD)
-test_loader_CFLAGS = $(COMMON_CFLAGS)
-test_loader_SOURCES = test-loader.c
-
-test_install_script_LDADD = $(COMMON_LDADD)
-test_install_script_CFLAGS = $(COMMON_CFLAGS)
-test_install_script_SOURCES = test-install-script.c
-
-test_image_LDADD = $(COMMON_LDADD)
-test_image_CFLAGS = $(COMMON_CFLAGS)
-test_image_SOURCES = test-image.c
-
-test_imagelist_LDADD = $(COMMON_LDADD)
-test_imagelist_CFLAGS = $(COMMON_CFLAGS)
-test_imagelist_SOURCES = test-imagelist.c
-
-test_tree_LDADD = $(COMMON_LDADD)
-test_tree_CFLAGS = $(COMMON_CFLAGS)
-test_tree_SOURCES = test-tree.c
-
-TESTS = $(check_PROGRAMS) \
-	$(NULL)
-
-EXTRA_DIST += \
-	test-lib.sh \
-	install-script.xsl \
-	$(NULL)
-
-TESTS_ENVIRONMENT =						\
-	abs_top_builddir=$(lv_abs_top_builddir)			\
-	abs_top_srcdir=`cd '$(top_srcdir)'; pwd`		\
-	abs_builddir=`pwd`					\
-	abs_srcdir=`cd '$(srcdir)'; pwd`			\
-	CONFIG_HEADER="`cd '$(top_builddir)'; pwd`/config.h"	\
-	PATH="$(path_add)$(PATH_SEPARATOR)$$PATH"		\
-	SHELL="$(SHELL)"					\
-	LIBVIRT_DRIVER_DIR="$(abs_top_builddir)/src/.libs"	\
-	LC_ALL=C						\
-	G_SLICE=always-malloc G_DEBUG=gc-friendly		\
-	$(VG)
-
-valgrind:
-	$(MAKE) check VG="libtool --mode=execute valgrind --quiet --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=20 --suppressions=osinfo.suppression"
diff --git a/tools/Makefile.am b/tools/Makefile.am
deleted file mode 100644
index 60515e6..0000000
--- a/tools/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-AM_CFLAGS = $(GOBJECT_CFLAGS) \
-	    $(GIO_CFLAGS)     \
-	    $(GLIB_CFLAGS)    \
-	    $(LIBXML_CFLAGS)  \
-	    -DPKGDATADIR="\"$(pkgdatadir)\"" \
-	    -DLOCALEDIR="\"$(datadir)/locale\"" \
-	    $(WARN_CFLAGS) \
-	    -I$(top_srcdir) \
-            $(NULL)
-
-bin_PROGRAMS = osinfo-detect osinfo-query osinfo-install-script
-
-man1_MANS = osinfo-detect.1 osinfo-query.1 osinfo-install-script.1
-
-CLEANFILES = $(man1_MANS)
-
-POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)"
-
-%.1: %.c Makefile
-	$(AM_V_GEN)$(POD2MAN) $< $@
-
-osinfo_detect_SOURCES = osinfo-detect.c
-osinfo_detect_LDADD = $(GOBJECT_LIBS)		\
-		      $(GIO_LIBS)		\
-		      $(GLIB_LIBS)		\
-		      $(LIBXML_LIBS)		\
-		      $(top_builddir)/osinfo/libosinfo-1.0.la
-
-osinfo_query_SOURCES = osinfo-query.c
-osinfo_query_LDADD = $(GOBJECT_LIBS)		\
-		      $(GIO_LIBS)		\
-		      $(GLIB_LIBS)		\
-		      $(top_builddir)/osinfo/libosinfo-1.0.la
-
-osinfo_install_script_SOURCES = osinfo-install-script.c
-osinfo_install_script_LDADD = $(GOBJECT_LIBS)	\
-		      $(GIO_LIBS)		\
-		      $(GLIB_LIBS)		\
-		      $(LIBXML_LIBS)		\
-		      $(top_builddir)/osinfo/libosinfo-1.0.la