rename cdinfo to cd-info to accomodate previously existing cdinfo programs.

Thanks to Manfred Tremmel <Manfred.Tremmel@iiv.de> for reporting the problem.
This commit is contained in:
rocky
2003-04-25 21:28:39 +00:00
parent 7b8e6136aa
commit 4a33c7f3b1
6 changed files with 136 additions and 94 deletions

View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.4 2003/04/14 04:29:45 rocky Exp $
# $Id: Makefile.am,v 1.5 2003/04/25 21:28:39 rocky Exp $
#
# Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
#
@@ -22,18 +22,18 @@
CDDB_LIB=@CDDB_LIB@
if BUILD_CDINFO
cdinfo_SOURCES = cdinfo.c
cdinfo_LDADD = $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(CDDB_LIB)
cd_info_SOURCES = cd-info.c
cd_info_LDADD = $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(CDDB_LIB)
if BUILD_CDINFO_LINUX
cdinfo_linux_SOURCES = cdinfo-linux.c
cdinfo_linux_LDADD = $(LIBCDIO_LIBS) $(LIBPOPT_LIBS)
bin_PROGRAMS = cdinfo cdinfo-linux
bin_PROGRAMS = cd-info cdinfo-linux
else
bin_PROGRAMS = cdinfo
bin_PROGRAMS = cd-info
EXTRA_DIST = cdinfo-linux.c
endif
else
EXTRA_DIST = cdinfo-linux.c cdinfo.c
EXTRA_DIST = cdinfo-linux.c cd-info.c
endif
INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS)

View File

@@ -1,5 +1,5 @@
/*
$Id: cdinfo.c,v 1.16 2003/04/22 12:09:09 rocky Exp $
$Id: cd-info.c,v 1.1 2003/04/25 21:28:39 rocky Exp $
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1996,1997,1998 Gerd Knorr <kraxel@bytesex.org>