Remove Makefile.lite build system

43 files changed, 11 insertions, 1177 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index fcc3cfbf..1971d834 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,5 +39,4 @@ SUBDIRS = \
 	$(CPPLIBS_DIRS)
 
 EXTRA_DIST = \
-	CMakeLists.txt \
-	Makefile.lite
+	CMakeLists.txt
diff --git a/src/Makefile.lite b/src/Makefile.lite
deleted file mode 100644
index 7e297c31..00000000
--- a/src/Makefile.lite
+++ /dev/null
@@ -1,76 +0,0 @@
-#  FLAC - Free Lossless Audio Codec
-#  Copyright (C) 2001-2009  Josh Coalson
-#  Copyright (C) 2011-2016  Xiph.Org Foundation
-#
-#  This file is part the FLAC project.  FLAC is comprised of several
-#  components distributed under different licenses.  The codec libraries
-#  are distributed under Xiph.Org's BSD-like license (see the file
-#  COPYING.Xiph in this distribution).  All other programs, libraries, and
-#  plugins are distributed under the GPL (see COPYING.GPL).  The documentation
-#  is distributed under the Gnu FDL (see COPYING.FDL).  Each file in the
-#  FLAC distribution contains at the top the terms under which it may be
-#  distributed.
-#
-#  Since this particular file is relevant to all components of FLAC,
-#  it may be distributed under the Xiph.Org license, which is the least
-#  restrictive of those mentioned above.  See the file COPYING.Xiph in this
-#  distribution.
-
-topdir = ..
-
-include $(topdir)/build/config.mk
-
-ifeq ($(OS),Darwin)
-    EXTRA_TARGETS =
-else
-ifeq ($(PROC),x86_64)
-    EXTRA_TARGETS =
-else
-	# Can add plugin_xmms here if desired.
-    EXTRA_TARGETS =
-endif
-endif
-
-ifeq ($(findstring Windows,$(OS)),Windows)
-    EXTRA_TARGETS += share/win_utf8_io
-endif
-
-.PHONY: all flac libFLAC libFLAC++ metaflac plugin_common plugin_xmms share/win_utf8_io share test_grabbag test_libs_common test_libFLAC test_libFLAC++ test_seeking test_streams flacdiff flactimer
-all: flac libFLAC libFLAC++ metaflac plugin_common $(EXTRA_TARGETS) share test_grabbag test_libs_common test_libFLAC test_libFLAC++ test_seeking test_streams
-
-DEFAULT_CONFIG = release
-
-CONFIG = $(DEFAULT_CONFIG)
-
-debug   : CONFIG = debug
-valgrind: CONFIG = valgrind
-release : CONFIG = release
-
-debug   : all
-valgrind: all
-release : all
-
-flac libFLAC libFLAC++ metaflac plugin_common plugin_xmms share/win_utf8_io share test_grabbag test_libs_common test_libFLAC test_libFLAC++ test_seeking test_streams:
-	(cd $@ ; $(MAKE) -f Makefile.lite $(CONFIG))
-
-flacdiff flactimer:
-	(cd utils/$@ ; $(MAKE) -f Makefile.lite $(CONFIG))
-
-clean:
-	-(cd flac ; $(MAKE) -f Makefile.lite clean)
-	-(cd libFLAC ; $(MAKE) -f Makefile.lite clean)
-	-(cd libFLAC++ ; $(MAKE) -f Makefile.lite clean)
-	-(cd metaflac ; $(MAKE) -f Makefile.lite clean)
-	-(cd plugin_common ; $(MAKE) -f Makefile.lite clean)
-	-(cd plugin_xmms ; $(MAKE) -f Makefile.lite clean)
-	-(cd share ; $(MAKE) -f Makefile.lite clean)
-	-(cd test_grabbag ; $(MAKE) -f Makefile.lite clean)
-	-(cd test_libs_common ; $(MAKE) -f Makefile.lite clean)
-	-(cd test_libFLAC ; $(MAKE) -f Makefile.lite clean)
-	-(cd test_libFLAC++ ; $(MAKE) -f Makefile.lite clean)
-	-(cd test_seeking ; $(MAKE) -f Makefile.lite clean)
-	-(cd test_streams ; $(MAKE) -f Makefile.lite clean)
-	-(cd utils/flacdiff ; $(MAKE) -f Makefile.lite clean)
-	-(cd utils/flactimer ; $(MAKE) -f Makefile.lite clean)
-
-include $(topdir)/Makefile.deps
diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am
index 6171a835..f91b9890 100644
--- a/src/flac/Makefile.am
+++ b/src/flac/Makefile.am
@@ -22,8 +22,6 @@ AM_CFLAGS = @OGG_CFLAGS@
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 EXTRA_DIST = \
 	CMakeLists.txt \
-	Makefile.lite \
-	Makefile.lite.iffscan \
 	iffscan.c
 
 flac_SOURCES = \
