From a4b1427fe949ec7acc3a3d29900ff7e6ce8560b7 Mon Sep 17 00:00:00 2001 From: flameeyes Date: Sun, 31 Aug 2008 13:38:21 +0000 Subject: [PATCH] Use the LTLIBICONV variable rather than LIBICONV. With this change, instead of using the fully qualified path to the shared object (or the one that the configure think is the fully qualified path), the path where the library is found will be added to the search path and just a generic -liconv will be used. The old variable would be fooled up when /usr/lib/libiconv.so is an LD script that redirects to /lib/libiconv.so, causing failures with some linkers. Also, replace @LIBICONV@ for libcdio itself also with $(LTLIBICONV) or it will fail to link against on uClibc. --- example/C++/Makefile.am | 8 +++---- example/C++/OO/Makefile.am | 10 ++++---- example/Makefile.am | 48 ++++++++++++++++++------------------- lib/driver/Makefile.am | 4 ++-- src/Makefile.am | 14 +++++------ src/cd-paranoia/Makefile.am | 4 ++-- test/Makefile.am | 26 ++++++++++---------- 7 files changed, 57 insertions(+), 57 deletions(-) diff --git a/example/C++/Makefile.am b/example/C++/Makefile.am index 5fcfa6cc..134cdab1 100644 --- a/example/C++/Makefile.am +++ b/example/C++/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.12 2008/03/20 19:02:37 karl Exp $ +# $Id: Makefile.am,v 1.13 2008/08/31 13:38:21 flameeyes Exp $ # # Copyright (C) 2005, 2006, 2008 Rocky Bernstein # @@ -49,11 +49,11 @@ paranoia2_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) \ endif isofile_SOURCES = isofile.cpp -isofile_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +isofile_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) isofile2_SOURCES = isofile2.cpp -isofile2_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +isofile2_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) isolist_SOURCES = isolist.cpp -isolist_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +isolist_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) mmc1_SOURCES = mmc1.cpp mmc1_DEPENDENCIES = $(LIBCDIO_DEPS) diff --git a/example/C++/OO/Makefile.am b/example/C++/OO/Makefile.am index 37281bd6..ee3031bf 100644 --- a/example/C++/OO/Makefile.am +++ b/example/C++/OO/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.12 2008/03/20 19:02:37 karl Exp $ +# $Id: Makefile.am,v 1.13 2008/08/31 13:38:21 flameeyes Exp $ # # Copyright (C) 2005, 2006, 2008 Rocky Bernstein # @@ -42,19 +42,19 @@ eject_LDADD = $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) isofile_SOURCES = isofile.cpp isofile_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \ - $(LIBCDIOPP_LIBS) $(LIBICONV) + $(LIBCDIOPP_LIBS) $(LTLIBICONV) isofile2_SOURCES = isofile2.cpp isofile2_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \ - $(LIBCDIOPP_LIBS) $(LIBICONV) + $(LIBCDIOPP_LIBS) $(LTLIBICONV) isolist_SOURCES = isolist.cpp isolist_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \ - $(LIBCDIOPP_LIBS) $(LIBICONV) + $(LIBCDIOPP_LIBS) $(LTLIBICONV) iso4_SOURCES = iso4.cpp iso4_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \ - $(LIBCDIOPP_LIBS) $(LIBICONV) + $(LIBCDIOPP_LIBS) $(LTLIBICONV) mmc1_SOURCES = mmc1.cpp mmc1_DEPENDENCIES = $(LIBCDIO_DEPS) diff --git a/example/Makefile.am b/example/Makefile.am index bfd4043e..6f38b041 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.43 2008/03/20 19:02:37 karl Exp $ +# $Id: Makefile.am,v 1.44 2008/08/31 13:38:21 flameeyes Exp $ # # Copyright (C) 2003, 2004, 2005, 2006, 2008 Rocky Bernstein # @@ -35,62 +35,62 @@ endif INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) audio_DEPENDENCIES = $(LIBCDIO_DEPS) -audio_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) +audio_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) cdchange_DEPENDENCIES = $(LIBCDIO_DEPS) -cdchange_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) +cdchange_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) cdtext_DEPENDENCIES = $(LIBCDIO_DEPS) -cdtext_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) +cdtext_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) device_DEPENDENCIES = $(LIBCDIO_DEPS) -device_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) +device_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) drives_DEPENDENCIES = $(LIBCDIO_DEPS) -drives_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) +drives_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) eject_DEPENDENCIES = $(LIBCDIO_DEPS) -eject_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) +eject_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) cdio_eject_DEPENDENCIES = $(LIBCDIO_DEPS) -cdio_eject_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) +cdio_eject_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) if BUILD_CD_PARANOIA -paranoia_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) -paranoia2_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +paranoia_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) +paranoia2_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) endif -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) -isolsn_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +isofile_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) +isofile2_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) +isofuzzy_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) +isolist_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) +isolsn_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) mmc1_DEPENDENCIES = $(LIBCDIO_DEPS) -mmc1_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) +mmc1_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) mmc2_DEPENDENCIES = $(LIBCDIO_DEPS) -mmc2_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) +mmc2_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) mmc2a_DEPENDENCIES = $(LIBCDIO_DEPS) -mmc2a_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) +mmc2a_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) mmc3_DEPENDENCIES = $(LIBCDIO_DEPS) -mmc3_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) +mmc3_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) sample3_DEPENDENCIES = $(LIBCDIO_DEPS) -sample3_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) +sample3_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) sample4_DEPENDENCIES = $(LIBCDIO_DEPS) -sample4_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) +sample4_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) tracks_DEPENDENCIES = $(LIBCDIO_DEPS) -tracks_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) +tracks_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) udf1_DEPENDENCIES = $(LIBUDF_LIBS) $(LIBCDIO_DEPS) -udf1_LDADD = $(LIBUDF_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +udf1_LDADD = $(LIBUDF_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) udffile_DEPENDENCIES = $(LIBUDF_LIBS) $(LIBCDIO_DEPS) -udffile_LDADD = $(LIBUDF_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +udffile_LDADD = $(LIBUDF_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) # iso programs create file "copying" diff --git a/lib/driver/Makefile.am b/lib/driver/Makefile.am index c0245160..315cfdb0 100644 --- a/lib/driver/Makefile.am +++ b/lib/driver/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.25 2008/06/25 07:46:20 rocky Exp $ +# $Id: Makefile.am,v 1.26 2008/08/31 13:38:22 flameeyes Exp $ # # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 # Rocky Bernstein @@ -98,7 +98,7 @@ libcdio_sources = \ util.c lib_LTLIBRARIES = libcdio.la -libcdio_la_LIBADD = @LIBICONV@ +libcdio_la_LIBADD = $(LTLIBICONV)@ libcdio_la_SOURCES = $(libcdio_sources) libcdio_la_ldflags = -version-info $(libcdio_la_CURRENT):$(libcdio_la_REVISION):$(libcdio_la_AGE) @LT_NO_UNDEFINED@ diff --git a/src/Makefile.am b/src/Makefile.am index 587264a5..f9f7befd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.47 2008/04/26 15:16:06 rocky Exp $ +# $Id: Makefile.am,v 1.48 2008/08/31 13:38:22 flameeyes Exp $ # # Copyright (C) 2003, 2004, 2006, 2008 Rocky Bernstein # @@ -38,14 +38,14 @@ endif if BUILD_CD_DRIVE cd_drive_SOURCES = cd-drive.c util.c util.h $(GETOPT_C) -cd_drive_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +cd_drive_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) bin_cd_drive = cd-drive man_cd_drive = cd-drive.1 endif if BUILD_CDINFO cd_info_SOURCES = cd-info.c cddb.c cddb.h util.c util.h $(GETOPT_C) -cd_info_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(CDDB_LIBS) $(VCDINFO_LIBS) $(LIBICONV) +cd_info_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(CDDB_LIBS) $(VCDINFO_LIBS) $(LTLIBICONV) bin_cd_info = cd-info man_cd_info = cd-info.1 endif @@ -58,27 +58,27 @@ endif if BUILD_CD_READ cd_read_SOURCES = cd-read.c util.c util.h $(GETOPT_C) -cd_read_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +cd_read_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) bin_cd_read = cd-read man_cd_read = cd-read.1 endif if BUILD_ISO_INFO iso_info_SOURCES = iso-info.c util.c util.h $(GETOPT_C) -iso_info_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +iso_info_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) bin_iso_info = iso-info man_iso_info = iso-info.1 endif if BUILD_ISO_READ iso_read_SOURCES = iso-read.c util.c util.h $(GETOPT_C) -iso_read_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +iso_read_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) bin_iso_read = iso-read man_iso_read = iso-read.1 endif mmc_tool_SOURCES = mmc-tool.c util.c util.h $(GETOPT_C) -mmc_tool_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +mmc_tool_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) bin_mmc_tool = mmc-tool bin_PROGRAMS = $(bin_cd_drive) $(bin_cd_info) $(bin_cdinfo_linux) $(bin_cd_read) $(bin_iso_info) $(bin_iso_read) $(bin_cdda_player) $(bin_mmc_tool) diff --git a/src/cd-paranoia/Makefile.am b/src/cd-paranoia/Makefile.am index d373b322..c0ec4224 100644 --- a/src/cd-paranoia/Makefile.am +++ b/src/cd-paranoia/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.26 2008/03/20 19:02:38 karl Exp $ +# $Id: Makefile.am,v 1.27 2008/08/31 13:38:22 flameeyes Exp $ # # Copyright (C) 2004, 2005, 2006, 2007, 2008 Rocky Bernstein # Copyright (C) 1998 Monty xiphmont@mit.edu @@ -34,7 +34,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) $(LIBICONV) +cd_paranoia_LDADD = $(LIBCDIO_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_PARANOIA_LIBS) $(LTLIBICONV) cd_paranoia_DEPENDENCIES = $(LIBCDIO_DEPS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_PARANOIA_LIBS) diff --git a/test/Makefile.am b/test/Makefile.am index 62bafbb3..8d79e2ed 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.68 2008/06/14 08:27:20 flameeyes Exp $ +# $Id: Makefile.am,v 1.69 2008/08/31 13:38:22 flameeyes Exp $ # # Copyright (C) 2003, 2004, 2006, 2008 Rocky Bernstein # @@ -25,7 +25,7 @@ if BUILD_CD_PARANOIA testparanoia=testparanoia -testparanoia_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +testparanoia_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) endif hack = check_sizeof testassert testbincue testischar \ @@ -36,25 +36,25 @@ EXTRA_PROGRAMS = testdefault INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS) -check_sizeof_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) -testassert_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) -testdefault_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) -testischar_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) -testiso9660_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +check_sizeof_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) +testassert_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) +testdefault_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) +testischar_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) +testiso9660_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) -testisocd_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) -testisocd2_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) +testisocd_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) +testisocd2_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) -testtoc_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) +testtoc_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) testtoc_CFLAGS = -DTEST_DIR=\"$(srcdir)\" -testpregap_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) +testpregap_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) testpregap_CFLAGS = -DTEST_DIR=\"$(srcdir)\" -testbincue_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) +testbincue_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) testbincue_CFLAGS = -DTEST_DIR=\"$(srcdir)\" -testnrg_LDADD = $(LIBCDIO_LIBS) $(LIBICONV) +testnrg_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) testnrg_CFLAGS = -DTEST_DIR=\"$(srcdir)\" check_SCRIPTS = check_nrg.sh check_cue.sh check_cd_read.sh \