Remove un-needed Makefile.am

9 files changed, 1 insertions, 132 deletions

diff --git a/Makefile.am b/Makefile.am
index 38aea04a..19899cd4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = doc include m4 man src test build objs microbench
+SUBDIRS = doc include m4 man src test build microbench
 
 if EXAMPLES
 SUBDIRS += examples
diff --git a/configure.ac b/configure.ac
index 0228a124..63a713ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -550,13 +550,6 @@ AC_CONFIG_FILES([ \
 	test/metaflac-test-files/Makefile \
 	test/pictures/Makefile \
 	build/Makefile \
-	objs/Makefile \
-	objs/debug/Makefile \
-	objs/debug/bin/Makefile \
-	objs/debug/lib/Makefile \
-	objs/release/Makefile \
-	objs/release/bin/Makefile \
-	objs/release/lib/Makefile \
 	microbench/Makefile
 ])
 AC_OUTPUT
diff --git a/objs/Makefile.am b/objs/Makefile.am
deleted file mode 100644
index 5a30696d..00000000
--- a/objs/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-#  FLAC - Free Lossless Audio Codec
-#  Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
-#
-#  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.
-
-SUBDIRS = \
-	debug \
-	release
diff --git a/objs/debug/Makefile.am b/objs/debug/Makefile.am
deleted file mode 100644
index cd8c26f1..00000000
--- a/objs/debug/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-#  FLAC - Free Lossless Audio Codec
-#  Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
-#
-#  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.
-
-SUBDIRS = \
-	bin \
-	lib
diff --git a/objs/debug/bin/Makefile.am b/objs/debug/bin/Makefile.am
deleted file mode 100644
index c0a1ea65..00000000
--- a/objs/debug/bin/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-#  FLAC - Free Lossless Audio Codec
-#  Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
-#
-#  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.
diff --git a/objs/debug/lib/Makefile.am b/objs/debug/lib/Makefile.am
deleted file mode 100644
index c0a1ea65..00000000
--- a/objs/debug/lib/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-#  FLAC - Free Lossless Audio Codec
-#  Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
-#
-#  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.
diff --git a/objs/release/Makefile.am b/objs/release/Makefile.am
deleted file mode 100644
index cd8c26f1..00000000
--- a/objs/release/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-#  FLAC - Free Lossless Audio Codec
-#  Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
-#
-#  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.
-
-SUBDIRS = \
-	bin \
-	lib
diff --git a/objs/release/bin/Makefile.am b/objs/release/bin/Makefile.am
deleted file mode 100644
index c0a1ea65..00000000
--- a/objs/release/bin/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-#  FLAC - Free Lossless Audio Codec
-#  Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
-#
-#  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.
diff --git a/objs/release/lib/Makefile.am b/objs/release/lib/Makefile.am
deleted file mode 100644
index c0a1ea65..00000000
--- a/objs/release/lib/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-#  FLAC - Free Lossless Audio Codec
-#  Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
-#
-#  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.