diff --git a/src/flac/Makefile.lite b/src/flac/Makefile.lite
deleted file mode 100644
index d6553cf9..00000000
--- a/src/flac/Makefile.lite
+++ /dev/null
@@ -1,54 +0,0 @@
-#  flac - Command-line FLAC encoder/decoder
-#  Copyright (C) 2000-2009  Josh Coalson
-#  Copyright (C) 2011-2016  Xiph.Org Foundation
-#
-#  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 2
-#  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, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#
-# GNU makefile
-#
-
-topdir = ../..
-
-include $(topdir)/build/config.mk
-libdir = $(topdir)/objs/$(BUILD)/lib
-
-PROGRAM_NAME = flac
-
-INCLUDES = -I./include -I$(topdir)/include $(OGG_INCLUDES)
-
-ifeq ($(OS),Darwin)
-    EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(libdir)/libreplaygain_synthesis.a $(libdir)/libgetopt.a $(libdir)/libutf8.a $(OGG_EXPLICIT_LIBS) $(ICONV_LIBS) -lm
-else
-ifeq ($(findstring Windows,$(OS)),Windows)
-    LIBS = -lgrabbag -lFLAC -lreplaygain_analysis -lreplaygain_synthesis -lgetopt -lutf8 -lgrabbag -lwin_utf8_io $(OGG_LIBS) -lm
-else
-    LIBS = -lgrabbag -lFLAC -lreplaygain_analysis -lreplaygain_synthesis -lgetopt -lutf8 -lgrabbag $(OGG_LIBS) -lm
-endif
-endif
-
-SRCS_C = \
-	analyze.c \
-	decode.c \
-	encode.c \
-	foreign_metadata.c \
-	local_string_utils.c \
-	main.c \
-	utils.c \
-	vorbiscomment.c
-
-include $(topdir)/build/exe.mk
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/flac/Makefile.lite.iffscan b/src/flac/Makefile.lite.iffscan
deleted file mode 100644
index 65c6084d..00000000
--- a/src/flac/Makefile.lite.iffscan
+++ /dev/null
@@ -1,46 +0,0 @@
-#  flac - Command-line FLAC encoder/decoder
-#  Copyright (C) 2000-2009  Josh Coalson
-#  Copyright (C) 2011-2016  Xiph.Org Foundation
-#
-#  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 2
-#  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, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#
-# GNU makefile
-#
-
-topdir = ../..
-libdir = $(topdir)/objs/$(BUILD)/lib
-
-PROGRAM_NAME = iffscan
-
-INCLUDES = -I./include -I$(topdir)/include $(OGG_INCLUDES)
-
-ifeq ($(OS),Darwin)
-    EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) $(ICONV_LIBS) -lm
-else
-ifeq ($(findstring Windows,$(OS)),Windows)
-    LIBS = -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm
-else
-    LIBS = -lFLAC $(OGG_LIBS) -lm
-endif
-endif
-
-SRCS_C = \
-	foreign_metadata.c \
-	iffscan.c
-
-include $(topdir)/build/exe.mk
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/libFLAC++/Makefile.am b/src/libFLAC++/Makefile.am
index 891b3668..b05af646 100644
--- a/src/libFLAC++/Makefile.am
+++ b/src/libFLAC++/Makefile.am
@@ -40,7 +40,6 @@ pkgconfig_DATA = flac++.pc
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 EXTRA_DIST = \
 	CMakeLists.txt \
-	Makefile.lite \
 	flac++.pc.in \
 	libFLAC++.m4
 
diff --git a/src/libFLAC++/Makefile.lite b/src/libFLAC++/Makefile.lite
deleted file mode 100644
index 3853a01b..00000000
--- a/src/libFLAC++/Makefile.lite
+++ /dev/null
@@ -1,63 +0,0 @@
-#  libFLAC++ - Free Lossless Audio Codec library
-#  Copyright (C) 2002-2009  Josh Coalson
-#  Copyright (C) 2011-2016  Xiph.Org Foundation
-#
-#  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions
-#  are met:
-#
-#  - Redistributions of source code must retain the above copyright
-#  notice, this list of conditions and the following disclaimer.
-#
-#  - Redistributions in binary form must reproduce the above copyright
-#  notice, this list of conditions and the following disclaimer in the
-#  documentation and/or other materials provided with the distribution.
-#
-#  - Neither the name of the Xiph.org Foundation nor the names of its
-#  contributors may be used to endorse or promote products derived from
-#  this software without specific prior written permission.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#  A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-#  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-#  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-#  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-#  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-#  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-#  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#
-# GNU makefile
-#
-
-topdir = ../..
-libdir = $(topdir)/objs/$(BUILD)/lib
-
-ifndef OS
-    OS := $(shell uname -s)
-endif
-
-ifeq ($(OS),Darwin)
-    EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm -lstdc++
-else
-ifeq ($(OS),FreeBSD)
-    LIBS = -lFLAC $(OGG_LIBS) -lm -lstdc++
-else
-    LIBS = -lFLAC $(OGG_LIBS) -lm -lsupc++
-endif
-endif
-
-LIB_NAME = libFLAC++
-INCLUDES = -I$(topdir)/include
-
-SRCS_CPP = \
-	metadata.cpp \
-	stream_decoder.cpp \
-	stream_encoder.cpp
-
-include $(topdir)/build/lib.mk
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index 5643bfc0..ddd37bc7 100644
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -73,7 +73,6 @@ pkgconfig_DATA = flac.pc
 
 EXTRA_DIST = \
 	CMakeLists.txt \
-	Makefile.lite \
 	flac.pc.in \
 	libFLAC.m4 \
 	deduplication/lpc_compute_autocorrelation_intrin_sse2.c \
