diff --git a/example/C++/Makefile.am b/example/C++/Makefile.am index fd61ba7b..62074847 100644 --- a/example/C++/Makefile.am +++ b/example/C++/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.9 2006/04/15 16:16:05 rocky Exp $ +# $Id: Makefile.am,v 1.10 2006/04/15 16:18:33 rocky Exp $ # # Copyright (C) 2005, 2006 Rocky Bernstein # @@ -47,12 +47,12 @@ paranoia2_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) \ $(LIBCDIO_LIBS) endif -isolist_SOURCES = isolist.cpp -isolist_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) isofile_SOURCES = isofile.cpp isofile_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) isofile2_SOURCES = isofile2.cpp isofile2_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +isolist_SOURCES = isolist.cpp +isolist_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) mmc1_SOURCES = mmc1.cpp mmc1_DEPENDENCIES = $(LIBCDIO_DEPS) diff --git a/example/C++/OO/Makefile.am b/example/C++/OO/Makefile.am index 8b8ce983..c8a89df9 100644 --- a/example/C++/OO/Makefile.am +++ b/example/C++/OO/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.10 2006/04/15 15:45:25 rocky Exp $ +# $Id: Makefile.am,v 1.11 2006/04/15 16:18:33 rocky Exp $ # # Copyright (C) 2005, 2006 Rocky Bernstein # @@ -21,7 +21,7 @@ ############################################################ # noinst_PROGRAMS = cdtext device drives eject \ - isolist isofile isofile2 iso4 mmc1 mmc2 tracks + isofile isofile2 isolist iso4 mmc1 mmc2 tracks INCLUDES = -I$(top_srcdir)/include $(LIBCDIO_CFLAGS) @@ -41,10 +41,6 @@ eject_SOURCES = eject.cpp eject_DEPENDENCIES = $(LIBCDIO_DEPS) eject_LDADD = $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) -isolist_SOURCES = isolist.cpp -isolist_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \ - $(LIBCDIOPP_LIBS) $(LIBICONV) - isofile_SOURCES = isofile.cpp isofile_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \ $(LIBCDIOPP_LIBS) $(LIBICONV) @@ -53,6 +49,10 @@ isofile2_SOURCES = isofile2.cpp isofile2_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \ $(LIBCDIOPP_LIBS) $(LIBICONV) +isolist_SOURCES = isolist.cpp +isolist_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \ + $(LIBCDIOPP_LIBS) $(LIBICONV) + iso4_SOURCES = iso4.cpp iso4_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \ $(LIBCDIOPP_LIBS) $(LIBICONV) diff --git a/example/C++/README b/example/C++/README index f8731b1c..b648de99 100644 --- a/example/C++/README +++ b/example/C++/README @@ -1,4 +1,4 @@ -$Id: README,v 1.3 2006/04/15 15:47:05 rocky Exp $ +$Id: README,v 1.4 2006/04/15 16:22:49 rocky Exp $ This directory contains some simple C++ examples of the use of the libcdio library. @@ -11,16 +11,16 @@ device.cpp: A program to show drivers installed and what the default eject.cpp: A program eject a CD from a CD-ROM drive and then close the door again. -isolist.cpp: A program to show using libiso9660 to list files in a - directory of an ISO-9660 image and give basic iso9660 - information. - isofile.cpp: A program to show using libiso9660 to extract a file from an ISO-9660 image. isofile2.cpp: A program to show using libiso9660 to extract a file from a CDRWIN cue/bin CD image. +isolist.cpp: A program to show using libiso9660 to list files in a + directory of an ISO-9660 image and give basic iso9660 + information. + mmc1.cpp: A program to show issuing a simple MMC command (INQUIRY). mmc2.cpp: A more involved MMC command to list features from diff --git a/example/Makefile.am b/example/Makefile.am index 49dd5ddd..9b14d2bf 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.34 2006/04/15 15:45:25 rocky Exp $ +# $Id: Makefile.am,v 1.35 2006/04/15 16:18:33 rocky Exp $ # # Copyright (C) 2003, 2004, 2005 Rocky Bernstein # @@ -27,7 +27,7 @@ if BUILD_CD_PARANOIA paranoia_progs = paranoia paranoia2 endif noinst_PROGRAMS = audio cdchange cdtext device drives eject \ - isolist isofile isofile2 isofuzzy \ + isofile isofile2 isofuzzy isolist \ mmc1 mmc2 mmc2a $(paranoia_progs) tracks \ sample3 sample4 udf1 udf2 @@ -56,10 +56,10 @@ paranoia_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_LIBS) paranoia2_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_LIBS) endif -isolist_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) -isofile2_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) isofile_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +isofile2_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) isofuzzy_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +isolist_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) mmc1_DEPENDENCIES = $(LIBCDIO_DEPS) mmc1_LDADD = $(LIBCDIO_LIBS) diff --git a/example/README b/example/README index c3951f3c..0312013d 100644 --- a/example/README +++ b/example/README @@ -1,4 +1,4 @@ -$Id: README,v 1.25 2006/04/15 15:45:25 rocky Exp $ +$Id: README,v 1.26 2006/04/15 16:22:49 rocky Exp $ This directory contains some simple examples of the use of the libcdio library. @@ -29,10 +29,6 @@ drives.c: A program to show drivers installed and what the default eject.c: A program eject a CD from a CD-ROM drive and then close the door again. -isolist.c: A program to show using libiso9660 to list files in a - directory of an ISO-9660 image and give basic iso9660 - information. - isofile.c: A program to show using libiso9660 to extract a file from an ISO-9660 image. @@ -41,6 +37,10 @@ isofile2.c: A program to show using libiso9660 to extract a file isofuzzy.c : A program showing fuzzy ISO-9660 detection/reading. +isolist.c: A program to show using libiso9660 to list files in a + directory of an ISO-9660 image and give basic iso9660 + information. + mmc1.c: A program to show issuing a simple MMC command (INQUIRY). mmc2.c: A more involved MMC command to list features from