diff --git a/.travis.yml b/.travis.yml
index d44973e2e..835f267f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,6 @@ env:
     - CXXFLAGS="$CFLAGS"
   matrix:
     - ZM_BUILDMETHOD=cmake
-    - ZM_BUILDMETHOD=autotools
 compiler:
   - gcc
 before_install:
@@ -32,16 +31,10 @@ install:
   - sudo make install-libs
 before_script:
   - cd $TRAVIS_BUILD_DIR
-  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then libtoolize -v --force; fi
-  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then aclocal -I m4; fi
-  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then autoheader; fi
-  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then automake --force-missing --add-missing; fi
-  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then autoconf; fi
   - mysql -uroot -e "CREATE DATABASE IF NOT EXISTS zm"
   - mysql -uroot -e "GRANT ALL ON zm.* TO 'zmuser'@'localhost' IDENTIFIED BY 'zmpass'";
   - mysql -uroot -e "FLUSH PRIVILEGES"
 script:
-  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then ./configure --prefix=/usr --with-libarch=lib/$DEB_HOST_GNU_TYPE --host=$DEB_HOST_GNU_TYPE --build=$DEB_BUILD_GNU_TYPE --with-mysql=/usr --with-ffmpeg=/usr --with-webdir=/usr/share/zoneminder/www --with-cgidir=/usr/libexec/zoneminder/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=yes --disable-debug --enable-mmap=yes ZM_SSL_LIB=openssl; fi
   - if [ "$ZM_BUILDMETHOD" = "cmake" ]; then cmake -DCMAKE_INSTALL_PREFIX="/usr"; fi
   - make
   - sudo make install
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 62f767e75..000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I m4
-
-# And these to the user and group of your webserver
-webuser = @WEB_USER@
-webgroup = @WEB_GROUP@
-zmconfigdir = @ZM_CONFIG_DIR@
-
-zmconfig_DATA = \
-	zm.conf
-
-if COND_ONVIF
-   MAYBE_ONVIF = onvif
-endif
-
-SUBDIRS = \
-	src \
-	web \
-	scripts \
-	db \
-	misc \
- 	$(MAYBE_ONVIF)
-
-EXTRA_DIST = \
-	zm.conf.in \
-	zmconfgen.pl.in
-
-# Yes, you are correct. This is a HACK!
-install-data-hook:
-	( cd $(DESTDIR)$(zmconfigdir); chown $(webuser):$(webgroup) $(zmconfig_DATA); chmod 600 $(zmconfig_DATA) )
-	( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir -p $(DESTDIR)$(ZM_RUNDIR); fi; if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR); fi )
-	( if ! test -e $(DESTDIR)$(ZM_SOCKDIR); then mkdir -p $(DESTDIR)$(ZM_SOCKDIR); fi; if test "$(DESTDIR)$(ZM_SOCKDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_SOCKDIR); chmod u+w $(DESTDIR)$(ZM_SOCKDIR); fi )
-	( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -m 700 -p $(DESTDIR)$(ZM_TMPDIR); fi; if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp" && test "$(DESTDIR)$(ZM_TMPDIR)" != "/var/tmp"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_TMPDIR); chmod u+w $(DESTDIR)$(ZM_TMPDIR); fi )
-
-uninstall-hook:
-	@-( cd $(DESTDIR)$(webdir); rm -rf events graphics images sounds temp )
-	@-( if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then rm -rf $(DESTDIR)$(ZM_RUNDIR); fi )
-	@-( if test "$(DESTDIR)$(ZM_SOCKDIR)" != "/var/run"; then rm -rf $(DESTDIR)$(ZM_SOCKDIR); fi )
-	@-( if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp" && test "$(DESTDIR)$(ZM_TMPDIR)" != "/var/tmp"; then rm -rf $(DESTDIR)$(ZM_TMPDIR); fi )
-	@-( if test "$(DESTDIR)$(ZM_LOGDIR)" != "/var/log"; then rm -rf $(DESTDIR)$(ZM_LOGDIR); fi )
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 605842149..000000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,74 +0,0 @@
-AC_DEFUN([AC_DEFINE_DIR], [
-  prefix_NONE=
-  exec_prefix_NONE=
-  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
-  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
-dnl refers to ${prefix}.  Thus we have to use `eval' twice.
-  eval ac_define_dir="\"[$]$2\""
-  eval ac_define_dir="\"$ac_define_dir\""
-  AC_SUBST($1, "$ac_define_dir")
-  AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
-  test "$prefix_NONE" && prefix=NONE
-  test "$exec_prefix_NONE" && exec_prefix=NONE
-])
-
-AC_DEFUN([AC_PROG_PERL_VERSION],[dnl
-# Make sure we have perl
-if test -z "$PERL"; then
-AC_CHECK_PROG(PERL,perl,perl)
-fi
-
-# Check if version of Perl is sufficient
-ac_perl_version="$1"
-
-if test "x$PERL" != "x"; then
-  AC_MSG_CHECKING(for perl version greater than or equal to $ac_perl_version)
-  # NB: It would be nice to log the error if there is one, but we cannot rely
-  # on autoconf internals
-  $PERL -e "use $ac_perl_version;" > /dev/null 2>&1
-  if test $? -ne 0; then
-    AC_MSG_RESULT(no);
-    $3
-  else
-    AC_MSG_RESULT(ok);
-    $2
-  fi
-else
-  AC_MSG_WARN(could not find perl)
-fi
-])dnl
-
-AC_DEFUN([AC_PROG_PERL_MODULES],[dnl
-ac_perl_modules="$1"
-# Make sure we have perl
-if test -z "$PERL"; then
-AC_CHECK_PROG(PERL,perl,perl)
-fi
-
-if test "x$PERL" != x; then
-  ac_perl_modules_failed=0
-  for ac_perl_module in $ac_perl_modules; do
-    AC_MSG_CHECKING(for perl module $ac_perl_module)
-
-    # Would be nice to log result here, but can't rely on autoconf internals
-    $PERL "-M$ac_perl_module" -e exit > /dev/null 2>&1
-    if test $? -ne 0; then
-      AC_MSG_RESULT(no);
-      ac_perl_modules_failed=1
-   else
-      AC_MSG_RESULT(ok);
-    fi
-  done
-
-  # Run optional shell commands
-  if test "$ac_perl_modules_failed" = 0; then
-    :
-    $2
-  else
-    :
-    $3
-  fi
-else
-  AC_MSG_WARN(could not find perl)
-fi])dnl
diff --git a/bootstrap.sh b/bootstrap.sh
deleted file mode 100755
index 0bc041f18..000000000
--- a/bootstrap.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-aclocal -I m4
-autoheader
-automake --add-missing
-autoconf
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index c71854dc1..000000000
--- a/configure.ac
+++ /dev/null
@@ -1,509 +0,0 @@
-#
-# Building ZoneMinder via Autotools will be depreciated soon
-# For instructions on building with cmake, please see INSTALL
-#
-AC_PREREQ(2.59)
-AC_INIT(zm,1.29.0,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
-AM_INIT_AUTOMAKE
-AC_CONFIG_SRCDIR(src/zm.h)
-AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_MACRO_DIR([m4])
-
-AC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS])
-
-AC_SUBST(VERSION)
-#
-# Platform specific setup
-#
-#############################
-AC_CANONICAL_HOST
-# Check for which host we are on and setup a few things
-# specifically based on the host
-case $host_os in
-  darwin* )
-        # Do something specific for mac
-		HOST_OS='darwin'
-        ;;
-  linux*)
-        # Do something specific for linux
-		HOST_OS='linux'
-        ;;
-   *BSD*)
-        # Do something specific for BSD
-		HOST_OS='BSD'
-		AC_DEFINE(BSD,1,"This is a BSD system")
-        ;;
-   *bsd*)
-        # Do something specific for BSD
-		HOST_OS='BSD'
-		AC_DEFINE(BSD,1,"This is a BSD system")
-        ;;
-    *solaris*)
-        # Do something specific for Solaris
-		HOST_OS='solaris'
-		AC_DEFINE(SOLARIS,1,"We are running a Solaroid OS [tested on OmniOS]")
-        ;;
-    *)
-        #Default Case
-        AC_MSG_ERROR([Your platform is not currently supported])
-        ;;
-esac
-
-AC_SUBST(HOST_OS)
-
-AC_ARG_VAR(ZM_DB_TYPE,[Type of the ZoneMinder database, default mysql])
-AC_ARG_VAR(ZM_DB_HOST,[Hostname where ZoneMinder database located, default localhost])
-AC_ARG_VAR(ZM_DB_NAME,[Name of ZoneMinder database, default zm])
-AC_ARG_VAR(ZM_DB_USER,[Name of ZoneMinder database user, default zmuser])
-AC_ARG_VAR(ZM_DB_PASS,[Password of ZoneMinder database user, default zmpass])
-AC_ARG_VAR(ZM_SSL_LIB,[Library to use for ssl functions, default gnutls])
-AC_ARG_VAR(ZM_MYSQL_ENGINE,[MySQL engine to use with database, default InnoDB])
-AC_ARG_VAR(ZM_RUNDIR,[Location of transient process files, default /var/run/zm])
-AC_ARG_VAR(ZM_SOCKDIR,[Location of Unix domain socket files, default /var/run/zm])
-AC_ARG_VAR(ZM_TMPDIR,[Location of temporary files, default /var/tmp/zm])
-AC_ARG_VAR(ZM_LOGDIR,[Location of generated log files, default /var/log/zm])
-AC_ARG_VAR(ZM_CONFIG_DIR,[Location of ZoneMinder configuration, default system config directory])
-
-if test "$ZM_DB_TYPE" == ""; then
-	AC_SUBST(ZM_DB_TYPE,[mysql])
-fi
-if test "$ZM_DB_HOST" == ""; then
-	AC_SUBST(ZM_DB_HOST,[localhost])
-fi
-if test "$ZM_DB_NAME" == ""; then
-	AC_SUBST(ZM_DB_NAME,[zm])
-fi
-if test "$ZM_DB_USER" == ""; then
-	AC_SUBST(ZM_DB_USER,[zmuser])
-fi
-if test "$ZM_DB_PASS" == ""; then
-	AC_SUBST(ZM_DB_PASS,[zmpass])
-fi
-if test "$ZM_SSL_LIB" == ""; then
-	AC_SUBST(ZM_SSL_LIB,gnutls)
-fi
-if test "$ZM_MYSQL_ENGINE" == ""; then
-	AC_SUBST(ZM_MYSQL_ENGINE,InnoDB)
-fi
-if test "$ZM_RUNDIR" == ""; then
-	AC_SUBST(ZM_RUNDIR,[/var/run/zm])
-fi
-if test "$ZM_SOCKDIR" == ""; then
-	AC_SUBST(ZM_SOCKDIR,[/var/run/zm])
-fi
-if test "$ZM_TMPDIR" == ""; then
-	AC_SUBST(ZM_TMPDIR,[/tmp/zm])
-fi
-if test "$ZM_LOGDIR" == ""; then
-	AC_SUBST(ZM_LOGDIR,[/var/log/zm])
-fi
-AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
-if test "$ZM_CONFIG_DIR" == ""; then
-	AC_SUBST(ZM_CONFIG_DIR,[$SYSCONFDIR])
-fi
-
-LIB_ARCH=lib
-AC_ARG_WITH(libarch,
-    [  --with-libarch=<lib>       architecture library path to use, default lib],
-    [LIB_ARCH=$with_libarch],
-    AC_MSG_WARN([You can call configure with the --with-libarch option.
-    This tells configure where to find architecture specific libraries.
-    The default of 'lib' is usually ok but 64 bit machines may require lib64.
-    e.g. --with-libarch=lib or --with-libarch=lib64])
-)
-AC_SUBST(LIB_ARCH)
-
-LDFLAGS="-L/usr/lib/${build_alias} ${LDFLAGS}"
-
-MYSQL_PREFIX=/usr
-AC_ARG_WITH(mysql,
-    [  --with-mysql=<path>        prefix of MySQL installation, default /usr],
-    [MYSQL_PREFIX=$with_mysql],
-    AC_MSG_WARN([You can call configure with the --with-mysql option.
-    This tells configure where to find the MySql C library and headers if configure cannot
-    locate them automatically.
-    e.g. --with-mysql=/usr/local or --with-mysql=/usr])
-)
-AC_SUBST(MYSQL_PREFIX)
-MYSQL_LIBS="-L${MYSQL_PREFIX}/${LIB_ARCH}/mysql"
-MYSQL_CFLAGS="-I${MYSQL_PREFIX}/include"
-AC_SUBST(MYSQL_LIBS)
-AC_SUBST(MYSQL_CFLAGS)
-LDFLAGS="$LDFLAGS ${MYSQL_LIBS}"
-
-
-MARIADB_PREFIX=/usr
-AC_ARG_WITH(mariadb,
-    [  --with-mariadb=<path>        prefix of MariaDB installation, default /usr],
-    [MYSQL_PREFIX=$with_mariadb],
-    AC_MSG_WARN([You can call configure with the --with-mariadb option.
-    This tells configure where to find the mariaDB C library and headers if configure cannot
-    locate them automatically.
-    e.g. --with-mariadb=/usr/local or --with-mariadb=/usr])
-)
-AC_SUBST(MARIADB_PREFIX)
-MARIADB_LIBS="-L${MARIADB_PREFIX}/${LIB_ARCH}/mariadb"
-MARIADB_CFLAGS="-I${MARIADB_PREFIX}/include"
-AC_SUBST(MARIADB_LIBS)
-AC_SUBST(MARIADB_CFLAGS)
-LDFLAGS="$LDFLAGS ${MARIADB_LIBS}"
-
-POLKIT_PREFIX=/usr
-AC_ARG_WITH(polkit,
-[ --with-polkit=<path> prefix of polkit root directory, default /usr],
-[POLKIT_PREFIX=$with_polkit],
-AC_MSG_WARN([You can call configure with the --with-polkit option.
-This tells configure where to place the polkit policy files.])
-)
-AC_SUBST(POLKIT_PREFIX)
-PKG_CHECK_MODULES(POLKIT, polkit-gobject-1)
-
-FFMPEG_PREFIX=/usr
-AC_ARG_WITH(ffmpeg,
-    [  --with-ffmpeg=<path>       prefix of ffmpeg root directory for libavcodec etc, default /usr],
-    [FFMPEG_PREFIX=$with_ffmpeg],
-    AC_MSG_WARN([You can call configure with the --with-ffmpeg option.
-    This tells configure where to find the ffmpeg root directory within which are the libavcodec 
-    and libavformat files that can be used to build true MPEG streaming into ZoneMinder. Ensure that
-    your copy of ffmpeg has installed libraries as well as binaries (use 'make installlib'). If you
-    are using a local install of ffmpeg you may have to remove or rename a previous real installation
-    as the headers and libraries from that will probably be picked up before your local copy.
-    e.g. --with-ffmpeg=/usr/local])
-)
-AC_SUBST(FFMPEG_PREFIX)
-FFMPEG_LIBS="-L${FFMPEG_PREFIX}/${LIB_ARCH}"
-FFMPEG_CFLAGS="-I${FFMPEG_PREFIX}/include -D__STDC_CONSTANT_MACROS"
-AC_SUBST(FFMPEG_LIBS)
-AC_SUBST(FFMPEG_CFLAGS)
-
-LDFLAGS="${FFMPEG_LIBS} $LDFLAGS"
-CFLAGS="${FFMPEG_CFLAGS} $CFLAGS"
-CPPFLAGS="${FFMPEG_CFLAGS} $CPPFLAGS"
-
-EXTRA_LIBS=
-AC_ARG_WITH(extralibs,
-    [  --with-extralibs="<libs>"  string containing extra libraries to pass to link, default empty],
-    [EXTRA_LIBS=$with_extralibs],
-    AC_MSG_WARN([You can call configure with the --with-extralibs option.
-    Ordinarily you will need to use this option only when your copy of ffmpeg has been built
-    with support for additional formats and you would use this option to detail which additional
-    libraries ffmpeg was built with so that it is able to link successfully with ZoneMinder.
-    You will need to wrap this option in quotes if it contains any spaces.
-    e.g. --with-extralibs="-lmp3lame"])
-)
-AC_SUBST(EXTRA_LIBS)
-
-LDFLAGS="$LDFLAGS ${EXTRA_LIBS}"
-
-AC_ARG_WITH(webdir,
-    [  --with-webdir=<path>       prefix of web directory],
-    [WEB_PREFIX=$with_webdir],
-    AC_MSG_ERROR([You must call configure with the --with-webdir option.
-    This tells configure where to install PHP and web files and scripts.
-    e.g. --with-webdir=/var/www/html or --with-webdir=/www/vhtdocs/<site>])
-)
-AC_SUBST(WEB_PREFIX)
-
-AC_ARG_WITH(cgidir,
-    [  --with-cgidir=<path>       prefix of cgi directory],
-    [CGI_PREFIX=$with_cgidir],
-    AC_MSG_ERROR([You must call configure with the --with-cgidir option.
-    This tells configure where to install cgi files and scripts.
-    e.g. --with-cgidir=/var/www/cgi-bin or --with-webdir=/www/vhtdocs/<site>/cgi-bin])
-)
-AC_SUBST(CGI_PREFIX)
-
-WEB_USER=apache
-AC_ARG_WITH(webuser,
-    [  --with-webuser=<user>      name of web user, default apache],
-    [WEB_USER=$with_webuser],
-    AC_MSG_WARN([You can call configure with the --with-webuser option.
-    This tells configure what the user name of the web user is if it is not the default of 'apache'.
-    e.g. --with-webuser=apache or --with-webuser=web])
-)
-AC_SUBST(WEB_USER)
-
-WEB_GROUP=apache
-AC_ARG_WITH(webgroup,
-    [  --with-webgroup=<group>    name of web group, default apache],
-    [WEB_GROUP=$with_webgroup],
-    AC_MSG_WARN([You can call configure with the --with-webgroup option.
-    This tells configure what the group name of the web group is if it is not the default of 'apache'.
-    e.g. --with-webgroup=apache or --with-webgroup=web])
-)
-AC_SUBST(WEB_GROUP)
-
-WEB_HOST=zm.local
-AC_ARG_WITH(webhost,
-    [  --with-webhost=<hostname>    name of web hostname, default zm.local],
-    [WEB_HOST=$with_webhost],
-    AC_MSG_WARN([You can call configure with the --with-webhost option.
-    This tells configure what the host name is for name based virtual hosting. This is only used to populate the sample web/zmHttpd.conf file.
-    e.g. --with-webhost=zm.localdomain])
-)
-AC_SUBST(WEB_HOST)
-
-ENABLE_DEBUG=yes
-AC_ARG_ENABLE(debug,
-    [  --enable-debug=<yes|no>    enable or disable debug, default enabled],
-    [ENABLE_DEBUG=$enable_debug],
-    AC_MSG_WARN([You can call configure with the --enable-debug=<yes|no> or --disable-debug option.
-    This tells configure whether to compile ZoneMinder with debug included. Although debug is included
-    by default it is not output unless explicitly switched on elsewhere. These checks may induce a
-    small penalty on performance and if you are after squeezing the maximum possible performance out
-    of ZoneMinder you may use this switch to prevent debug from being compiled in.
-    e.g. --enable-debug=yes or --disable-debug])
-)
-if test "$ENABLE_DEBUG" != "yes"; then
-  AC_DEFINE(ZM_DBG_OFF,1,"Whether debug is switched off and compiled out")
-fi
-
-ENABLE_MMAP=yes
-AC_ARG_ENABLE(mmap,
-    [  --enable-mmap=<yes|no> enable or disabled mapped memory versus shared memory, default mapped],
-    [ENABLE_MMAP=$enable_mmap],
-    AC_MSG_WARN([You can call configure with the --enable-mmap=<yes|no> or --disable-mmap option.
-    This tells configure whether to compile ZoneMinder with mmap support rather than IPC shared
-    memory. This is a feature that uses memory mapped into files which all processes can share.
-    Memory mapping requires less configuration and is more flexible than shared memory but may
-    slow down your system unless the mapped files are configured to reside on a fast or RAM based
-    filesystem which will normally be the case by default.
-    e.g. --enable-mmap=yes or --disable-mmap])
-)
-if test "$ENABLE_MMAP" == "yes"; then
-  AC_DEFINE(ZM_MEM_MAPPED,1,"Whether to use mapped rather than shared memory")
-else
-  AC_DEFINE(ZM_MEM_MAPPED,0,"Whether to use mapped rather than shared memory")
-fi
-AC_SUBST(ENABLE_MMAP)
-
-ENABLE_ONVIF=no
-AC_ARG_ENABLE(onvif,
-    [  --enable-onvif=<yes|no> enable or disable basic onvif support, default disabled],
-    [ENABLE_ONVIF=$enable_onvif],
-    AC_MSG_WARN([You can call configure with the --enable-onvif=<yes|no> or --enable-onvif option.
-    This tells configure whether to compile ZoneMinder with basic ONVIF support. This feature will
-    probe for ONVIF compliant cameras on your network and allow you the option to auto-configure them as
-    monitors in zoneminder. This option is EXPERIMENTAL and may not work with all cameras that claim to 
-    be ONVIF compliant.
-    e.g. --enable-onvif=yes or --disable-onvif])
-)
-AM_CONDITIONAL([COND_ONVIF], [test "$enable_onvif" = yes])
-
-# Compiler
-AC_LANG_CPLUSPLUS
-if test "$ENABLE_ONVIF" == "yes"; then
-  AC_SUBST(ZM_HAS_ONVIF,1)
-else
-  AC_SUBST(ZM_HAS_ONVIF,0)
-fi
-
-# Checks for programs.
-AC_PROG_CXX
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_RANLIB
-AC_PROG_MAKE_SET
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_HEADER_STDBOOL
-AC_C_CONST
-AC_TYPE_UID_T
-AC_C_INLINE
-AC_TYPE_MODE_T
-AC_TYPE_SIZE_T
-AC_HEADER_TIME
-AC_STRUCT_TM
-AC_TYPE_SIGNAL
-
-AC_CHECK_TYPES(siginfo_t,,,[#include <signal.h>])
-AC_CHECK_TYPES(ucontext_t,,,[#include <signal.h>])
-
-# Checks for library functions.
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MALLOC
-AC_FUNC_MMAP
-AC_FUNC_SELECT_ARGTYPES
-AC_FUNC_STAT
-AC_FUNC_STRFTIME
-AC_FUNC_STRTOD
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([gethostbyname gethostname gettimeofday memmove memset mkdir munmap posix_memalign putenv select sendfile socket sqrt strcasecmp strchr strcspn strerror strncasecmp strrchr strspn strstr strtol strtoull])
-AC_CHECK_FUNCS([syscall sleep usleep ioctl ioctlsocket sigaction])
-# this is required for freebsd to compile. Look for it in m4/ac_check_sendfile.m4
-AC_CHECK_SENDFILE
-# Other programs
-AC_CHECK_PROG(OPT_FFMPEG,ffmpeg,yes,no)
-AC_PATH_PROG(PATH_FFMPEG,ffmpeg)
-
-# Checks for libraries.
-AC_CHECK_LIB(rt,clock_gettime,,AC_MSG_ERROR(zm requires librt))
-AC_SEARCH_LIBS(mysql_init,[mysqlclient mariadbclient],,AC_MSG_ERROR(zm requires libmysqlclient.a or libmariadbclient.a))
-AC_CHECK_LIB(jpeg,jpeg_start_compress,,AC_MSG_ERROR(zm requires libjpeg.a))
-AC_CHECK_LIB(pthread,pthread_create,,AC_MSG_ERROR(zm requires libpthread.a))
-if test "$BSD" == "0"; then
-AC_CHECK_LIB(dl,dlsym,,AC_MSG_ERROR(zm requires libdl.a))
-fi
-if test "$ZM_SSL_LIB" == "openssl"; then
-AC_CHECK_HEADERS(openssl/md5.h,,AC_MSG_WARN(zm requires openssl/md5.h header to be installed for openssl),)
-AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select gnutls instead]))
-else
-AC_CHECK_HEADERS(gnutls/openssl.h,AC_SUBST(ZM_HAS_GNUTLS_OPENSSL,1),AC_SUBST(ZM_HAS_GNUTLS_OPENSSL,0),)
-AC_CHECK_HEADERS(gnutls/gnutls.h,AC_SUBST(ZM_HAS_GNUTLS,1),AC_SUBST(ZM_HAS_GNUTLS,0),)
-if test "$ZM_HAS_GNUTLS_OPENSSL" == "0" && test "$ZM_HAS_GNUTLS" == "0"; then
-AC_MSG_WARN(gnutls is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead)
-fi
-AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed for gnutls),)
-AC_CHECK_LIB(gcrypt,gcry_check_version,,AC_MSG_WARN([libgcrypt.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
-AC_CHECK_LIB(gnutls,gnutls_fingerprint,,AC_MSG_WARN([libgnutls.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
-if test "$ZM_HAS_GNUTLS_OPENSSL" == "1"; then
-AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([libgnutls.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
-fi
-fi
-AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
-AC_CHECK_LIB(z,zlibVersion)
-AC_CHECK_LIB(x264,x264_predict_16x16_init)
-AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
-# Don't bother to warn about this one
-AC_CHECK_LIB(avcore,av_image_copy,,)
-AC_CHECK_LIB(avcodec,avcodec_version,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
-AC_CHECK_LIB(avformat,avformat_version,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
-#AC_CHECK_LIB(avcodec,avcodec_open,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
-#AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
-AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
-AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
-AC_CHECK_LIB(vlc,libvlc_new,,AC_MSG_WARN(libvlc.a may be required for streaming))
-AC_CHECK_LIB(bz2,BZ2_bzCompress,,AC_MSG_WARN(zm requires libbz2.a for recent versions of ffmpeg))
-AC_CHECK_LIB(z,compress,,)
-AC_CHECK_LIB(curl,curl_global_init,,)
-
-# Checks for header files.
-AC_FUNC_ALLOCA
-AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h limits.h memory.h stddef.h stdlib.h string.h strings.h sys/param.h sys/time.h syslog.h unistd.h values.h])
-AC_CHECK_HEADERS([netdb.h netinet/in.h arpa/inet.h sys/ioctl.h sys/socket.h sys/un.h glob.h sys/sendfile.h])
-AC_CHECK_HEADERS(execinfo.h,,,)
-AC_CHECK_HEADERS(ucontext.h,,,)
-AC_CHECK_HEADERS(sys/syscall.h,,,)
-AC_CHECK_HEADERS(pthread.h,,,)
-
-# Check for Video for Linux 1 Header Files
-ZM_HAS_V4L1=0
-AC_CHECK_HEADERS([libv4l1-videodev.h linux/videodev.h],[ZM_HAS_V4L1=1; break;],,)
-AC_SUBST(ZM_HAS_V4L1)
-
-# Check for Video for Linux 2 Header Files
-ZM_HAS_V4L2=0
-AC_CHECK_HEADERS(linux/videodev2.h,ZM_HAS_V4L2=1,,)
-AC_SUBST(ZM_HAS_V4L2)
-
-# Set global Video for Linux flag
-ZM_HAS_V4L=0
-if test "$ZM_HAS_V4L1" == "1" || test "$ZM_HAS_V4L2" == "1"; then
-ZM_HAS_V4L=1
-else
-AC_MSG_WARN(zm requires Video4Linux or Video4Linux2 to be installed for analog or USB camera support)
-fi
-AC_SUBST(ZM_HAS_V4L)
-
-AC_CHECK_HEADERS(jpeglib.h,,AC_MSG_ERROR(zm requires libjpeg headers to be installed),)
-AC_CHECK_HEADERS(mysql/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)
-AC_LANG_PUSH([C])
-AC_CHECK_HEADERS(libavutil/avutil.h,,,)
-AC_CHECK_HEADERS(libavcodec/avcodec.h,,,)
-AC_CHECK_HEADERS(libavformat/avformat.h,,,)
-AC_CHECK_HEADERS(libswscale/swscale.h,,,)
-AC_LANG_POP([C])
-AC_CHECK_HEADERS(pcre/pcre.h,AC_SUBST(ZM_PCRE,"1"),,)
-AC_CHECK_HEADERS(pcre.h,AC_SUBST(ZM_PCRE,"1"),,)
-if test "$ENABLE_MMAP" == "yes"; then
-AC_CHECK_HEADERS(sys/mman.h,,,)
-AC_CHECK_HEADERS(fcntl.h,,,)
-else
-AC_CHECK_HEADERS(sys/ipc.h,,,)
-AC_CHECK_HEADERS(sys/shm.h,,,)
-fi
-AC_CHECK_HEADERS(zlib.h,,,)
-AC_CHECK_HEADERS(vlc/vlc.h,,,)
-AC_CHECK_HEADERS(curl/curl.h,,,)
-
-if test "$ZM_SSL_LIB" == "openssl"; then
-AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires openssl/md5.h - use ZM_SSL_LIB option to select gnutls instead]),[#include <stdlib.h>
-#include <openssl/md5.h>])
-else
-if test "$ZM_HAS_GNUTLS_OPENSSL" == "1"; then
-AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires gnutls/openssl.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
-#include <gnutls/openssl.h>])
-else
-AC_CHECK_DECLS(gnutls_fingerprint,,AC_MSG_ERROR([zm requires gnutls/gnutls.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
-#include <gnutls/gnutls.h>])
-fi
-fi
-AC_CHECK_DECLS(backtrace,,,[#include <execinfo.h>])
-AC_CHECK_DECLS(backtrace_symbols,,,[#include <execinfo.h>])
-AC_CHECK_LIB(execinfo,backtrace)
-
-AC_SUBST(LDFLAGS)
-
-AC_PROG_PERL_VERSION(5.6.0)
-
-# Compulsory perl modules
-AC_PROG_PERL_MODULES(Sys::Syslog,,AC_MSG_ERROR(zm requires SYS:Syslog))
-AC_PROG_PERL_MODULES(DBI,,AC_MSG_ERROR(zm requires DBI))
-AC_PROG_PERL_MODULES(DBD::mysql,,AC_MSG_ERROR(zm requires DBD::mysql))
-AC_PROG_PERL_MODULES(Getopt::Long,,AC_MSG_ERROR(zm requires Getopt::Long))
-AC_PROG_PERL_MODULES(Time::HiRes,,AC_MSG_ERROR(zm requires Time::HiRes))
-AC_PROG_PERL_MODULES(Date::Manip,,AC_MSG_ERROR(zm requires Date::Manip))
-AC_PROG_PERL_MODULES(LWP::UserAgent,,AC_MSG_ERROR(zm requires LWP::UserAgent))
-AC_PROG_PERL_MODULES(ExtUtils::MakeMaker,,AC_MSG_ERROR(zm requires ExtUtils::MakeMaker))
-if test "$ENABLE_MMAP" == "yes"; then
-AC_PROG_PERL_MODULES(Sys::Mmap,,AC_MSG_ERROR(zm requires Sys::Mmap for mapped memory - set --enable-mmap=no to use IPC shared memory instead))
-fi
-
-# Optional perl modules
-AC_PROG_PERL_MODULES(Module::Load,,AC_MSG_WARN(Module::Load is required for PTZ camera control))
-AC_PROG_PERL_MODULES(Device::SerialPort,,AC_MSG_WARN(Device::SerialPort is required for RS232/RS485 PTZ camera control))
-AC_PROG_PERL_MODULES(Net::FTP,,AC_MSG_WARN(Net::FTP is required for automatic event uploading using ftp))
-AC_PROG_PERL_MODULES(Net::SFTP::Foreign,,AC_MSG_WARN(Net::SFTP::Foreign is required for automatic event uploading using sftp))
-AC_PROG_PERL_MODULES(Expect,,AC_MSG_WARN(Expect is required for automatic event uploading using sftp))
-AC_PROG_PERL_MODULES(Archive::Tar,,AC_MSG_WARN(Archive::Tar may be required for automatic event uploading))
-AC_PROG_PERL_MODULES(Archive::Zip,,AC_MSG_WARN(Archive::Zip may be required for automatic event uploading))
-AC_PROG_PERL_MODULES(Net::SMTP,,AC_MSG_WARN(Net::SMTP may be required for automatic event email notification))
-AC_PROG_PERL_MODULES(MIME::Lite,,AC_MSG_WARN(MIME::Lite may be required for automatic event email notification))
-AC_PROG_PERL_MODULES(MIME::Entity,,AC_MSG_WARN(MIME::Entity may be required for automatic event email notification))
-AC_PROG_PERL_MODULES(X10::ActiveHome,,AC_MSG_WARN(X10::ActiveHome is required for X.10 support))
-
-AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
-AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
-AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory])
-AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE")
-AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid")
-#AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
-#AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf")
-AC_SUBST(ZM_CONFIG,"$ZM_CONFIG_DIR/zm.conf")
-
-# Slight hack for non-standard perl install paths
-if test "$prefix" != "NONE"; then
-    PERL_SITE_PREFIX=`perl -V:siteprefix | sed -e "s/.*='\(.*\)';/\1/"`
-    PERL_SITE_LIB=`perl -V:installsitelib | sed -e "s/.*='\(.*\)';/\1/"`
-    PERL_LIB_PATH=`echo $PERL_SITE_LIB | sed -e "s|^$PERL_SITE_PREFIX||"`
-    EXTRA_PERL_LIB="use lib '$prefix$PERL_LIB_PATH'; # Include custom perl install path"
-    PERL_MM_PARMS="\"PREFIX=$prefix INSTALLDIRS=vendor\""
-else
-    EXTRA_PERL_LIB="# Include from system perl paths only"
-    PERL_MM_PARMS="\"INSTALLDIRS=vendor\""
-fi
-AC_SUBST(PERL_MM_PARMS)
-AC_SUBST(EXTRA_PERL_LIB)
-
-AC_CONFIG_FILES([Makefile zm.conf zmconfgen.pl db/Makefile db/zm_create.sql misc/Makefile misc/apache.conf misc/logrotate.conf misc/syslog.conf misc/com.zoneminder.systemctl.policy misc/com.zoneminder.systemctl.rules onvif/Makefile onvif/scripts/Makefile scripts/Makefile scripts/zm scripts/zmaudit.pl scripts/zmcontrol.pl scripts/zmdc.pl scripts/zmfilter.pl scripts/zmpkg.pl scripts/zmtelemetry.pl scripts/zmtrack.pl scripts/zmcamtool.pl scripts/zmsystemctl.pl scripts/zmtrigger.pl scripts/zmupdate.pl scripts/zmvideo.pl scripts/zmwatch.pl scripts/zmx10.pl scripts/zmdbbackup scripts/zmdbrestore scripts/zmeventdump scripts/zmlogrotate.conf scripts/ZoneMinder/lib/ZoneMinder/Base.pm scripts/ZoneMinder/lib/ZoneMinder/Config.pm scripts/ZoneMinder/lib/ZoneMinder/Memory.pm scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm src/Makefile src/zm_config.h web/Makefile web/ajax/Makefile web/css/Makefile web/graphics/Makefile web/includes/Makefile web/includes/config.php web/js/Makefile web/lang/Makefile web/skins/Makefile web/skins/classic/Makefile web/skins/classic/ajax/Makefile web/skins/classic/css/Makefile web/skins/classic/css/classic/Makefile web/skins/classic/css/classic/views/Makefile web/skins/classic/css/dark/Makefile web/skins/classic/css/dark/views/Makefile web/skins/classic/css/flat/Makefile web/skins/classic/css/flat/views/Makefile web/skins/classic/graphics/Makefile web/skins/classic/includes/Makefile web/skins/classic/js/Makefile web/skins/classic/lang/Makefile web/skins/classic/views/Makefile web/skins/classic/views/js/Makefile web/skins/mobile/Makefile web/skins/mobile/ajax/Makefile web/skins/mobile/css/Makefile web/skins/mobile/graphics/Makefile web/skins/mobile/includes/Makefile web/skins/mobile/lang/Makefile web/skins/mobile/views/Makefile web/skins/mobile/views/css/Makefile web/tools/Makefile web/tools/mootools/Makefile web/views/Makefile web/skins/xml/Makefile web/skins/xml/views/Makefile web/skins/xml/includes/Makefile])
-
-# Create the definitions for compilation and defaults for the database
-AC_CONFIG_COMMANDS([src/zm_config_defines.h],[perl ./zmconfgen.pl])
-# Manually generate the perl Makefile maker
-AC_CONFIG_COMMANDS([scripts/ZoneMinder/Makefile],[(cd scripts/ZoneMinder; echo "perl Makefile.PL $PERL_MM_PARMS"; perl Makefile.PL $PERL_MM_PARMS)],[PERL_MM_PARMS=$PERL_MM_PARMS])
-AC_CONFIG_COMMANDS([onvif/modules/Makefile],[(cd onvif/modules; echo "perl Makefile.PL $PERL_MM_PARMS"; perl Makefile.PL $PERL_MM_PARMS)],[PERL_MM_PARMS=$PERL_MM_PARMS])
-AC_CONFIG_COMMANDS([onvif/proxy/Makefile],[(cd onvif/proxy; echo "perl Makefile.PL $PERL_MM_PARMS"; perl Makefile.PL $PERL_MM_PARMS)],[PERL_MM_PARMS=$PERL_MM_PARMS])
-
-AC_OUTPUT
diff --git a/db/Makefile.am b/db/Makefile.am
deleted file mode 100644
index 9cb4e197c..000000000
--- a/db/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-
-zmdbdatadir = $(pkgdatadir)/db
-
-EXTRA_DIST = \
-	zm_create.sql.in \
-	$(dbupgrade_scripts)
-
-dist_zmdbdata_DATA = \
-	zm_create.sql \
-	$(dbupgrade_scripts)
-
-dbupgrade_scripts = $(wildcard zm_update-*.sql)
-
diff --git a/m4/ac_check_sendfile.m4 b/m4/ac_check_sendfile.m4
deleted file mode 100644
index 12605d588..000000000
--- a/m4/ac_check_sendfile.m4
+++ /dev/null
@@ -1,63 +0,0 @@
-AC_DEFUN([AC_CHECK_SENDFILE],[
-AC_MSG_CHECKING([whether sendfile() is supported and what prototype it has])
-
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
-ac_sendfile_supported=no
-AC_TRY_LINK([#include <sys/sendfile.h>
-               #include <stdio.h>],
-       [sendfile(1, 1, NULL, 0);],
-       [
-               AC_DEFINE(HAVE_SENDFILE4_SUPPORT, 1,
-                       [Define this if Linux/Solaris sendfile() is supported])
-               AC_MSG_RESULT([Linux sendfile()])
-               ac_sendfile_supported=yes
-       ], [])
-
-if test x$ac_sendfile_supported = xno; then
-       dnl Checking wether we need libsendfile
-       dnl Presumably on Solaris
-       AC_CHECK_LIB(sendfile, sendfile,
-               [
-                       AC_DEFINE(HAVE_SENDFILE4_SUPPORT, 1,
-                               [Define this if Linux/Solaris sendfile() is supported])
-                       SENDFILE_LIBS="-lsendfile"
-                       AC_SUBST(SENDFILE_LIBS)
-                       AC_MSG_RESULT([Solaris sendfile()])
-                       ac_sendfile_supported=yes
-               ], [])
-fi
-
-if test x$ac_sendfile_supported = xno; then
-       dnl Checking wether we have FreeBSD-like sendfile() support.
-       AC_TRY_LINK([#include <sys/socket.h>
-                       #include <stdio.h>],
-               [sendfile(1, 1, 0, 0, NULL, NULL, 0);],
-               [
-                       AC_DEFINE(HAVE_SENDFILE7_SUPPORT, 1,
-                               [Define this if FreeBSD sendfile() is supported])
-                       AC_MSG_RESULT([FreeBSD sendfile()])
-                       ac_sendfile_supported=yes
-               ], [])
-fi
-
-if test x$ac_sendfile_supported = xno; then
-       dnl Checking wether we have MacOS-like sendfile() support.
-       AC_TRY_LINK([#include <sys/socket.h>
-                       #include <stdio.h>
-                       #include <sys/uio.h>],
-               [sendfile(1, 1, 0, NULL, NULL, 0);],
-               [
-                       AC_DEFINE(HAVE_SENDFILE6_SUPPORT, 1,
-                               [Define this if MacOS sendfile() is supported])
-                       AC_MSG_RESULT([MacOS sendfile()])
-                       ac_sendfile_supported=yes
-               ], [])
-fi
-
-CFLAGS="$saved_CFLAGS"
-
-if test x$ac_sendfile_supported = xno; then
-       AC_MSG_RESULT([no sendfile() support, using read/send])
-fi
-])
diff --git a/misc/Makefile.am b/misc/Makefile.am
deleted file mode 100644
index 5578e4373..000000000
--- a/misc/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-EXTRA_DIST = \
-	apache.conf.in \
-	logrotate.conf.in \
-	syslog.conf.in \
-	zoneminder-tmpfiles.conf.in \
-	zoneminder.service.in \
-        com.zoneminder.systemctl.policy.in \
-        com.zoneminder.systemctl.rules.in
-
-polkit_actiondir = @POLKIT_PREFIX@/share/polkit-1/actions
-dist_polkit_action_DATA = com.zoneminder.systemctl.policy
-
-polkit_rulesdir = @POLKIT_PREFIX@/share/polkit-1/rules.d
-dist_polkit_rules_DATA = com.zoneminder.systemctl.rules
-
diff --git a/onvif/Makefile.am b/onvif/Makefile.am
deleted file mode 100644
index 8cc9d700a..000000000
--- a/onvif/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-# Ack! Nasty hack to get modules Makefile regenerated if wiped with make clean
-all-local: proxy/Makefile modules/Makefile
-
-proxy/Makefile: proxy/Makefile.PL
-	( cd proxy; perl Makefile.PL )
-
-modules/Makefile: modules/Makefile.PL
-	( cd modules; perl Makefile.PL )
-
-SUBDIRS = \
- 	. \
-  proxy \
-  modules \
-  scripts 
-   
-   
-EXTRA_DIST = \
-  proxy/Makefile.PL \
-  proxy/lib \
-  modules/Makefile.PL \
-  modules/lib \
-  wsdl \
-  doc \
-  patches
diff --git a/onvif/scripts/Makefile.am b/onvif/scripts/Makefile.am
deleted file mode 100644
index 80db9755c..000000000
--- a/onvif/scripts/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-bin_SCRIPTS = \
-  zmonvif-probe.pl
-
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
deleted file mode 100644
index 1d9de2893..000000000
--- a/scripts/Makefile.am
+++ /dev/null
@@ -1,77 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-# Ack! Nasty hack to get modules Makefile regenerated if wiped with make clean
-all-local: ZoneMinder/Makefile
-
-ZoneMinder/Makefile: ZoneMinder/Makefile.PL
-	( cd ZoneMinder; perl Makefile.PL )
-
-bin_SCRIPTS = \
-	zmdc.pl \
-	zmaudit.pl \
-	zmfilter.pl \
-	zmtelemetry.pl \
-	zmtrigger.pl \
-	zmx10.pl \
-	zmwatch.pl \
-	zmpkg.pl \
-	zmupdate.pl \
-	zmvideo.pl \
-	zmcontrol.pl \
-	zmtrack.pl \
-	zmcamtool.pl \
-	zmsystemctl.pl
-
-SUBDIRS = \
-	. \
-    ZoneMinder
-
-EXTRA_DIST = \
-	zmdc.pl.in \
-	zmaudit.pl.in \
-	zmfilter.pl.in \
-	zmtelemetry.pl.in \
-	zmtrigger.pl.in \
-	zmx10.pl.in \
-	zmwatch.pl.in \
-	zmpkg.pl.in \
-	zmupdate.pl.in \
-	zmvideo.pl.in \
-	zmcontrol.pl.in \
-	zmtrack.pl.in \
-	zmcamtool.pl.in \
-	zmsystemctl.pl.in \
-	ZoneMinder/Makefile.PL \
-	ZoneMinder/README \
-	ZoneMinder/Changes \
-	ZoneMinder/META.yml \
-	ZoneMinder/MANIFEST \
-	ZoneMinder/t/ZoneMinder.t \
-	ZoneMinder/lib/ZoneMinder.pm \
-	ZoneMinder/lib/ZoneMinder/Base.pm.in \
-	ZoneMinder/lib/ZoneMinder/Config.pm.in \
-	ZoneMinder/lib/ZoneMinder/Logger.pm \
-	ZoneMinder/lib/ZoneMinder/General.pm \
-	ZoneMinder/lib/ZoneMinder/Database.pm \
-	ZoneMinder/lib/ZoneMinder/Memory.pm.in \
-	ZoneMinder/lib/ZoneMinder/Memory/Shared.pm \
-	ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm \
-	ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm \
-	ZoneMinder/lib/ZoneMinder/ConfigData.pm.in \
-	ZoneMinder/lib/ZoneMinder/Control.pm \
-	ZoneMinder/lib/ZoneMinder/Control \
-	ZoneMinder/lib/ZoneMinder/Trigger/Channel.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Channel/Handle.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Channel/Spawning.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Channel/Inet.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Channel/Unix.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Channel/File.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Channel/Serial.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Connection.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Connection/Example.pm \
-	zm.in \
-	zmdbbackup.in \
-	zmdbrestore.in \
-	zmeventdump.in \
-	zmlogrotate.conf.in
-
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 9314daac0..000000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,135 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-AM_CPPFLAGS = @MYSQL_CFLAGS@ @MARIADB_CFLAGS@ @FFMPEG_CFLAGS@ -Wall -finline-functions -fomit-frame-pointer
-#AM_CXXFLAGS = -frepo
-
-CLEANFILES = *.rpo
-
-# This should be set to your CGI directory
-cgidir = @CGI_PREFIX@
-# And these to the user and group of your webserver
-webuser = @WEB_USER@
-webgroup = @WEB_GROUP@
-
-bin_PROGRAMS = \
-	zmc \
-	zma \
-	zmu \
-	zms \
-	zmf \
-	zmstreamer
-
-zm_SOURCES = \
-	zm_box.cpp \
-	zm_buffer.cpp \
-	zm_camera.cpp \
-	zm_comms.cpp \
-	zm_config.cpp \
-	zm_coord.cpp \
-	zm_curl_camera.cpp \
-	zm.cpp \
-	zm_db.cpp \
-	zm_logger.cpp \
-	zm_event.cpp \
-	zm_exception.cpp \
-	zm_file_camera.cpp \
-	zm_ffmpeg_camera.cpp \
-	zm_image.cpp \
-	zm_jpeg.cpp \
-    zm_libvlc_camera.cpp \
-	zm_local_camera.cpp \
-	zm_monitor.cpp \
-	zm_ffmpeg.cpp \
-	zm_mpeg.cpp \
-	zm_poly.cpp \
-	zm_regexp.cpp \
-	zm_remote_camera.cpp \
-	zm_remote_camera_http.cpp \
-	zm_remote_camera_rtsp.cpp \
-	zm_rtp.cpp \
-	zm_rtp_ctrl.cpp \
-	zm_rtp_data.cpp \
-	zm_rtp_source.cpp \
-	zm_rtsp.cpp \
-	zm_rtsp_auth.cpp \
-	zm_sdp.cpp \
-	zm_signal.cpp \
-	zm_stream.cpp \
-	zm_thread.cpp \
-	zm_time.cpp \
-	zm_timer.cpp \
-	zm_user.cpp \
-	zm_utils.cpp \
-	zm_zone.cpp
-
-zmc_SOURCES = zmc.cpp $(zm_SOURCES)
-zma_SOURCES = zma.cpp $(zm_SOURCES)
-zms_SOURCES = zms.cpp $(zm_SOURCES)
-zmu_SOURCES = zmu.cpp $(zm_SOURCES)
-zmf_SOURCES = zmf.cpp $(zm_SOURCES)
-zmstreamer_SOURCES = zmstreamer.cpp $(zm_SOURCES)
-
-noinst_HEADERS = \
-	jinclude.h \
-	zm_box.h \
-	zm_buffer.h \
-	zm_camera.h \
-	zm_comms.h \
-	zm_config_defines.h \
-	zm_config.h \
-	zm_coord.h \
-	zm_curl_camera.h \
-	zm_db.h \
-	zm_logger.h \
-	zm_event.h \
-	zm_exception.h \
-	zmf.h \
-	zm_file_camera.h \
-	zm_ffmpeg_camera.h \
-	zm_font.h \
-	zm_font.h \
-	zm.h \
-	zm_image.h \
-	zm_jpeg.h \
-    zm_libvlc_camera.h \
-	zm_local_camera.h \
-	zm_mem_utils.h \
-	zm_monitor.h \
-	zm_ffmpeg.h \
-	zm_mpeg.h \
-	zm_poly.h \
-	zm_regexp.h \
-	zm_remote_camera.h \
-	zm_remote_camera_http.h \
-	zm_remote_camera_rtsp.h \
-	zm_rgb.h \
-	zm_rtp_ctrl.h \
-	zm_rtp_data.h \
-	zm_rtp.h \
-	zm_rtp_source.h \
-	zm_rtsp.h \
-	zm_sdp.h \
-	zm_signal.h \
-	zm_stream.h \
-	zm_thread.h \
-	zm_time.h \
-	zm_timer.h \
-	zm_user.h \
-	zm_utils.h \
-	zm_zone.h
-
-EXTRA_DIST = \
-	zm_config.h.in \
-	zm_threaddata.cpp
-
-dist-hook:
-	@( rm $(distdir)/zm_config.h )
-
-# Yes, you are correct. This is a HACK!
-install-exec-hook:
-	( cd $(DESTDIR)@bindir@; mkdir -p $(DESTDIR)$(cgidir); mv zms $(DESTDIR)$(cgidir) )
-	( cd $(DESTDIR)$(cgidir); chown $(webuser):$(webgroup) zms; ln -f zms nph-zms )
-
-uninstall-hook:
-	( cd $(DESTDIR)$(cgidir); rm -f zms nph-zms )
-
diff --git a/web/Makefile.am b/web/Makefile.am
deleted file mode 100644
index 077a4ff91..000000000
--- a/web/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-# This should be set to your web directory
-webdir = @WEB_PREFIX@
-# And these to the user and group of your webserver
-webuser = @WEB_USER@
-webgroup = @WEB_GROUP@
-
-SUBDIRS = \
-	ajax \
-	css \
-	graphics \
-	includes \
-	js \
-	lang \
-	skins \
-	tools \
-	views
-
-dist_web_DATA = \
-	index.php
-
-# Yes, you are correct. This is a HACK!
-install-data-hook:
-	( cd $(DESTDIR)$(webdir); chown $(webuser):$(webgroup) $(dist_web_DATA) )
-	( cd $(DESTDIR)$(webdir); chown -R $(webuser):$(webgroup) $(SUBDIRS) )
-	@-( cd $(DESTDIR)$(webdir); if ! test -e events; then mkdir events; fi; chown $(webuser):$(webgroup) events; chmod u+w events )
-	@-( cd $(DESTDIR)$(webdir); if ! test -e images; then mkdir images; fi; chown $(webuser):$(webgroup) images; chmod u+w images )
-	@-( cd $(DESTDIR)$(webdir); if ! test -e sounds; then mkdir sounds; fi; chown $(webuser):$(webgroup) sounds; chmod u+w sounds )
-	@-( cd $(DESTDIR)$(webdir); if ! test -e tools; then mkdir tools; fi; chown $(webuser):$(webgroup) tools; chmod u+w tools )
-	@-( cd $(DESTDIR)$(webdir); if ! test -e temp; then mkdir temp; fi; chown $(webuser):$(webgroup) temp; chmod u+w temp )
-
-uninstall-hook:
-	@-( cd $(DESTDIR)$(webdir); rm -rf $(SUBDIRS) )
-	@-( cd $(DESTDIR)$(webdir); rm -rf events images sounds tools temp )
diff --git a/web/ajax/Makefile.am b/web/ajax/Makefile.am
deleted file mode 100644
index ef79e6cae..000000000
--- a/web/ajax/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/ajax
-
-dist_web_DATA = \
-	alarm.php \
-	control.php \
-	event.php \
-	log.php \
-	status.php \
-	stream.php \
-	zone.php
diff --git a/web/css/Makefile.am b/web/css/Makefile.am
deleted file mode 100644
index 917b8f389..000000000
--- a/web/css/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/css
-
-dist_web_DATA = \
-	reset.css \
-	spinner.css \
-	overlay.css
diff --git a/web/graphics/Makefile.am b/web/graphics/Makefile.am
deleted file mode 100644
index ec252c82e..000000000
--- a/web/graphics/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/graphics
-
-dist_web_DATA = \
-	favicon.ico \
-    spinner.gif \
-	transparent.gif
diff --git a/web/includes/Makefile.am b/web/includes/Makefile.am
deleted file mode 100644
index d4a1ece9b..000000000
--- a/web/includes/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/includes
-
-web_DATA = \
-	config.php
-
-dist_web_DATA = \
-	Monitor.php \
-	Server.php \
-	actions.php \
-	database.php \
-	functions.php \
-	control_functions.php \
-	lang.php \
-	logger.php
-
-EXTRA_DIST = \
-	config.php.in
diff --git a/web/js/Makefile.am b/web/js/Makefile.am
deleted file mode 100644
index 21c10613e..000000000
--- a/web/js/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/js
-
-dist_web_DATA = \
-    logger.js \
-    overlay.js \
-    mootools.ext.js
diff --git a/web/lang/Makefile.am b/web/lang/Makefile.am
deleted file mode 100644
index 22d256a2e..000000000
--- a/web/lang/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/lang
-
-dist_web_DATA = \
-	big5_big5.php \
-	cn_zh.php \
-	cs_cz.php \
-	de_de.php \
-	dk_dk.php \
-	et_ee.php \
-	en_gb.php \
-	en_us.php \
-	es_ar.php \
-	fr_fr.php \
-	he_il.php \
-	hu_hu.php \
-	it_it.php \
-	ja_jp.php \
-	nl_nl.php \
-	pl_pl.php \
-	pt_br.php \
-	ro_ro.php \
-	ru_ru.php \
-	se_se.php
diff --git a/web/skins/Makefile.am b/web/skins/Makefile.am
deleted file mode 100644
index ae0abd8e8..000000000
--- a/web/skins/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-SUBDIRS = \
-	classic \
-	mobile \
-	xml
diff --git a/web/skins/classic/Makefile.am b/web/skins/classic/Makefile.am
deleted file mode 100644
index 986beae0d..000000000
--- a/web/skins/classic/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic
-
-SUBDIRS = \
-	ajax \
-	css \
-	graphics \
-	includes \
-	js \
-	lang \
-	views
-
-dist_web_DATA = \
-    skin.php
diff --git a/web/skins/classic/ajax/Makefile.am b/web/skins/classic/ajax/Makefile.am
deleted file mode 100644
index f910cbc5c..000000000
--- a/web/skins/classic/ajax/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/ajax
-
-dist_web_DATA =  # No files here
diff --git a/web/skins/classic/css/Makefile.am b/web/skins/classic/css/Makefile.am
deleted file mode 100644
index 2c43d2e47..000000000
--- a/web/skins/classic/css/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/css
-
-SUBDIRS = dark \
-		flat \
-		classic
diff --git a/web/skins/classic/css/classic/Makefile.am b/web/skins/classic/css/classic/Makefile.am
deleted file mode 100644
index 48dc58ab7..000000000
--- a/web/skins/classic/css/classic/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/css/classic
-
-SUBDIRS = views
-
-dist_web_DATA = \
-	skin.css \
-	control.css \
-	export.css
diff --git a/web/skins/classic/css/classic/views/Makefile.am b/web/skins/classic/css/classic/views/Makefile.am
deleted file mode 100644
index d07eaac4f..000000000
--- a/web/skins/classic/css/classic/views/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/css/classic/views
-
-dist_web_DATA = \
-	console.css \
-	controlcaps.css \
-	control.css \
-	devices.css \
-	event.css \
-	events.css \
-	export.css \
-	filter.css \
-	frame.css \
-	frames.css \
-	groups.css \
-	log.css \
-	monitor.css \
-	montage_2wide.css \
-	montage_3wide50enlarge.css \
-	montage_3wide.css \
-	montage_4wide.css \
-	montage.css \
-	montage_freeform.css \
-	options.css \
-	stats.css \
-	timeline.css \
-	timeline.css.php \
-	video.css \
-	watch.css \
-	zone.css
diff --git a/web/skins/classic/css/dark/Makefile.am b/web/skins/classic/css/dark/Makefile.am
deleted file mode 100644
index 6961860eb..000000000
--- a/web/skins/classic/css/dark/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/css/dark
-
-SUBDIRS = views
-
-dist_web_DATA = \
-	skin.css \
-	control.css \
-	export.css
diff --git a/web/skins/classic/css/dark/views/Makefile.am b/web/skins/classic/css/dark/views/Makefile.am
deleted file mode 100644
index 2180d6432..000000000
--- a/web/skins/classic/css/dark/views/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/css/dark/views
-
-dist_web_DATA = \
-	console.css \
-	controlcaps.css \
-	control.css \
-	devices.css \
-	event.css \
-	events.css \
-	export.css \
-	filter.css \
-	frame.css \
-	frames.css \
-	groups.css \
-	log.css \
-	monitor.css \
-	montage_2wide.css \
-	montage_3wide50enlarge.css \
-	montage_3wide.css \
-	montage_4wide.css \
-	montage.css \
-	montage_freeform.css \
-	options.css \
-	stats.css \
-	timeline.css \
-	timeline.css.php \
-	video.css \
-	watch.css \
-	zone.css
diff --git a/web/skins/classic/css/flat/Makefile.am b/web/skins/classic/css/flat/Makefile.am
deleted file mode 100644
index 297982929..000000000
--- a/web/skins/classic/css/flat/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/css/flat
-
-SUBDIRS = views
-
-dist_web_DATA = \
-	skin.css \
-	control.css \
-	export.css
diff --git a/web/skins/classic/css/flat/views/Makefile.am b/web/skins/classic/css/flat/views/Makefile.am
deleted file mode 100644
index dff0aa29b..000000000
--- a/web/skins/classic/css/flat/views/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/css/flat/views
-
-dist_web_DATA = \
-	console.css \
-	controlcaps.css \
-	control.css \
-	devices.css \
-	event.css \
-	events.css \
-	export.css \
-	filter.css \
-	frame.css \
-	frames.css \
-	groups.css \
-	log.css \
-	monitor.css \
-	montage_2wide.css \
-	montage_3wide50enlarge.css \
-	montage_3wide.css \
-	montage_4wide.css \
-	montage.css \
-	montage_freeform.css \
-	options.css \
-	stats.css \
-	timeline.css \
-	timeline.css.php \
-	video.css \
-	watch.css \
-	zone.css
diff --git a/web/skins/classic/graphics/Makefile.am b/web/skins/classic/graphics/Makefile.am
deleted file mode 100644
index c5c7b6bba..000000000
--- a/web/skins/classic/graphics/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/graphics
-
-dist_web_DATA =  \
-	arrow-d.gif \
-	arrow-dl.gif \
-	arrow-dr.gif \
-	arrow-l-d.gif \
-	arrow-l.gif \
-	arrow-l-u.gif \
-	arrow-r.gif \
-	arrow-s-d.gif \
-	arrow-s-u.gif \
-	arrow-u.gif \
-	arrow-ul.gif \
-	arrow-ur.gif \
-	center.gif \
-	point-g.gif \
-	point-o.gif \
-	point-r.gif \
-	seq-d.gif \
-	seq-u.gif
diff --git a/web/skins/classic/includes/Makefile.am b/web/skins/classic/includes/Makefile.am
deleted file mode 100644
index 690df231a..000000000
--- a/web/skins/classic/includes/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/includes
-
-dist_web_DATA = \
-	init.php \
-	config.php \
-	functions.php \
-	control_functions.php \
-	export_functions.php \
-	timeline_functions.php
diff --git a/web/skins/classic/js/Makefile.am b/web/skins/classic/js/Makefile.am
deleted file mode 100644
index 3f5ffdda2..000000000
--- a/web/skins/classic/js/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/js
-
-dist_web_DATA = \
-	skin.js \
-	classic.js \
-	dark.js \
-	flat.js \
-	skin.js.php
diff --git a/web/skins/classic/lang/Makefile.am b/web/skins/classic/lang/Makefile.am
deleted file mode 100644
index 6a089b4fa..000000000
--- a/web/skins/classic/lang/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/lang
-
-dist_web_DATA =  # No files here
diff --git a/web/skins/classic/views/Makefile.am b/web/skins/classic/views/Makefile.am
deleted file mode 100644
index 4167a886b..000000000
--- a/web/skins/classic/views/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-SUBDIRS = \
-	js
-
-webdir = @WEB_PREFIX@/skins/classic/views
-
-dist_web_DATA = \
-	bandwidth.php \
-	blank.php \
-	console.php \
-	controlcap.php \
-	controlcaps.php \
-	control.php \
-	controlpreset.php \
-	cycle.php \
-	device.php \
-	devices.php \
-	donate.php \
-	error.php \
-	eventdetail.php \
-	event.php \
-	events.php \
-	export.php \
-	filter.php \
-	filtersave.php \
-	frame.php \
-	frames.php \
-	function.php \
-	group.php \
-	groups.php \
-	log.php \
-	login.php \
-	logout.php \
-	Makefile.am \
-	monitor.php \
-	monitorpreset.php \
-	monitorprobe.php \
-	montage.php \
-    montagereview.php \
-	none.php \
-  onvifprobe.php \
-	optionhelp.php \
-	options.php \
-	postlogin.php \
-	server.php \
-	settings.php \
-	state.php \
-	stats.php \
-	status.php \
-	timeline.php \
-	user.php \
-	version.php \
-	video.php \
-	watch.php \
-	zone.php \
-	zones.php
diff --git a/web/skins/classic/views/js/Makefile.am b/web/skins/classic/views/js/Makefile.am
deleted file mode 100644
index 73c74fafe..000000000
--- a/web/skins/classic/views/js/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/views/js
-
-dist_web_DATA = \
-	console.js \
-	console.js.php \
-	control.js \
-	controlpreset.js \
-	controlpreset.js.php \
-	cycle.js \
-	cycle.js.php \
-	devices.js \
-	donate.js \
-	donate.js.php \
-	event.js \
-	event.js.php \
-	events.js \
-	events.js.php \
-	export.js \
-	export.js.php \
-	filter.js \
-	filter.js.php \
-	group.js \
-	groups.js \
-	log.js \
-	login.js \
-	Makefile.am \
-	monitor.js \
-	monitor.js.php \
-	monitorpreset.js \
-	monitorprobe.js \
-	montage.js \
-	montage.js.php \
-  onvifprobe.js \
-	options.js.php \
-	postlogin.js.php \
-	state.js \
-	state.js.php \
-	timeline.js \
-	timeline.js.php \
-	user.js \
-	version.js \
-	version.js.php \
-	video.js \
-	video.js.php \
-	watch.js \
-	watch.js.php \
-	zone.js \
-	zone.js.php
diff --git a/web/skins/mobile/Makefile.am b/web/skins/mobile/Makefile.am
deleted file mode 100644
index 35051fade..000000000
--- a/web/skins/mobile/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/mobile
-
-SUBDIRS = \
-	ajax \
-	css \
-	graphics \
-	includes \
-	lang \
-	views
-
-dist_web_DATA = \
-    skin.php
diff --git a/web/skins/mobile/ajax/Makefile.am b/web/skins/mobile/ajax/Makefile.am
deleted file mode 100644
index 0558929c0..000000000
--- a/web/skins/mobile/ajax/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/mobile/ajax
-
-dist_web_DATA =  # No files here
diff --git a/web/skins/mobile/css/Makefile.am b/web/skins/mobile/css/Makefile.am
deleted file mode 100644
index 6353e163e..000000000
--- a/web/skins/mobile/css/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/mobile/css
-
-dist_web_DATA = \
-	skin.css
diff --git a/web/skins/mobile/graphics/Makefile.am b/web/skins/mobile/graphics/Makefile.am
deleted file mode 100644
index dfd43bef7..000000000
--- a/web/skins/mobile/graphics/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/mobile/graphics
-
-dist_web_DATA =  # No files here
diff --git a/web/skins/mobile/includes/Makefile.am b/web/skins/mobile/includes/Makefile.am
deleted file mode 100644
index c88ad435a..000000000
--- a/web/skins/mobile/includes/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/mobile/includes
-
-dist_web_DATA = \
-	init.php \
-	config.php \
-	functions.php \
-	control_functions.php
diff --git a/web/skins/mobile/lang/Makefile.am b/web/skins/mobile/lang/Makefile.am
deleted file mode 100644
index 5084203fb..000000000
--- a/web/skins/mobile/lang/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/mobile/lang
-
-dist_web_DATA =  # No files here
diff --git a/web/skins/mobile/views/Makefile.am b/web/skins/mobile/views/Makefile.am
deleted file mode 100644
index c7d175ca3..000000000
--- a/web/skins/mobile/views/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-SUBDIRS = \
-	css
-
-webdir = @WEB_PREFIX@/skins/mobile/views
-
-dist_web_DATA = \
-	console.php \
-	devices.php \
-	error.php \
-	eventdetails.php \
-	event.php \
-	events.php \
-	filter.php \
-	frame.php \
-	function.php \
-	login.php \
-	montage.php \
-	state.php \
-	video.php \
-	watch.php
diff --git a/web/skins/mobile/views/css/Makefile.am b/web/skins/mobile/views/css/Makefile.am
deleted file mode 100644
index 86e0ff0a3..000000000
--- a/web/skins/mobile/views/css/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/mobile/views/css
-
-dist_web_DATA = \
-	console.css
diff --git a/web/skins/xml/Makefile.am b/web/skins/xml/Makefile.am
deleted file mode 100644
index 2c30d19a3..000000000
--- a/web/skins/xml/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/xml
-
-SUBDIRS = \
-	includes \
-	views
-
-dist_web_DATA = \
-	skin.php
diff --git a/web/skins/xml/includes/Makefile.am b/web/skins/xml/includes/Makefile.am
deleted file mode 100644
index c6128f8a2..000000000
--- a/web/skins/xml/includes/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/xml/includes
-
-dist_web_DATA = \
-	init.php \
-	config.php \
-	functions.php
diff --git a/web/skins/xml/views/Makefile.am b/web/skins/xml/views/Makefile.am
deleted file mode 100644
index ab9147ae4..000000000
--- a/web/skins/xml/views/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-SUBDIRS = 
-
-webdir = @WEB_PREFIX@/skins/xml/views
-
-dist_web_DATA = \
-	console.php \
-	actions.php \
-	none.php \
-	notfound.png
diff --git a/web/tools/Makefile.am b/web/tools/Makefile.am
deleted file mode 100644
index 29c91bc02..000000000
--- a/web/tools/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-SUBDIRS = \
-	mootools
diff --git a/web/tools/mootools/Makefile.am b/web/tools/mootools/Makefile.am
deleted file mode 100644
index 89b17ab8d..000000000
--- a/web/tools/mootools/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/tools/mootools
-
-dist_web_DATA = \
-	mootools-core-1.4.5-compat.js \
-	mootools-more-1.5.1.js
-
-# Yes, you are correct. This is a HACK!
-install-data-hook:
-	( cd $(DESTDIR)$(webdir); rm -f mootools-core.js mootools-more.js )
-	( cd $(DESTDIR)$(webdir); ln -sf mootools-core-1.4.5-compat.js mootools-core.js )
-	( cd $(DESTDIR)$(webdir); ln -sf mootools-more-1.5.1.js mootools-more.js )
-
-uninstall-hook:
-	@-( cd $(DESTDIR)$(webdir); rm -f mootools-* )
diff --git a/web/views/Makefile.am b/web/views/Makefile.am
deleted file mode 100644
index 6ecec9d8b..000000000
--- a/web/views/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/views
-
-dist_web_DATA = file.php \
-	image.php