diff --git a/src/libFLAC/Makefile.lite b/src/libFLAC/Makefile.lite
deleted file mode 100644
index 6f95092e..00000000
--- a/src/libFLAC/Makefile.lite
+++ /dev/null
@@ -1,110 +0,0 @@
-#  libFLAC - Free Lossless Audio Codec library
-#  Copyright (C) 2001-2009  Josh Coalson
-#  Copyright (C) 2011-2016  Xiph.Org Foundation
-#
-#  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions
-#  are met:
-#
-#  - Redistributions of source code must retain the above copyright
-#  notice, this list of conditions and the following disclaimer.
-#
-#  - Redistributions in binary form must reproduce the above copyright
-#  notice, this list of conditions and the following disclaimer in the
-#  documentation and/or other materials provided with the distribution.
-#
-#  - Neither the name of the Xiph.org Foundation nor the names of its
-#  contributors may be used to endorse or promote products derived from
-#  this software without specific prior written permission.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#  A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-#  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-#  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-#  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-#  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-#  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-#  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#
-# GNU makefile
-#
-
-topdir = ../..
-
-ifeq ($(OS),Darwin)
-    EXPLICIT_LIBS = $(OGG_EXPLICIT_LIBS) -lm
-else
-    LIBS = $(OGG_LIBS) -lm
-endif
-
-ifeq ($(findstring Windows,$(OS)),Windows)
-    WIN_UNICODE_COMPAT = ../share/win_utf8_io/win_utf8_io.c
-endif
-
-LIB_NAME = libFLAC
-ifeq ($(PROC),ppc)
-    DEFINES = -DFLAC__CPU_PPC -DFLAC__USE_ALTIVEC -DFLAC__ALIGN_MALLOC_DATA
-else
-ifeq ($(OS),Solaris)
-    DEFINES = -DFLAC__NO_ASM -DFLAC__ALIGN_MALLOC_DATA
-else
-ifeq ($(PROC),i386)
-    DEFINES = -DFLAC__CPU_IA32 -DFLAC__HAS_NASM -DFLAC__ALIGN_MALLOC_DATA
-else
-    DEFINES = -DFLAC__ALIGN_MALLOC_DATA
-endif
-endif
-endif
-INCLUDES = -I./include -I$(topdir)/include $(OGG_INCLUDES)
-DEBUG_CFLAGS = -DFLAC__OVERFLOW_DETECT
-
-ifeq ($(PROC),i386)
-SRCS_NASM = \
-	ia32/cpu_asm.nasm \
-	ia32/fixed_asm.nasm \
-	ia32/lpc_asm.nasm
-endif
-
-OGG_SRCS_C = \
-	ogg_decoder_aspect.c \
-	ogg_encoder_aspect.c \
-	ogg_helper.c \
-	ogg_mapping.c
-
-SRCS_C = \
-	bitmath.c \
-	bitreader.c \
-	bitwriter.c \
-	cpu.c \
-	crc.c \
-	fixed.c \
-	fixed_intrin_sse2.c \
-	fixed_intrin_ssse3.c \
-	float.c \
-	format.c \
-	lpc.c \
-	lpc_intrin_sse2.c \
-	lpc_intrin_sse41.c \
-	lpc_intrin_avx2.c \
-	lpc_intrin_neon.c \
-	md5.c \
-	memory.c \
-	metadata_iterators.c \
-	metadata_object.c \
-	stream_decoder.c \
-	stream_encoder.c \
-	stream_encoder_intrin_sse2.c \
-	stream_encoder_intrin_ssse3.c \
-	stream_encoder_intrin_avx2.c \
-	stream_encoder_framing.c \
-	window.c \
-	$(WIN_UNICODE_COMPAT) \
-	$(OGG_SRCS)
-
-include $(topdir)/build/lib.mk
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/metaflac/Makefile.am b/src/metaflac/Makefile.am
index 8e0ae3cf..a4b4c735 100644
--- a/src/metaflac/Makefile.am
+++ b/src/metaflac/Makefile.am
@@ -21,8 +21,7 @@ bin_PROGRAMS = metaflac
 AM_CFLAGS = @OGG_CFLAGS@
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 EXTRA_DIST = \
-	CMakeLists.txt \
-	Makefile.lite
+	CMakeLists.txt
 
 metaflac_SOURCES = \
 	main.c \
diff --git a/src/metaflac/Makefile.lite b/src/metaflac/Makefile.lite
deleted file mode 100644
index 7025717b..00000000
--- a/src/metaflac/Makefile.lite
+++ /dev/null
@@ -1,56 +0,0 @@
-#  metaflac - Command-line FLAC metadata editor
-#  Copyright (C) 2000-2009  Josh Coalson
-#  Copyright (C) 2011-2016  Xiph.Org Foundation
-#
-#  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 2
-#  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, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#
-# GNU makefile
-#
-
-topdir = ../..
-
-include $(topdir)/build/config.mk
-libdir = $(topdir)/objs/$(BUILD)/lib
-
-PROGRAM_NAME = metaflac
-
-INCLUDES = -I./include -I$(topdir)/include $(OGG_INCLUDES)
-
-ifeq ($(OS),Darwin)
-    EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(libdir)/libgetopt.a $(libdir)/libutf8.a $(OGG_EXPLICIT_LIBS) $(ICONV_LIBS) -lm
-else
-ifeq ($(findstring Windows,$(OS)),Windows)
-    LIBS = -lgrabbag -lFLAC -lreplaygain_analysis -lgetopt -lutf8 -lgrabbag -lwin_utf8_io $(OGG_LIBS) -lm
-else
-    LIBS = -lgrabbag -lFLAC -lreplaygain_analysis -lgetopt -lutf8 -lgrabbag $(OGG_LIBS) -lm
-endif
-endif
-
-SRCS_C = \
-	main.c \
-	operations.c \
-	operations_shorthand_cuesheet.c \
-	operations_shorthand_picture.c \
-	operations_shorthand_seektable.c \
-	operations_shorthand_streaminfo.c \
-	operations_shorthand_vorbiscomment.c \
-	options.c \
-	usage.c \
-	utils.c
-
-include $(topdir)/build/exe.mk
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/plugin_common/Makefile.am b/src/plugin_common/Makefile.am
index 2c41f5bc..30a1a4c7 100644
--- a/src/plugin_common/Makefile.am
+++ b/src/plugin_common/Makefile.am
@@ -36,5 +36,4 @@ libplugin_common_la_SOURCES = \
 
 EXTRA_DIST = \
 	CMakeLists.txt \
