diff --git a/NEWS b/NEWS index eed5d4aa..0635d7cf 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ -$Id: NEWS,v 1.110 2007/10/13 08:42:57 rocky Exp $ +$Id: NEWS,v 1.111 2007/10/15 04:53:59 rocky Exp $ version 0.79cvs +2007-10-27 - iso-read: Add --ignore -k to ignore errors. - Fix Savannah Bugs #18522, #18563, #18131 #19221 (possibly), #19880, @@ -382,4 +383,4 @@ version 0.1 Routines split off from VCDImager. -$Id: NEWS,v 1.110 2007/10/13 08:42:57 rocky Exp $ +$Id: NEWS,v 1.111 2007/10/15 04:53:59 rocky Exp $ diff --git a/configure.ac b/configure.ac index f25c83ac..b2b42a91 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ define(RELEASE_NUM, 79cvs) define(CDIO_VERSION_STR, 0.$1) AC_PREREQ(2.52) -AC_REVISION([$Id: configure.ac,v 1.212 2007/08/12 12:41:10 rocky Exp $])dnl +AC_REVISION([$Id: configure.ac,v 1.213 2007/10/15 04:53:59 rocky Exp $])dnl AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM)) AC_CONFIG_SRCDIR(src/cd-info.c) @@ -89,6 +89,7 @@ AM_CONDITIONAL(ENABLE_CPP, test x"$enable_cpp_progs" = "xyes") dnl We use C AC_PROG_CC +AM_PROG_CC_C_O dnl We also use C++ in example programs and for CXX bindings AC_PROG_CXX diff --git a/lib/cdda_interface/Makefile.am b/lib/cdda_interface/Makefile.am index b9895eee..0f23e942 100644 --- a/lib/cdda_interface/Makefile.am +++ b/lib/cdda_interface/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.11 2007/10/13 08:42:57 rocky Exp $ +# $Id: Makefile.am,v 1.12 2007/10/15 04:53:59 rocky Exp $ # # Copyright (C) 2004, 2005, 2006, 2007 Rocky Bernstein # @@ -46,9 +46,9 @@ EXTRA_DIST = libcdio_cdda.sym -libcdio_cdda_la_CURRENT := 0 -libcdio_cdda_la_REVISION := 3 -libcdio_cdda_la_AGE := 0 +libcdio_cdda_la_CURRENT = 0 +libcdio_cdda_la_REVISION = 3 +libcdio_cdda_la_AGE = 0 noinst_HEADERS = common_interface.h drive_exceptions.h low_interface.h \ smallft.h utils.h @@ -134,7 +134,7 @@ LIBS = $(LIBCDIO_LIBS) @COS_LIB@ # extracts from this list those symbols that will be shared. (This sed # command comes from libtool.) -libcdio_cdda_la_MAJOR := $(shell expr $(libcdio_cdda_la_CURRENT) - $(libcdio_cdda_la_AGE)) +libcdio_cdda_la_MAJOR = $(shell expr $(libcdio_cdda_la_CURRENT) - $(libcdio_cdda_la_AGE)) if BUILD_VERSIONED_LIBS libcdio_cdda_la_LDFLAGS = $(libcdio_cdda_la_ldflags) -Wl,--version-script=libcdio_cdda.la.ver libcdio_cdda_la_DEPENDENCIES = libcdio_cdda.la.ver diff --git a/lib/cdio++/Makefile.am b/lib/cdio++/Makefile.am index c4e39bba..32890470 100644 --- a/lib/cdio++/Makefile.am +++ b/lib/cdio++/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.6 2007/10/13 08:42:57 rocky Exp $ +# $Id: Makefile.am,v 1.7 2007/10/15 04:53:59 rocky Exp $ # # Copyright (C) 2005, 2006, 2007 Rocky Bernstein # @@ -44,18 +44,18 @@ lib_LTLIBRARIES = libiso9660++.la libcdio++.la -libcdiopp_la_CURRENT := 0 -libcdiopp_la_REVISION := 1 -libcdiopp_la_AGE := 0 +libcdiopp_la_CURRENT = 0 +libcdiopp_la_REVISION = 1 +libcdiopp_la_AGE = 0 libcdiopp_sources = cdio.cpp devices.cpp libcdio___la_SOURCES = $(libcdiopp_sources) libcdio___la_ldflags = -version-info $(libcdiopp_la_CURRENT):$(libcdiopp_la_REVISION):$(libcdiopp_la_AGE) -libiso9660pp_la_CURRENT := 0 -libiso9660pp_la_REVISION := 0 -libiso9660pp_la_AGE := 0 +libiso9660pp_la_CURRENT = 0 +libiso9660pp_la_REVISION = 0 +libiso9660pp_la_AGE = 0 libiso9660pp_sources = iso9660.cpp diff --git a/lib/driver/Makefile.am b/lib/driver/Makefile.am index 6b2d37c7..1378e2fb 100644 --- a/lib/driver/Makefile.am +++ b/lib/driver/Makefile.am @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.20 2007/10/13 08:42:57 rocky Exp $ +# $Id: Makefile.am,v 1.21 2007/10/15 04:53:59 rocky Exp $ # -# Copyright (C) 2003, 2004, 2005, 2006 Rocky Bernstein +# Copyright (C) 2003, 2004, 2005, 2006, 2007 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 @@ -43,9 +43,9 @@ # public release, then set AGE to 0. A changed interface means an # incompatibility with previous versions. -libcdio_la_CURRENT := 8 -libcdio_la_REVISION := 1 -libcdio_la_AGE := 1 +libcdio_la_CURRENT = 8 +libcdio_la_REVISION = 1 +libcdio_la_AGE = 1 EXTRA_DIST = image/Makefile FreeBSD/Makefile MSWindows/Makefile \ libcdio.sym @@ -163,7 +163,7 @@ INCLUDES = $(LIBCDIO_CFLAGS) # extracts from this list those symbols that will be shared. (This sed # command comes from libtool.) -libcdio_la_MAJOR := $(shell expr $(libcdio_la_CURRENT) - $(libcdio_la_AGE)) +libcdio_la_MAJOR = $(shell expr $(libcdio_la_CURRENT) - $(libcdio_la_AGE)) if BUILD_VERSIONED_LIBS libcdio_la_LDFLAGS = $(libcdio_la_ldflags) -Wl,--version-script=libcdio.la.ver libcdio_la_DEPENDENCIES = libcdio.la.ver diff --git a/lib/iso9660/Makefile.am b/lib/iso9660/Makefile.am index 84f8084b..d57eab51 100644 --- a/lib/iso9660/Makefile.am +++ b/lib/iso9660/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.14 2007/10/13 08:42:57 rocky Exp $ +# $Id: Makefile.am,v 1.15 2007/10/15 04:53:59 rocky Exp $ # # Copyright (C) 2003, 2004, 2005, 2006, 2007 # Rocky Bernstein @@ -44,9 +44,9 @@ # public release, then set AGE to 0. A changed interface means an # incompatibility with previous versions. -libiso9660_la_CURRENT := 6 -libiso9660_la_REVISION := 0 -libiso9660_la_AGE := 1 +libiso9660_la_CURRENT = 6 +libiso9660_la_REVISION = 0 +libiso9660_la_AGE = 1 EXTRA_DIST = libiso9660.sym @@ -131,7 +131,7 @@ INCLUDES = $(LIBCDIO_CFLAGS) # extracts from this list those symbols that will be shared. (This sed # command comes from libtool.) -libiso9660_la_MAJOR := $(shell expr $(libiso9660_la_CURRENT) - $(libiso9660_la_AGE)) +libiso9660_la_MAJOR = $(shell expr $(libiso9660_la_CURRENT) - $(libiso9660_la_AGE)) if BUILD_VERSIONED_LIBS libiso9660_la_LDFLAGS = $(libiso9660_la_ldflags) -Wl,--version-script=libiso9660.la.ver libiso9660_la_DEPENDENCIES = $(libcdio9660_la_dependencies) libiso9660.la.ver diff --git a/lib/paranoia/Makefile.am b/lib/paranoia/Makefile.am index 42fa4989..f1790d2a 100644 --- a/lib/paranoia/Makefile.am +++ b/lib/paranoia/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.6 2006/03/14 12:05:16 rocky Exp $ +# $Id: Makefile.am,v 1.7 2007/10/15 04:53:59 rocky Exp $ # # Copyright (C) 2004, 2006 Rocky Bernstein # @@ -46,9 +46,9 @@ EXTRA_DIST = libcdio_paranoia.sym -libcdio_paranoia_la_CURRENT := 0 -libcdio_paranoia_la_REVISION := 2 -libcdio_paranoia_la_AGE := 0 +libcdio_paranoia_la_CURRENT = 0 +libcdio_paranoia_la_REVISION = 2 +libcdio_paranoia_la_AGE = 0 noinst_HEADERS = gap.h isort.h overlap.h p_block.h @@ -136,7 +136,7 @@ LIBS = $(LIBCDIO_LIBS) $(LIBCDIO_CDDA_LIBS) # extracts from this list those symbols that will be shared. (This sed # command comes from libtool.) -libcdio_paranoia_la_MAJOR := $(shell expr $(libcdio_paranoia_la_CURRENT) - $(libcdio_paranoia_la_AGE)) +libcdio_paranoia_la_MAJOR = $(shell expr $(libcdio_paranoia_la_CURRENT) - $(libcdio_paranoia_la_AGE)) if BUILD_VERSIONED_LIBS libcdio_paranoia_la_LDFLAGS = $(libcdio_paranoia_la_ldflags) -Wl,--version-script=libcdio_paranoia.la.ver libcdio_paranoia_la_DEPENDENCIES = libcdio_paranoia.la.ver diff --git a/lib/udf/Makefile.am b/lib/udf/Makefile.am index 2981ada0..3d67cfb6 100644 --- a/lib/udf/Makefile.am +++ b/lib/udf/Makefile.am @@ -24,9 +24,9 @@ # public release, then set AGE to 0. A changed interface means an # incompatibility with previous versions. -libudf_la_CURRENT := 0 -libudf_la_REVISION := 0 -libudf_la_AGE := 0 +libudf_la_CURRENT = 0 +libudf_la_REVISION = 0 +libudf_la_AGE = 0 EXTRA_DIST = libudf.sym diff --git a/src/Makefile.am b/src/Makefile.am index 903062a3..5a3890b5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.42 2006/04/04 00:20:13 rocky Exp $ +# $Id: Makefile.am,v 1.43 2007/10/15 04:53:59 rocky Exp $ # # Copyright (C) 2003, 2004, 2005, 2006 # Rocky Bernstein @@ -19,12 +19,12 @@ # 02110-1301 USA. # -GETOPT_C := getopt.c getopt1.c +GETOPT_C = getopt.c getopt1.c -EXTRA_DIST := cd-drive.help2man cd-info.help2man cd-read.help2man \ +EXTRA_DIST = cd-drive.help2man cd-info.help2man cd-read.help2man \ iso-info.help2man iso-read.help2man $(GETOPT_C) getopt.h -noinst_HEADERS := cddb.h getopt.h util.h +noinst_HEADERS = cddb.h getopt.h util.h #################################################### # Things to make the utility/diagnostic programs diff --git a/src/cd-paranoia/Makefile.am b/src/cd-paranoia/Makefile.am index 81680d3b..27a67a93 100644 --- a/src/cd-paranoia/Makefile.am +++ b/src/cd-paranoia/Makefile.am @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.22 2006/03/17 19:36:54 rocky Exp $ +# $Id: Makefile.am,v 1.23 2007/10/15 04:54:00 rocky Exp $ # -# Copyright (C) 2004, 2005, 2006 Rocky Bernstein +# Copyright (C) 2004, 2005, 2006, 2007 Rocky Bernstein # Copyright (C) 1998 Monty xiphmont@mit.edu # # This program is free software; you can redistribute it and/or modify @@ -24,9 +24,9 @@ transform = s,cd-paranoia,@CDPARANOIA_NAME@, if BUILD_CD_PARANOIA -SUBDIRS := doc +SUBDIRS = doc -GETOPT_C:=getopt1.c getopt.c +GETOPT_C = getopt1.c getopt.c EXTRA_DIST = usage.txt.in usage-copy.h pod2c.pl \ doc/FAQ.txt doc/overlapdef.txt $(GETOPT_C) getopt.h @@ -43,7 +43,7 @@ cd_paranoia_LDADD = $(LIBCDIO_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_PARANOIA_LIB cd_paranoia_DEPENDENCIES = $(LIBCDIO_DEPS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_PARANOIA_LIBS) -bin_PROGRAMS := cd-paranoia +bin_PROGRAMS = cd-paranoia INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS)