diff --git a/example/C++/Makefile.am b/example/C++/Makefile.am index 630609aa..9557131f 100644 --- a/example/C++/Makefile.am +++ b/example/C++/Makefile.am @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.7 2005/11/10 11:11:15 rocky Exp $ +# $Id: Makefile.am,v 1.8 2006/04/15 15:45:25 rocky Exp $ # -# Copyright (C) 2005 Rocky Bernstein +# Copyright (C) 2005, 2006 Rocky Bernstein # # 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 @@ -25,7 +25,8 @@ SUBDIRS = OO if BUILD_CD_PARANOIA paranoia_progs = paranoia paranoia2 endif -noinst_PROGRAMS = device eject iso1 iso2 iso3 mmc1 mmc2 $(paranoia_progs) +noinst_PROGRAMS = device eject isolist isofile2 isofile \ + mmc1 mmc2 $(paranoia_progs) INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) @@ -46,12 +47,12 @@ paranoia2_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) \ $(LIBCDIO_LIBS) endif -iso1_SOURCES = iso1.cpp -iso1_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) -iso2_SOURCES = iso2.cpp -iso2_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) -iso3_SOURCES = iso3.cpp -iso3_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +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) mmc1_SOURCES = mmc1.cpp mmc1_DEPENDENCIES = $(LIBCDIO_DEPS) diff --git a/example/C++/OO/Makefile.am b/example/C++/OO/Makefile.am index c3c64cdc..8b8ce983 100644 --- a/example/C++/OO/Makefile.am +++ b/example/C++/OO/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.9 2006/03/07 19:55:11 rocky Exp $ +# $Id: Makefile.am,v 1.10 2006/04/15 15:45:25 rocky Exp $ # # Copyright (C) 2005, 2006 Rocky Bernstein # @@ -21,7 +21,7 @@ ############################################################ # noinst_PROGRAMS = cdtext device drives eject \ - iso1 iso2 iso3 iso4 mmc1 mmc2 tracks + isolist isofile isofile2 iso4 mmc1 mmc2 tracks INCLUDES = -I$(top_srcdir)/include $(LIBCDIO_CFLAGS) @@ -41,16 +41,16 @@ eject_SOURCES = eject.cpp eject_DEPENDENCIES = $(LIBCDIO_DEPS) eject_LDADD = $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) -iso1_SOURCES = iso1.cpp -iso1_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \ +isolist_SOURCES = isolist.cpp +isolist_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \ $(LIBCDIOPP_LIBS) $(LIBICONV) -iso2_SOURCES = iso2.cpp -iso2_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \ +isofile_SOURCES = isofile.cpp +isofile_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \ $(LIBCDIOPP_LIBS) $(LIBICONV) -iso3_SOURCES = iso3.cpp -iso3_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \ +isofile2_SOURCES = isofile2.cpp +isofile2_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \ $(LIBCDIOPP_LIBS) $(LIBICONV) iso4_SOURCES = iso4.cpp diff --git a/example/Makefile.am b/example/Makefile.am index fe90df8c..49dd5ddd 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.33 2006/04/03 18:50:46 rocky Exp $ +# $Id: Makefile.am,v 1.34 2006/04/15 15:45:25 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 \ - iso1 iso2 iso3 isofuzzy \ + isolist isofile isofile2 isofuzzy \ mmc1 mmc2 mmc2a $(paranoia_progs) tracks \ sample3 sample4 udf1 udf2 @@ -56,9 +56,9 @@ paranoia_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_LIBS) paranoia2_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_LIBS) endif -iso1_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) -iso2_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) -iso3_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +isolist_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +isofile2_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +isofile_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) isofuzzy_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) mmc1_DEPENDENCIES = $(LIBCDIO_DEPS) diff --git a/example/README b/example/README index 535626fa..c3951f3c 100644 --- a/example/README +++ b/example/README @@ -1,4 +1,4 @@ -$Id: README,v 1.24 2006/04/12 10:17:49 rocky Exp $ +$Id: README,v 1.25 2006/04/15 15:45:25 rocky Exp $ This directory contains some simple examples of the use of the libcdio library. @@ -29,16 +29,16 @@ 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. -iso1.c: A program to show using libiso9660 to list files in a +isolist.c: A program to show using libiso9660 to list files in a directory of an ISO-9660 image and give basic iso9660 information. -iso2.c: A program to show using libiso9660 to extract a file - from a CDRWIN cue/bin CD image. - -iso3.c: A program to show using libiso9660 to extract a file from an +isofile.c: A program to show using libiso9660 to extract a file from an ISO-9660 image. +isofile2.c: A program to show using libiso9660 to extract a file + from a CDRWIN cue/bin CD image. + isofuzzy.c : A program showing fuzzy ISO-9660 detection/reading. mmc1.c: A program to show issuing a simple MMC command (INQUIRY). diff --git a/example/iso3.c b/example/isofile.c similarity index 98% rename from example/iso3.c rename to example/isofile.c index bad63651..7acb0e05 100644 --- a/example/iso3.c +++ b/example/isofile.c @@ -1,5 +1,5 @@ /* - $Id: iso3.c,v 1.7 2006/03/02 18:46:30 rocky Exp $ + $Id: isofile.c,v 1.1 2006/04/15 15:45:25 rocky Exp $ Copyright (C) 2004, 2005, 2006 Rocky Bernstein diff --git a/example/iso2.c b/example/isofile2.c similarity index 98% rename from example/iso2.c rename to example/isofile2.c index 9c41c34b..5a36a42c 100644 --- a/example/iso2.c +++ b/example/isofile2.c @@ -1,5 +1,5 @@ /* - $Id: iso2.c,v 1.12 2006/03/18 01:28:13 rocky Exp $ + $Id: isofile2.c,v 1.1 2006/04/15 15:45:25 rocky Exp $ Copyright (C) 2003, 2004, 2005, 2006 Rocky Bernstein diff --git a/example/iso1.c b/example/isolist.c similarity index 98% rename from example/iso1.c rename to example/isolist.c index 9d32b5e5..e8f3e5fa 100644 --- a/example/iso1.c +++ b/example/isolist.c @@ -1,5 +1,5 @@ /* - $Id: iso1.c,v 1.10 2006/03/02 18:57:31 rocky Exp $ + $Id: isolist.c,v 1.1 2006/04/15 15:45:25 rocky Exp $ Copyright (C) 2004, 2005, 2006 Rocky Bernstein