-	Makefile.lite \
 	README
diff --git a/src/plugin_common/Makefile.lite b/src/plugin_common/Makefile.lite
deleted file mode 100644
index dc494a7e..00000000
--- a/src/plugin_common/Makefile.lite
+++ /dev/null
@@ -1,42 +0,0 @@
-#  plugin_common - Routines common to several plugins
-#  Copyright (C) 2002-2009  Josh Coalson
-#  Copyright (C) 2011-2016  Xiph.Org Foundation
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License, or (at your option) any later version.
-#
-#  This library 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
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-#
-# GNU makefile
-#
-
-topdir = ../..
-
-LIB_NAME = libplugin_common
-INCLUDES = -I$(topdir)/include -I$(HOME)/local/include
-
-ifeq ($(OS),Darwin)
-    EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm
-else
-    LIBS = -lgrabbag -lreplaygain_analysis -lFLAC $(OGG_LIBS) -lm
-endif
-
-SRCS_C = \
-	charset.c \
-	dither.c \
-	replaygain.c \
-	tags.c
-
-include $(topdir)/build/lib.mk
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/plugin_xmms/Makefile.am b/src/plugin_xmms/Makefile.am
index 3d011a31..0dcab1cf 100644
--- a/src/plugin_xmms/Makefile.am
+++ b/src/plugin_xmms/Makefile.am
@@ -21,8 +21,7 @@
 #
 
 EXTRA_DIST = \
-	CMakeLists.txt \
-	Makefile.lite
+	CMakeLists.txt
 
 noinst_HEADERS = \
 	charset.h \
diff --git a/src/plugin_xmms/Makefile.lite b/src/plugin_xmms/Makefile.lite
deleted file mode 100644
index 87f081e7..00000000
--- a/src/plugin_xmms/Makefile.lite
+++ /dev/null
@@ -1,45 +0,0 @@
-#  libxmms-flac - XMMS FLAC input plugin
-#  Copyright (C) 2000-2009  Josh Coalson
-#  Copyright (C) 2011-2016  Xiph.Org Foundation
-#
-#  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 2
-#  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, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#
-# GNU makefile
-#
-
-topdir = ../..
-libdir = $(topdir)/objs/$(BUILD)/lib
-
-LIB_NAME  = libxmms-flac
-INCLUDES  = -I./include -I$(topdir)/include -I.. $(shell xmms-config --cflags)
-# refer to the static libs explicitly
-ifeq ($(OS),Darwin)
-    LIBS = $(libdir)/libFLAC.a $(libdir)/libplugin_common.a $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libreplaygain_synthesis.a $(OGG_EXPLICIT_LIBS) $(ICONV_LIBS) -lm -lstdc++ -lz
-else
-    LIBS = $(libdir)/libFLAC.a $(libdir)/libplugin_common.a $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libreplaygain_synthesis.a $(OGG_LIBS) -lm -lsupc++ -lz
-endif
-
-SRCS_C = \
-	charset.c \
-	configure.c \
-	plugin.c \
-	fileinfo.c \
-	http.c \
-	tag.c
-
-include $(topdir)/build/lib.mk
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/share/Makefile.am b/src/share/Makefile.am
index 3c581dc8..45a050b0 100644
--- a/src/share/Makefile.am
+++ b/src/share/Makefile.am
@@ -21,22 +21,15 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 
 EXTRA_DIST = \
-	Makefile.lite \
 	README \
 	getopt/CMakeLists.txt \
-	getopt/Makefile.lite \
 	grabbag/CMakeLists.txt \
-	grabbag/Makefile.lite \
 	replaygain_analysis/CMakeLists.txt \
-	replaygain_analysis/Makefile.lite \
 	replaygain_synthesis/CMakeLists.txt \
-	replaygain_synthesis/Makefile.lite \
 	utf8/CMakeLists.txt \
-	utf8/Makefile.lite \
 	utf8/charmaps.h \
 	utf8/makemap.c \
-	utf8/charset_test.c \
-	win_utf8_io/Makefile.lite
+	utf8/charset_test.c
 
 
 noinst_LTLIBRARIES = \
