diff --git a/obj/Makefile.am b/obj/Makefile.am
index abbb39f1..b58dd504 100644
--- a/obj/Makefile.am
+++ b/obj/Makefile.am
@@ -16,5 +16,5 @@
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 SUBDIRS = \
-	bin \
-	lib
+	debug \
+	release
diff --git a/obj/bin/Makefile.am b/obj/bin/Makefile.am
deleted file mode 100644
index c2916a34..00000000
--- a/obj/bin/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-#  FLAC - Free Lossless Audio Codec
-#  Copyright (C) 2002  Josh Coalson
-#
-#  This program is part of FLAC; 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/obj/lib/Makefile.am b/obj/lib/Makefile.am
deleted file mode 100644
index c2916a34..00000000
--- a/obj/lib/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-#  FLAC - Free Lossless Audio Codec
-#  Copyright (C) 2002  Josh Coalson
-#
-#  This program is part of FLAC; 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.