diff --git a/src/Makefile.am b/src/Makefile.am
index 14e18e86..81f6b016 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
-#   $Id: Makefile.am,v 1.29 2004/12/22 10:04:46 rocky Exp $
+#   $Id: Makefile.am,v 1.30 2005/01/06 10:56:22 rocky Exp $
 #
-#    Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
+#    Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
 #
 #    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
@@ -33,40 +33,44 @@ $(man_MANS): %.1: %
 	-$(HELP2MAN) --output=$@ ./$<
 endif
 
-if BUILD_CDINFO
-cd_info_SOURCES = cd-info.c util.c util.h
-cd_info_LDADD =  $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(CDDB_LIBS) $(VCDINFO_LIBS) $(LIBICONV)
-endif
-
 if BUILD_CD_DRIVE
 cd_drive_SOURCES = cd-drive.c util.c util.h
-cd_drive_LDADD =  $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(LIBICONV)
+cd_drive_LDADD   =  $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(LIBICONV)
+bin_cd_drive     = cd-drive
 endif
 
-if BUILD_CD_READ
-cd_read_SOURCES = cd-read.c util.c util.h
-cd_read_LDADD =  $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(LIBICONV)
-endif
-
-if BUILD_ISO_INFO
-iso_info_SOURCES = iso-info.c util.c util.h
-iso_info_LDADD =  $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(LIBICONV)
-endif
-
-if BUILD_ISO_READ
-iso_read_SOURCES = iso-read.c util.c util.h
-iso_read_LDADD =  $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(LIBICONV)
+if BUILD_CDINFO
+cd_info_SOURCES = cd-info.c util.c util.h
+cd_info_LDADD   =  $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(CDDB_LIBS) $(VCDINFO_LIBS) $(LIBICONV)
+bin_cd_info     = cd-info 
 endif
 
 if BUILD_CDINFO_LINUX
 cdinfo_linux_SOURCES = cdinfo-linux.c
-cdinfo_linux_LDADD = $(LIBCDIO_LIBS) $(LIBPOPT_LIBS)
-bin_PROGRAMS = cd-drive cd-info cd-read cdinfo-linux iso-info iso-read
-else
-bin_PROGRAMS = cd-drive cd-info cd-read iso-info iso-read
-EXTRA_DIST = cdinfo-linux.c $(man_MANS)
+cdinfo_linux_LDADD   = $(LIBCDIO_LIBS) $(LIBPOPT_LIBS)
+bin_cdinfo_linux     = cdinfo-linux
 endif
 
+if BUILD_CD_READ
+cd_read_SOURCES = cd-read.c util.c util.h
+cd_read_LDADD   = $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(LIBICONV)
+bin_cd_read     = cd-read 
+endif
+
+if BUILD_ISO_INFO
+iso_info_SOURCES = iso-info.c util.c util.h
+iso_info_LDADD   = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(LIBICONV)
+bin_iso_info     = $(bin_progs) iso-info
+endif
+
+if BUILD_ISO_READ
+iso_read_SOURCES = iso-read.c util.c util.h
+iso_read_LDADD   =  $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(LIBICONV)
+bin_progs        = iso-read
+endif
+
+bin_PROGRAMS = $(bin_cd_drive) $(bin_cd_info)  $(bin_cdinfo_linux) $(bin_cd_read) $(bin_iso_info) $(bin_iso_read)
+
 # Put LIBPOPT_CFLAGS after local include in case LIBPOPT has headers common
 # to those in LIBCDIO_CFLAGS
 INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) $(VCDINFO_CFLAGS) $(CDDB_CFLAGS) $(LIBPOPT_CFLAGS)