diff --git a/src/share/Makefile.lite b/src/share/Makefile.lite
deleted file mode 100644
index d5777874..00000000
--- a/src/share/Makefile.lite
+++ /dev/null
@@ -1,58 +0,0 @@
-#  FLAC - Free Lossless Audio Codec
-#  Copyright (C) 2001-2009  Josh Coalson
-#  Copyright (C) 2011-2016  Xiph.Org Foundation
-#
-#  This file is part the FLAC project.  FLAC is comprised of several
-#  components distributed under different licenses.  The codec libraries
-#  are distributed under Xiph.Org's BSD-like license (see the file
-#  COPYING.Xiph in this distribution).  All other programs, libraries, and
-#  plugins are distributed under the GPL (see COPYING.GPL).  The documentation
-#  is distributed under the Gnu FDL (see COPYING.FDL).  Each file in the
-#  FLAC distribution contains at the top the terms under which it may be
-#  distributed.
-#
-#  Since this particular file is relevant to all components of FLAC,
-#  it may be distributed under the Xiph.Org license, which is the least
-#  restrictive of those mentioned above.  See the file COPYING.Xiph in this
-#  distribution.
-
-.PHONY: all getopt grabbag replaygain_analysis replaygain_synthesis utf8
-all: getopt replaygain_analysis grabbag replaygain_synthesis utf8
-
-DEFAULT_CONFIG = release
-
-CONFIG = $(DEFAULT_CONFIG)
-
-debug   : CONFIG = debug
-valgrind: CONFIG = valgrind
-release : CONFIG = release
-
-debug   : all
-valgrind: all
-release : all
-
-getopt:
-	(cd $@ ; $(MAKE) -f Makefile.lite $(CONFIG))
-
-replaygain_analysis:
-	(cd $@ ; $(MAKE) -f Makefile.lite $(CONFIG))
-
-grabbag:
-	(cd $@ ; $(MAKE) -f Makefile.lite $(CONFIG))
-
-replaygain_synthesis:
-	(cd $@ ; $(MAKE) -f Makefile.lite $(CONFIG))
-
-utf8:
-	(cd $@ ; $(MAKE) -f Makefile.lite $(CONFIG))
-
-win_utf8_io:
-	(cd $@ ; $(MAKE) -f Makefile.lite $(CONFIG))
-
-clean:
-	-(cd getopt ; $(MAKE) -f Makefile.lite clean)
-	-(cd grabbag ; $(MAKE) -f Makefile.lite clean)
-	-(cd replaygain_analysis ; $(MAKE) -f Makefile.lite clean)
-	-(cd replaygain_synthesis ; $(MAKE) -f Makefile.lite clean)
-	-(cd utf8 ; $(MAKE) -f Makefile.lite clean)
-	-(cd win_utf8_io ; $(MAKE) -f Makefile.lite clean)
diff --git a/src/share/getopt/Makefile.lite b/src/share/getopt/Makefile.lite
deleted file mode 100644
index b4df6ec6..00000000
--- a/src/share/getopt/Makefile.lite
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# GNU makefile
-#
-
-topdir = ../../..
-
-LIB_NAME = libgetopt
-INCLUDES = -I$(topdir)/include
-
-SRCS_C = \
-	getopt.c \
-	getopt1.c
-
-include $(topdir)/build/lib.mk
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/share/grabbag/Makefile.lite b/src/share/grabbag/Makefile.lite
deleted file mode 100644
index 6c8ff6c7..00000000
--- a/src/share/grabbag/Makefile.lite
+++ /dev/null
@@ -1,30 +0,0 @@
-#  grabbag - Convenience lib for various routines common to several tools
-
-#
-# GNU makefile
-#
-
-topdir = ../../..
-libdir = $(topdir)/objs/$(BUILD)/lib
-
-ifeq ($(OS),Darwin)
-    EXPLICIT_LIBS = $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(OGG_EXPLICIT_LIBS) -lm
-else
-    LIBS = -lFLAC -lreplaygain_analysis $(OGG_LIBS) -lm
-endif
-
-LIB_NAME = libgrabbag
-INCLUDES = -I$(topdir)/include
-
-SRCS_C = \
-	alloc.c \
-	cuesheet.c \
-	file.c \
-	picture.c \
-	replaygain.c \
-	seektable.c \
-	snprintf.c
-
-include $(topdir)/build/lib.mk
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/share/replaygain_analysis/Makefile.lite b/src/share/replaygain_analysis/Makefile.lite
deleted file mode 100644
index 4fa2cc90..00000000
--- a/src/share/replaygain_analysis/Makefile.lite
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# GNU makefile
-#
-
-topdir = ../../..
-
-LIB_NAME = libreplaygain_analysis
-INCLUDES = -I$(topdir)/include
-
-SRCS_C = \
-	replaygain_analysis.c
-
-include $(topdir)/build/lib.mk
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/share/replaygain_synthesis/Makefile.lite b/src/share/replaygain_synthesis/Makefile.lite
deleted file mode 100644
index a944234a..00000000
--- a/src/share/replaygain_synthesis/Makefile.lite
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# GNU makefile
-#
-
-topdir = ../../..
-
-LIB_NAME = libreplaygain_synthesis
-INCLUDES = -I./include -I$(topdir)/include
-
-SRCS_C = \
-	replaygain_synthesis.c
-
-include $(topdir)/build/lib.mk
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/share/utf8/Makefile.lite b/src/share/utf8/Makefile.lite
deleted file mode 100644
index ad504921..00000000
--- a/src/share/utf8/Makefile.lite
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# GNU makefile
-#
-
-topdir = ../../..
-libdir = $(topdir)/objs/$(BUILD)/lib
-
-LIB_NAME = libutf8
-
-ifeq ($(OS),Darwin)
-    EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(ICONV_LIBS)
-else
-    LIBS = -lgrabbag $(ICONV_LIBS)
-endif
-
-INCLUDES = -I$(topdir)/include
-
-SRCS_C = \
-	charset.c \
-	iconvert.c \
-	utf8.c
-
-include $(topdir)/build/lib.mk
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/share/win_utf8_io/Makefile.lite b/src/share/win_utf8_io/Makefile.lite
deleted file mode 100644
index 15492669..00000000
--- a/src/share/win_utf8_io/Makefile.lite
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# GNU makefile
-#
-
-topdir = ../../..
-
-ifeq ($(OS),Darwin)
-    EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm
-else
-    LIBS = -lFLAC $(OGG_LIBS) -lm
-endif
-
-LIB_NAME = libwin_utf8_io
-INCLUDES = -I$(topdir)/include
-
-SRCS_C = \
-	win_utf8_io.c
-
-include $(topdir)/build/lib.mk
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/test_grabbag/Makefile.am b/src/test_grabbag/Makefile.am
index c13ca3b7..537c3802 100644
--- a/src/test_grabbag/Makefile.am
+++ b/src/test_grabbag/Makefile.am
@@ -19,5 +19,4 @@
 SUBDIRS = cuesheet picture
 
 EXTRA_DIST = \
