diff --git a/example/Makefile.am b/example/Makefile.am index 60e539e4..286e1445 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.41 2008/01/01 03:14:17 flameeyes Exp $ +# $Id: Makefile.am,v 1.42 2008/03/15 17:26:13 rocky Exp $ # # Copyright (C) 2003, 2004, 2005, 2006 # Rocky Bernstein @@ -37,29 +37,29 @@ endif INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) audio_DEPENDENCIES = $(LIBCDIO_DEPS) -audio_LDADD = $(LIBCDIO_LIBS) +audio_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) cdchange_DEPENDENCIES = $(LIBCDIO_DEPS) -cdchange_LDADD = $(LIBCDIO_LIBS) +cdchange_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) cdtext_DEPENDENCIES = $(LIBCDIO_DEPS) -cdtext_LDADD = $(LIBCDIO_LIBS) +cdtext_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) device_DEPENDENCIES = $(LIBCDIO_DEPS) -device_LDADD = $(LIBCDIO_LIBS) +device_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) drives_DEPENDENCIES = $(LIBCDIO_DEPS) -drives_LDADD = $(LIBCDIO_LIBS) +drives_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) eject_DEPENDENCIES = $(LIBCDIO_DEPS) -eject_LDADD = $(LIBCDIO_LIBS) +eject_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) cdio_eject_DEPENDENCIES = $(LIBCDIO_DEPS) -cdio_eject_LDADD = $(LIBCDIO_LIBS) +cdio_eject_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) if BUILD_CD_PARANOIA -paranoia_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_LIBS) -paranoia2_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_LIBS) +paranoia_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +paranoia2_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) endif isofile_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) @@ -69,30 +69,30 @@ isolist_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) isolsn_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) mmc1_DEPENDENCIES = $(LIBCDIO_DEPS) -mmc1_LDADD = $(LIBCDIO_LIBS) +mmc1_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) mmc2_DEPENDENCIES = $(LIBCDIO_DEPS) -mmc2_LDADD = $(LIBCDIO_LIBS) +mmc2_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) mmc2a_DEPENDENCIES = $(LIBCDIO_DEPS) -mmc2a_LDADD = $(LIBCDIO_LIBS) +mmc2a_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) mmc3_DEPENDENCIES = $(LIBCDIO_DEPS) -mmc3_LDADD = $(LIBCDIO_LIBS) +mmc3_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) sample3_DEPENDENCIES = $(LIBCDIO_DEPS) -sample3_LDADD = $(LIBCDIO_LIBS) +sample3_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) sample4_DEPENDENCIES = $(LIBCDIO_DEPS) -sample4_LDADD = $(LIBCDIO_LIBS) +sample4_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) tracks_DEPENDENCIES = $(LIBCDIO_DEPS) -tracks_LDADD = $(LIBCDIO_LIBS) +tracks_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) udf1_DEPENDENCIES = $(LIBUDF_LIBS) $(LIBCDIO_DEPS) -udf1_LDADD = $(LIBUDF_LIBS) $(LIBCDIO_LIBS) +udf1_LDADD = $(LIBUDF_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) udffile_DEPENDENCIES = $(LIBUDF_LIBS) $(LIBCDIO_DEPS) -udffile_LDADD = $(LIBUDF_LIBS) $(LIBCDIO_LIBS) +udffile_LDADD = $(LIBUDF_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) # iso programs create file "copying" diff --git a/src/cd-paranoia/Makefile.am b/src/cd-paranoia/Makefile.am index 05ab15c2..89a1bcd3 100644 --- a/src/cd-paranoia/Makefile.am +++ b/src/cd-paranoia/Makefile.am @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.24 2007/11/17 11:58:27 flameeyes Exp $ +# $Id: Makefile.am,v 1.25 2008/03/15 17:26:13 rocky Exp $ # -# Copyright (C) 2004, 2005, 2006, 2007 Rocky Bernstein +# Copyright (C) 2004, 2005, 2006, 2007, 2008 Rocky Bernstein # Copyright (C) 1998 Monty xiphmont@mit.edu # # This program is free software; you can redistribute it and/or modify @@ -38,7 +38,7 @@ cd_paranoia_SOURCES = cd-paranoia.c \ buffering_write.c buffering_write.h \ header.c report.c usage.h utils.h version.h $(GETOPT_C) -cd_paranoia_LDADD = $(LIBCDIO_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_PARANOIA_LIBS) +cd_paranoia_LDADD = $(LIBCDIO_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_PARANOIA_LIBS) $(LIBICONV) cd_paranoia_DEPENDENCIES = $(LIBCDIO_DEPS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_PARANOIA_LIBS) diff --git a/test/Makefile.am b/test/Makefile.am index 8b398e73..4ba8cb95 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.60 2008/03/15 17:02:51 rocky Exp $ +# $Id: Makefile.am,v 1.61 2008/03/15 17:26:13 rocky Exp $ # # Copyright (C) 2003, 2004, 2005, 2006, 2008 Rocky Bernstein # @@ -50,7 +50,7 @@ testisocd2_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) testtoc_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) testtoc_CFLAGS = -DTEST_DIR=\"$(srcdir)\" -testbincue_LDADD = $(LIBCDIO_LIBS) +testbincue_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) testbincue_CFLAGS = -DTEST_DIR=\"$(srcdir)\" check_SCRIPTS = check_nrg.sh check_cue.sh check_cd_read.sh \