claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Add libiconv libraries where needed.

Browse Source
This commit is contained in:
rocky
2004-10-24 12:26:28 +00:00
parent ca786556c7
commit 4257f24aaa
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
example/Makefile.am
View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.9 2004/10/10 00:21:08 rocky Exp $
# $Id: Makefile.am,v 1.10 2004/10/24 12:26:28 rocky Exp $
#
# Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
#
@@ -29,9 +29,9 @@ cdtext_LDADD = $(LIBCDIO_LIBS)
drives_LDADD = $(LIBCDIO_LIBS)
iso1_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS)
iso2_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS)
iso3_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS)
iso1_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBINTL)
iso2_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBINTL)
iso3_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBINTL)
scsi_mmc1_LDADD = $(LIBCDIO_LIBS)
scsi_mmc2_LDADD = $(LIBCDIO_LIBS)

6
lib/iso9660_fs.c
View File

@@ -1,5 +1,5 @@
/*
$Id: iso9660_fs.c,v 1.28 2004/10/24 03:29:31 rocky Exp $
$Id: iso9660_fs.c,v 1.29 2004/10/24 12:26:28 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -31,7 +31,7 @@
# include <errno.h>
#endif
#ifdef HAVE_ICONV_H
#ifdef HAVE_ICONV
# include <iconv.h>
#endif
@@ -49,7 +49,7 @@
#include <stdio.h>
static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.28 2004/10/24 03:29:31 rocky Exp $";
static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.29 2004/10/24 12:26:28 rocky Exp $";
/* Implementation of iso9660_t type */
struct _iso9660 {

12
src/Makefile.am
View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.24 2004/09/11 13:02:36 rocky Exp $
# $Id: Makefile.am,v 1.25 2004/10/24 12:26:28 rocky Exp $
#
# Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
#
@@ -30,19 +30,19 @@ endif
if BUILD_CDINFO
cd_info_SOURCES = cd-info.c util.c util.h
cd_info_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(CDDB_LIBS) $(VCDINFO_LIBS)
cd_info_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(CDDB_LIBS) $(VCDINFO_LIBS) $(LIBINTL)
cd_drive_SOURCES = cd-drive.c util.c util.h
cd_drive_LDADD = $(LIBCDIO_LIBS) $(LIBPOPT_LIBS)
cd_drive_LDADD = $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(LIBINTL)
cd_read_SOURCES = cd-read.c util.c util.h
cd_read_LDADD = $(LIBCDIO_LIBS) $(LIBPOPT_LIBS)
cd_read_LDADD = $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(LIBINTL)
iso_info_SOURCES = iso-info.c util.c util.h
iso_info_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBPOPT_LIBS)
iso_info_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(LIBINTL)
iso_read_SOURCES = iso-read.c util.c util.h
iso_read_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBPOPT_LIBS)
iso_read_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(LIBINTL)
if BUILD_CDINFO_LINUX
cdinfo_linux_SOURCES = cdinfo-linux.c

8
test/Makefile.am
View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.28 2004/09/05 13:03:46 rocky Exp $
# $Id: Makefile.am,v 1.29 2004/10/24 12:26:28 rocky Exp $
#
# Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
#
@@ -28,11 +28,11 @@ noinst_PROGRAMS = $(hack) testdefault
INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS)
check_sizeof_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS)
check_sizeof_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBINTL)
testassert_LDADD = $(LIBCDIO_LIBS)
testdefault_LDADD = $(LIBCDIO_LIBS)
testischar_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS)
testiso9660_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS)
testischar_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBINTL)
testiso9660_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBINTL)
testtoc_LDADD = $(LIBCDIO_LIBS)
testtoc_CFLAGS = -DTEST_DIR=\"$(srcdir)\"