-	CMakeLists.txt \
-	Makefile.lite
+	CMakeLists.txt
diff --git a/src/test_grabbag/Makefile.lite b/src/test_grabbag/Makefile.lite
deleted file mode 100644
index a0e4447b..00000000
--- a/src/test_grabbag/Makefile.lite
+++ /dev/null
@@ -1,41 +0,0 @@
-#  test_grabbag - Simple testers for the grabbag library
-#  Copyright (C) 2002-2009  Josh Coalson
-#  Copyright (C) 2011-2016  Xiph.Org Foundation
-#
-#  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 2
-#  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, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-.PHONY: cuesheet picture
-all: cuesheet picture
-
-DEFAULT_CONFIG = release
-
-CONFIG = $(DEFAULT_CONFIG)
-
-debug   : CONFIG = debug
-valgrind: CONFIG = valgrind
-release : CONFIG = release
-
-debug   : all
-valgrind: all
-release : all
-
-cuesheet:
-	(cd $@ ; $(MAKE) -f Makefile.lite $(CONFIG))
-picture:
-	(cd $@ ; $(MAKE) -f Makefile.lite $(CONFIG))
-
-clean:
-	-(cd cuesheet ; $(MAKE) -f Makefile.lite clean)
-	-(cd picture ; $(MAKE) -f Makefile.lite clean)
diff --git a/src/test_grabbag/cuesheet/Makefile.am b/src/test_grabbag/cuesheet/Makefile.am
index ba452656..05cb4c1b 100644
--- a/src/test_grabbag/cuesheet/Makefile.am
+++ b/src/test_grabbag/cuesheet/Makefile.am
@@ -17,8 +17,7 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 EXTRA_DIST = \
-	CMakeLists.txt \
-	Makefile.lite
+	CMakeLists.txt
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 check_PROGRAMS = test_cuesheet
diff --git a/src/test_grabbag/cuesheet/Makefile.lite b/src/test_grabbag/cuesheet/Makefile.lite
deleted file mode 100644
index 8c7cab81..00000000
--- a/src/test_grabbag/cuesheet/Makefile.lite
+++ /dev/null
@@ -1,47 +0,0 @@
-#  test_cuesheet - Simple tester for cuesheet routines in grabbag
-#  Copyright (C) 2002-2009  Josh Coalson
-#  Copyright (C) 2011-2016  Xiph.Org Foundation
-#
-#  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 2
-#  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, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#
-# GNU makefile
-#
-
-topdir = ../../..
-
-include $(topdir)/build/config.mk
-libdir = $(topdir)/objs/$(BUILD)/lib
-
-PROGRAM_NAME = test_cuesheet
-
-INCLUDES = -I./include -I$(topdir)/include
-
-ifeq ($(OS),Darwin)
-    EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm
-else
-ifeq ($(findstring Windows,$(OS)),Windows)
-    LIBS = -lgrabbag -lreplaygain_analysis -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm
-else
-    LIBS = -lgrabbag -lreplaygain_analysis -lFLAC -lgrabbag $(OGG_LIBS) -lm
-endif
-endif
-
-SRCS_C = \
-	main.c
-
-include $(topdir)/build/exe.mk
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/test_grabbag/picture/Makefile.am b/src/test_grabbag/picture/Makefile.am
index 8a0b2c9b..3163dd7b 100644
--- a/src/test_grabbag/picture/Makefile.am
+++ b/src/test_grabbag/picture/Makefile.am
@@ -17,8 +17,7 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 EXTRA_DIST = \
-	CMakeLists.txt \
-	Makefile.lite
+	CMakeLists.txt
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 check_PROGRAMS = test_picture
diff --git a/src/test_grabbag/picture/Makefile.lite b/src/test_grabbag/picture/Makefile.lite
deleted file mode 100644
index 2844923e..00000000
--- a/src/test_grabbag/picture/Makefile.lite
+++ /dev/null
@@ -1,47 +0,0 @@
-#  test_picture - Simple tester for picture routines in grabbag
-#  Copyright (C) 2006-2009  Josh Coalson
-#  Copyright (C) 2011-2016  Xiph.Org Foundation
-#
-#  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 2
-#  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, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#
-# GNU makefile
-#
-
-topdir = ../../..
-
-include $(topdir)/build/config.mk
-libdir = $(topdir)/objs/$(BUILD)/lib
-
-PROGRAM_NAME = test_picture
-
-INCLUDES = -I./include -I$(topdir)/include
-
-ifeq ($(OS),Darwin)
-    EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm
-else
-ifeq ($(findstring Windows,$(OS)),Windows)
-    LIBS = -lgrabbag -lreplaygain_analysis -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm
-else
-    LIBS = -lgrabbag -lreplaygain_analysis -lFLAC $(OGG_LIBS) -lm
-endif
-endif
-
-SRCS_C = \
-	main.c
-
-include $(topdir)/build/exe.mk
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/test_libFLAC++/Makefile.am b/src/test_libFLAC++/Makefile.am
index 51d92ca5..1a131d0f 100644
--- a/src/test_libFLAC++/Makefile.am
+++ b/src/test_libFLAC++/Makefile.am
@@ -17,8 +17,7 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 EXTRA_DIST = \
-	CMakeLists.txt \
-	Makefile.lite
+	CMakeLists.txt
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 check_PROGRAMS = test_libFLAC++
diff --git a/src/test_libFLAC++/Makefile.lite b/src/test_libFLAC++/Makefile.lite
deleted file mode 100644
index dd67788d..00000000
--- a/src/test_libFLAC++/Makefile.lite
+++ /dev/null
@@ -1,54 +0,0 @@
-#  test_libFLAC++ - Unit tester for libFLAC++
-#  Copyright (C) 2002-2009  Josh Coalson
-#  Copyright (C) 2011-2016  Xiph.Org Foundation
-#
-#  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 2
-#  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, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#
-# GNU makefile
-#
-
-topdir = ../..
-
-include $(topdir)/build/config.mk
-libdir = $(topdir)/objs/$(BUILD)/lib
-
-PROGRAM_NAME = test_libFLAC++
-
-INCLUDES = -I$(topdir)/include
-
-ifeq ($(OS),Darwin)
-    EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libtest_libs_common.a $(libdir)/libFLAC++.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm
-else
-ifeq ($(findstring Windows,$(OS)),Windows)
-    LIBS = -lgrabbag -lreplaygain_analysis -ltest_libs_common -lFLAC++ -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm
-else
-    LIBS = -lgrabbag -lreplaygain_analysis -ltest_libs_common -lFLAC++ -lFLAC $(OGG_LIBS) -lm
-endif
-endif
-
-SRCS_CPP = \
-	decoders.cpp \
-	encoders.cpp \
-	main.cpp \
-	metadata.cpp \
-	metadata_manip.cpp \
-	metadata_object.cpp
-
-include $(topdir)/build/exe.mk
-
-LINK = $(CCC) $(LINKAGE)
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/test_libFLAC/Makefile.am b/src/test_libFLAC/Makefile.am
index aa4db908..611b5ac7 100644
--- a/src/test_libFLAC/Makefile.am
+++ b/src/test_libFLAC/Makefile.am
@@ -17,8 +17,7 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 EXTRA_DIST = \
-	CMakeLists.txt \
-	Makefile.lite
+	CMakeLists.txt
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src/libFLAC/include
 
diff --git a/src/test_libFLAC/Makefile.lite b/src/test_libFLAC/Makefile.lite
deleted file mode 100644
index a9c9ac13..00000000
--- a/src/test_libFLAC/Makefile.lite
+++ /dev/null
@@ -1,58 +0,0 @@
-#  test_libFLAC - Unit tester for libFLAC
-#  Copyright (C) 2000-2009  Josh Coalson
-#  Copyright (C) 2011-2018  Xiph.Org Foundation
-#
-#  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 2
-#  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, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#
-# GNU makefile
-#
-
-topdir = ../..
-
-include $(topdir)/build/config.mk
-libdir = $(topdir)/objs/$(BUILD)/lib
-
-PROGRAM_NAME = test_libFLAC
-
-INCLUDES = -I../libFLAC/include -I$(topdir)/include
-
-ifeq ($(OS),Darwin)
-    EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libtest_libs_common.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm
-else
-ifeq ($(findstring Windows,$(OS)),Windows)
-    LIBS = -lgrabbag -lreplaygain_analysis -ltest_libs_common -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm
-else
-    LIBS = -lgrabbag -lreplaygain_analysis -ltest_libs_common -lFLAC $(OGG_LIBS) -lm
-endif
-endif
-
-SRCS_C = \
-	bitreader.c \
-	bitwriter.c \
-	crc.c \
-	decoders.c \
-	encoders.c \
-	endswap.c \
-	format.c \
-	main.c \
-	md5.c \
-	metadata.c \
-	metadata_manip.c \
-	metadata_object.c
-
-include $(topdir)/build/exe.mk
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/test_libs_common/Makefile.am b/src/test_libs_common/Makefile.am
index 80da5a1b..f9f38c34 100644
--- a/src/test_libs_common/Makefile.am
+++ b/src/test_libs_common/Makefile.am
@@ -26,5 +26,4 @@ libtest_libs_common_la_SOURCES = \
 
 EXTRA_DIST = \
 	CMakeLists.txt \
-	Makefile.lite \
 	README
diff --git a/src/test_libs_common/Makefile.lite b/src/test_libs_common/Makefile.lite
deleted file mode 100644
index 13f10511..00000000
--- a/src/test_libs_common/Makefile.lite
+++ /dev/null
@@ -1,42 +0,0 @@
-#  test_libs_common - Common code to library unit tests
-#  Copyright (C) 2000-2009  Josh Coalson
-#  Copyright (C) 2011-2016  Xiph.Org Foundation
-#
-#  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 2
-#  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, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#
-# GNU makefile
-#
-
-topdir = ../..
-libdir = $(topdir)/objs/$(BUILD)/lib
-
-LIB_NAME = libtest_libs_common
-
-ifeq ($(OS),Darwin)
-    EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm
-else
-    LIBS = -lFLAC $(OGG_LIBS) -lm
-endif
-
-INCLUDES = -I$(topdir)/include
-
-SRCS_C = \
-	file_utils_flac.c \
-	metadata_utils.c
-
-include $(topdir)/build/lib.mk
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/test_seeking/Makefile.am b/src/test_seeking/Makefile.am
index 9916735f..b3c0ad04 100644
--- a/src/test_seeking/Makefile.am
+++ b/src/test_seeking/Makefile.am
@@ -17,8 +17,7 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 EXTRA_DIST = \
-	CMakeLists.txt \
-	Makefile.lite
+	CMakeLists.txt
 
 AM_CFLAGS = @OGG_CFLAGS@
 
diff --git a/src/test_seeking/Makefile.lite b/src/test_seeking/Makefile.lite
deleted file mode 100644
index 101fecaa..00000000
--- a/src/test_seeking/Makefile.lite
+++ /dev/null
@@ -1,47 +0,0 @@
-#  test_seeking - Seeking tester for libFLAC
-#  Copyright (C) 2004-2009  Josh Coalson
-#  Copyright (C) 2011-2016  Xiph.Org Foundation
-#
-#  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 2
-#  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, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#
-# GNU makefile
-#
-
-topdir = ../..
-
-include $(topdir)/build/config.mk
-libdir = $(topdir)/objs/$(BUILD)/lib
-
-PROGRAM_NAME = test_seeking
-
-INCLUDES = -I../libFLAC/include -I$(topdir)/include
-
-ifeq ($(OS),Darwin)
-    EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm
-else
-ifeq ($(findstring Windows,$(OS)),Windows)
-    LIBS = -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm
-else
-    LIBS = -lFLAC $(OGG_LIBS) -lm
-endif
-endif
-
-SRCS_C = \
-	main.c
-
-include $(topdir)/build/exe.mk
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/test_streams/Makefile.am b/src/test_streams/Makefile.am
index 9a01acb9..1965635b 100644
--- a/src/test_streams/Makefile.am
+++ b/src/test_streams/Makefile.am
@@ -17,8 +17,7 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 EXTRA_DIST = \
-	CMakeLists.txt \
-	Makefile.lite
+	CMakeLists.txt
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 check_PROGRAMS = test_streams
diff --git a/src/test_streams/Makefile.lite b/src/test_streams/Makefile.lite
deleted file mode 100644
index 1e87c372..00000000
--- a/src/test_streams/Makefile.lite
+++ /dev/null
@@ -1,43 +0,0 @@
-#  test_streams - Simple test pattern generator
-#  Copyright (C) 2000-2009  Josh Coalson
-#  Copyright (C) 2011-2016  Xiph.Org Foundation
-#
-#  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 2
-#  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, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#
-# GNU makefile
-#
-
-topdir = ../..
-
-include $(topdir)/build/config.mk
-libdir = $(topdir)/objs/$(BUILD)/lib
-
-PROGRAM_NAME = test_streams
-
-INCLUDES = -I./include -I$(topdir)/include
-
-ifeq ($(OS),Darwin)
-    EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a -lm
-else
-    LIBS = -lgrabbag -lreplaygain_analysis -lm
-endif
-
-SRCS_C = \
-	main.c
-
-include $(topdir)/build/exe.mk
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/utils/flacdiff/Makefile.am b/src/utils/flacdiff/Makefile.am
index 2bc33289..4cb7c67e 100644
--- a/src/utils/flacdiff/Makefile.am
+++ b/src/utils/flacdiff/Makefile.am
@@ -18,5 +18,4 @@
 
 EXTRA_DIST = \
 	CMakeLists.txt \
-	Makefile.lite \
 	main.cpp
diff --git a/src/utils/flacdiff/Makefile.lite b/src/utils/flacdiff/Makefile.lite
deleted file mode 100644
index bd15022a..00000000
--- a/src/utils/flacdiff/Makefile.lite
+++ /dev/null
@@ -1,47 +0,0 @@
-#  flacdiff - Displays where two FLAC streams differ
-#  Copyright (C) 2007-2009  Josh Coalson
-#  Copyright (C) 2011-2016  Xiph.Org Foundation
-#
-#  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 2
-#  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, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#
-# GNU makefile
-#
-
-topdir = ../../..
-libdir = $(topdir)/objs/$(BUILD)/lib
-
-PROGRAM_NAME = flacdiff
-
-INCLUDES = -I$(topdir)/include
-
-ifeq ($(OS),Darwin)
-    EXPLICIT_LIBS = $(libdir)/libFLAC++.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm
-else
-ifeq ($(findstring Windows,$(OS)),Windows)
-    LIBS = -lFLAC++ -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm
-else
-    LIBS = -lFLAC++ -lFLAC $(OGG_LIBS) -lm
-endif
-endif
-
-SRCS_CPP = \
-	main.cpp
-
-include $(topdir)/build/exe.mk
-
-LINK = $(CCC) $(LINKAGE)
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/utils/flactimer/Makefile.am b/src/utils/flactimer/Makefile.am
index ea693f70..abbe9109 100644
--- a/src/utils/flactimer/Makefile.am
+++ b/src/utils/flactimer/Makefile.am
@@ -18,5 +18,4 @@
 
 EXTRA_DIST = \
 	CMakeLists.txt \
-	Makefile.lite \
 	main.cpp
diff --git a/src/utils/flactimer/Makefile.lite b/src/utils/flactimer/Makefile.lite
deleted file mode 100644
index b0a98347..00000000
--- a/src/utils/flactimer/Makefile.lite
+++ /dev/null
@@ -1,43 +0,0 @@
-#  flactimer - Runs a command and prints timing information
-#  Copyright (C) 2007-2009  Josh Coalson
-#  Copyright (C) 2011-2016  Xiph.Org Foundation
-#
-#  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 2
-#  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, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#
-# GNU makefile
-#
-
-topdir = ../../..
-libdir = $(topdir)/objs/$(BUILD)/lib
-
-PROGRAM_NAME = flactimer
-
-INCLUDES = -I$(topdir)/include
-
-ifeq ($(OS),Darwin)
-    EXPLICIT_LIBS = -lm
-else
-    LIBS = -lm
-endif
-
-SRCS_CPP = \
-	main.cpp
-
-include $(topdir)/build/exe.mk
-
-LINK = $(CCC) $(LINKAGE)
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.