cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sequential build of library/shared library unmesses parallel builds...

Browse Source 
regen patches while there.
This commit is contained in:
espie 2007-10-27 15:01:53 +00:00
parent d2ddbca788
commit fbe8651d6a
6 changed files with 71 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
audio/cdparanoia/patches/patch-interface_cooked_interface_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-interface_cooked_interface_c,v 1.2 2002/09/16 13:35:52 lebel Exp $
$OpenBSD: patch-interface_cooked_interface_c,v 1.3 2007/10/27 15:01:53 espie Exp $
--- interface/cooked_interface.c.orig Thu Apr 20 00:41:04 2000
+++ interface/cooked_interface.c Mon Sep 16 12:47:11 2002
+++ interface/cooked_interface.c Sat Oct 27 16:57:49 2007
@@ -13,6 +13,7 @@
static int cooked_readtoc (cdrom_drive *d){
int i;
@ -9,7 +9,7 @@ $OpenBSD: patch-interface_cooked_interface_c,v 1.2 2002/09/16 13:35:52 lebel Exp
struct cdrom_tochdr hdr;
struct cdrom_tocentry entry;
@@ -52,6 +53,45 @@ static int cooked_readtoc (cdrom_drive *
@@ -52,6 +53,45 @@ static int cooked_readtoc (cdrom_drive *d){
d->disc_toc[i].dwStartSector = entry.cdte_addr.lba;
tracks=hdr.cdth_trk1+1;
@ -55,7 +55,7 @@ $OpenBSD: patch-interface_cooked_interface_c,v 1.2 2002/09/16 13:35:52 lebel Exp
d->cd_extra=FixupTOC(d,tracks);
return(--tracks); /* without lead-out */
}
@@ -60,10 +100,14 @@ static int cooked_readtoc (cdrom_drive *
@@ -60,10 +100,14 @@ static int cooked_readtoc (cdrom_drive *d){
/* Set operating speed */
static int cooked_setspeed(cdrom_drive *d, int speed)
{
@ -70,7 +70,7 @@ $OpenBSD: patch-interface_cooked_interface_c,v 1.2 2002/09/16 13:35:52 lebel Exp
}
@@ -72,6 +116,7 @@ static int cooked_setspeed(cdrom_drive *
@@ -72,6 +116,7 @@ static int cooked_setspeed(cdrom_drive *d, int speed)
*/
static long cooked_read (cdrom_drive *d, void *p, long begin, long sectors){
@ -78,7 +78,7 @@ $OpenBSD: patch-interface_cooked_interface_c,v 1.2 2002/09/16 13:35:52 lebel Exp
int retry_count,err;
struct cdrom_read_audio arg;
char *buffer=(char *)p;
@@ -127,6 +172,9 @@ static long cooked_read (cdrom_drive *d,
@@ -127,6 +172,9 @@ static long cooked_read (cdrom_drive *d, void *p, long
} while (err);
return(sectors);
@ -88,7 +88,7 @@ $OpenBSD: patch-interface_cooked_interface_c,v 1.2 2002/09/16 13:35:52 lebel Exp
}
/* hook */
@@ -191,6 +239,7 @@ static void check_exceptions(cdrom_drive
@@ -191,6 +239,7 @@ static void check_exceptions(cdrom_drive *d,exception
/* set function pointers to use the ioctl routines */
int cooked_init_drive (cdrom_drive *d){

44
audio/cdparanoia/patches/patch-interface_scan_devices_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-interface_scan_devices_c,v 1.4 2005/12/23 06:29:38 jakemsr Exp $
--- interface/scan_devices.c.orig Sun Mar 25 21:44:01 2001
+++ interface/scan_devices.c Thu Dec 22 00:36:43 2005
$OpenBSD: patch-interface_scan_devices_c,v 1.5 2007/10/27 15:01:53 espie Exp $
--- interface/scan_devices.c.orig Mon Mar 26 07:44:01 2001
+++ interface/scan_devices.c Sat Oct 27 16:57:49 2007
@@ -19,6 +19,8 @@
#include "common_interface.h"
#include "utils.h"
@ -27,7 +27,7 @@ $OpenBSD: patch-interface_scan_devices_c,v 1.4 2005/12/23 06:29:38 jakemsr Exp $
cdrom_drive *cdda_find_a_cdrom(int messagedest,char **messages){
/* Brute force... */
@@ -71,14 +80,16 @@ cdrom_drive *cdda_find_a_cdrom(int messa
@@ -71,14 +80,16 @@ cdrom_drive *cdda_find_a_cdrom(int messagedest,char **
/* number, then letter */
@ -46,7 +46,7 @@ $OpenBSD: patch-interface_scan_devices_c,v 1.4 2005/12/23 06:29:38 jakemsr Exp $
}
}else{
/* Name. Go for it. */
@@ -98,6 +109,7 @@ cdrom_drive *cdda_find_a_cdrom(int messa
@@ -98,6 +109,7 @@ cdrom_drive *cdda_find_a_cdrom(int messagedest,char **
}
return(NULL);
}
@ -54,7 +54,7 @@ $OpenBSD: patch-interface_scan_devices_c,v 1.4 2005/12/23 06:29:38 jakemsr Exp $
cdrom_drive *cdda_identify(const char *device, int messagedest,char **messages){
struct stat st;
@@ -146,6 +158,9 @@ char *test_resolve_symlink(const char *f
@@ -146,6 +158,9 @@ char *test_resolve_symlink(const char *file,int messag
cdrom_drive *cdda_identify_cooked(const char *dev, int messagedest,
char **messages){
@ -64,7 +64,7 @@ $OpenBSD: patch-interface_scan_devices_c,v 1.4 2005/12/23 06:29:38 jakemsr Exp $
cdrom_drive *d=NULL;
struct stat st;
int fd=-1;
@@ -273,6 +288,7 @@ cdrom_drive *cdda_identify_cooked(const
@@ -273,6 +288,7 @@ cdrom_drive *cdda_identify_cooked(const char *dev, int
idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description);
return(d);
@ -91,7 +91,7 @@ $OpenBSD: patch-interface_scan_devices_c,v 1.4 2005/12/23 06:29:38 jakemsr Exp $
if(ioctl(fd,SCSI_IOCTL_GET_IDLUN,&argid))return(-1);
id->bus=argid.l2; /* for now */
id->id=argid.l1&0xff;
@@ -302,6 +324,18 @@ static int get_scsi_id(int fd, scsiid *i
@@ -302,6 +324,18 @@ static int get_scsi_id(int fd, scsiid *id){
if(ioctl(fd,SCSI_IOCTL_GET_BUS_NUMBER,&busarg)==0)
id->bus=busarg;
@ -118,7 +118,7 @@ $OpenBSD: patch-interface_scan_devices_c,v 1.4 2005/12/23 06:29:38 jakemsr Exp $
/* At this point, we're going to punt compatability before SG2, and
allow only SG2 and SG3 */
static int verify_SG_version(cdrom_drive *d,int messagedest,
@@ -430,6 +465,7 @@ static int verify_SG_version(cdrom_drive
@@ -430,6 +465,7 @@ static int verify_SG_version(cdrom_drive *d,int messag
idmessage(messagedest,messages,buffer,"");
return(major);
}
@ -126,7 +126,7 @@ $OpenBSD: patch-interface_scan_devices_c,v 1.4 2005/12/23 06:29:38 jakemsr Exp $
cdrom_drive *cdda_identify_scsi(const char *generic_device,
const char *ioctl_device, int messagedest,
@@ -460,6 +496,7 @@ cdrom_drive *cdda_identify_scsi(const ch
@@ -460,6 +496,7 @@ cdrom_drive *cdda_identify_scsi(const char *generic_de
generic_device);
return(NULL);
}
@ -134,7 +134,7 @@ $OpenBSD: patch-interface_scan_devices_c,v 1.4 2005/12/23 06:29:38 jakemsr Exp $
if((int)(g_st.st_rdev>>8)!=SCSI_GENERIC_MAJOR){
if((int)(g_st.st_rdev>>8)!=SCSI_CDROM_MAJOR){
idmessage(messagedest,messages,"\t\t%s is not a SCSI device",
@@ -471,6 +508,7 @@ cdrom_drive *cdda_identify_scsi(const ch
@@ -471,6 +508,7 @@ cdrom_drive *cdda_identify_scsi(const char *generic_de
ioctl_device=temp;
}
}
@ -142,7 +142,7 @@ $OpenBSD: patch-interface_scan_devices_c,v 1.4 2005/12/23 06:29:38 jakemsr Exp $
}
if(ioctl_device){
if(stat(ioctl_device,&i_st)){
@@ -478,6 +516,7 @@ cdrom_drive *cdda_identify_scsi(const ch
@@ -478,6 +516,7 @@ cdrom_drive *cdda_identify_scsi(const char *generic_de
ioctl_device);
return(NULL);
}
@ -150,7 +150,7 @@ $OpenBSD: patch-interface_scan_devices_c,v 1.4 2005/12/23 06:29:38 jakemsr Exp $
if((int)(i_st.st_rdev>>8)!=SCSI_CDROM_MAJOR){
if((int)(i_st.st_rdev>>8)!=SCSI_GENERIC_MAJOR){
idmessage(messagedest,messages,"\t\t%s is not a SCSI device",
@@ -489,6 +528,7 @@ cdrom_drive *cdda_identify_scsi(const ch
@@ -489,6 +528,7 @@ cdrom_drive *cdda_identify_scsi(const char *generic_de
ioctl_device=temp;
}
}
@ -158,7 +158,7 @@ $OpenBSD: patch-interface_scan_devices_c,v 1.4 2005/12/23 06:29:38 jakemsr Exp $
}
/* we need to resolve any symlinks for the lookup code to work */
@@ -505,6 +545,7 @@ cdrom_drive *cdda_identify_scsi(const ch
@@ -505,6 +545,7 @@ cdrom_drive *cdda_identify_scsi(const char *generic_de
}
if(!generic_device || !ioctl_device){
@ -166,7 +166,7 @@ $OpenBSD: patch-interface_scan_devices_c,v 1.4 2005/12/23 06:29:38 jakemsr Exp $
if(generic_device){
ioctl_device=
scsi_match(generic_device,scsi_cdrom_prefixes,
@@ -520,6 +561,9 @@ cdrom_drive *cdda_identify_scsi(const ch
@@ -520,6 +561,9 @@ cdrom_drive *cdda_identify_scsi(const char *generic_de
if(!generic_device)
goto cdda_identify_scsi_fail;
}
@ -176,7 +176,7 @@ $OpenBSD: patch-interface_scan_devices_c,v 1.4 2005/12/23 06:29:38 jakemsr Exp $
}
idmessage(messagedest,messages,"\t\tgeneric device: %s",generic_device);
@@ -535,7 +579,7 @@ cdrom_drive *cdda_identify_scsi(const ch
@@ -535,7 +579,7 @@ cdrom_drive *cdda_identify_scsi(const char *generic_de
}
if(ioctl_device)i_fd=open(ioctl_device,O_RDONLY|O_NONBLOCK);
@ -185,7 +185,7 @@ $OpenBSD: patch-interface_scan_devices_c,v 1.4 2005/12/23 06:29:38 jakemsr Exp $
if(ioctl_device && i_fd==-1)
idperror(messagedest,messages,"\t\tCould not open SCSI cdrom device "
@@ -556,6 +600,7 @@ cdrom_drive *cdda_identify_scsi(const ch
@@ -556,6 +600,7 @@ cdrom_drive *cdda_identify_scsi(const char *generic_de
type=(int)(i_st.st_rdev>>8);
@ -193,7 +193,7 @@ $OpenBSD: patch-interface_scan_devices_c,v 1.4 2005/12/23 06:29:38 jakemsr Exp $
if(type==SCSI_CDROM_MAJOR){
if (!S_ISBLK(i_st.st_mode)) {
idmessage(messagedest,messages,"\t\tSCSI CDROM device %s not a "
@@ -567,8 +612,10 @@ cdrom_drive *cdda_identify_scsi(const ch
@@ -567,8 +612,10 @@ cdrom_drive *cdda_identify_scsi(const char *generic_de
"major number",ioctl_device);
goto cdda_identify_scsi_fail;
}
@ -204,7 +204,7 @@ $OpenBSD: patch-interface_scan_devices_c,v 1.4 2005/12/23 06:29:38 jakemsr Exp $
if((int)(g_st.st_rdev>>8)==SCSI_GENERIC_MAJOR){
if (!S_ISCHR(g_st.st_mode)) {
idmessage(messagedest,messages,"\t\tGeneric SCSI device %s not a "
@@ -580,6 +627,7 @@ cdrom_drive *cdda_identify_scsi(const ch
@@ -580,6 +627,7 @@ cdrom_drive *cdda_identify_scsi(const char *generic_de
"major number",generic_device);
goto cdda_identify_scsi_fail;
}
@ -212,7 +212,7 @@ $OpenBSD: patch-interface_scan_devices_c,v 1.4 2005/12/23 06:29:38 jakemsr Exp $
d=calloc(1,sizeof(cdrom_drive));
@@ -590,6 +638,7 @@ cdrom_drive *cdda_identify_scsi(const ch
@@ -590,6 +638,7 @@ cdrom_drive *cdda_identify_scsi(const char *generic_de
d->bigendianp=-1; /* We don't know yet... */
d->nsectors=-1;
@ -220,7 +220,7 @@ $OpenBSD: patch-interface_scan_devices_c,v 1.4 2005/12/23 06:29:38 jakemsr Exp $
version=verify_SG_version(d,messagedest,messages);
switch(version){
case -1:case 0:case 1:
@@ -599,6 +648,9 @@ cdrom_drive *cdda_identify_scsi(const ch
@@ -599,6 +648,9 @@ cdrom_drive *cdda_identify_scsi(const char *generic_de
d->interface=GENERIC_SCSI;
break;
}
@ -230,7 +230,7 @@ $OpenBSD: patch-interface_scan_devices_c,v 1.4 2005/12/23 06:29:38 jakemsr Exp $
/* malloc our big buffer for scsi commands */
d->sg=malloc(MAX_BIG_BUFF_SIZE);
@@ -617,7 +669,16 @@ cdrom_drive *cdda_identify_scsi(const ch
@@ -617,7 +669,16 @@ cdrom_drive *cdda_identify_scsi(const char *generic_de
/* It would seem some TOSHIBA CDROMs gets things wrong */

30
audio/cdparanoia/patches/patch-interface_scsi_interface_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-interface_scsi_interface_c,v 1.3 2005/12/23 06:31:31 jakemsr Exp $
--- interface/scsi_interface.c.orig Fri Mar 23 17:15:46 2001
+++ interface/scsi_interface.c Thu Dec 22 22:30:02 2005
@@ -23,6 +23,7 @@ static void tweak_SG_buffer(cdrom_drive
$OpenBSD: patch-interface_scsi_interface_c,v 1.4 2007/10/27 15:01:53 espie Exp $
--- interface/scsi_interface.c.orig Sat Mar 24 02:15:46 2001
+++ interface/scsi_interface.c Sat Oct 27 16:57:49 2007
@@ -23,6 +23,7 @@ static void tweak_SG_buffer(cdrom_drive *d){
int table,reserved;
char buffer[256];
@ -9,7 +9,7 @@ $OpenBSD: patch-interface_scsi_interface_c,v 1.3 2005/12/23 06:31:31 jakemsr Exp
/* maximum transfer size? */
if(ioctl(d->cdda_fd,SG_GET_RESERVED_SIZE,&reserved)){
/* Up, guess not. */
@@ -31,6 +32,10 @@ static void tweak_SG_buffer(cdrom_drive
@@ -31,6 +32,10 @@ static void tweak_SG_buffer(cdrom_drive *d){
}
if(ioctl(d->cdda_fd,SG_GET_SG_TABLESIZE,&table))table=1;
@ -20,7 +20,7 @@ $OpenBSD: patch-interface_scsi_interface_c,v 1.3 2005/12/23 06:31:31 jakemsr Exp
{
int cur;
@@ -53,20 +58,27 @@ static void tweak_SG_buffer(cdrom_drive
@@ -53,20 +58,27 @@ static void tweak_SG_buffer(cdrom_drive *d){
cdmessage(d,buffer);
}
@ -57,7 +57,7 @@ $OpenBSD: patch-interface_scsi_interface_c,v 1.3 2005/12/23 06:31:31 jakemsr Exp
static void clear_garbage(cdrom_drive *d){
fd_set fdset;
struct timeval tv;
@@ -104,6 +117,7 @@ static void clear_garbage(cdrom_drive *d
@@ -104,6 +117,7 @@ static void clear_garbage(cdrom_drive *d){
flag=1;
}
}
@ -65,7 +65,7 @@ $OpenBSD: patch-interface_scsi_interface_c,v 1.3 2005/12/23 06:31:31 jakemsr Exp
/* process a complete scsi command. */
static int handle_scsi_cmd(cdrom_drive *d,
@@ -114,11 +128,16 @@ static int handle_scsi_cmd(cdrom_drive *
@@ -114,11 +128,16 @@ static int handle_scsi_cmd(cdrom_drive *d,
unsigned char bytefill,
int bytecheck){
int status = 0;
@ -83,7 +83,7 @@ $OpenBSD: patch-interface_scsi_interface_c,v 1.3 2005/12/23 06:31:31 jakemsr Exp
/* clear out any possibly preexisting garbage */
clear_garbage(d);
@@ -213,8 +232,38 @@ static int handle_scsi_cmd(cdrom_drive *
@@ -213,8 +232,38 @@ static int handle_scsi_cmd(cdrom_drive *d,
}
}
}
@ -122,7 +122,7 @@ $OpenBSD: patch-interface_scsi_interface_c,v 1.3 2005/12/23 06:31:31 jakemsr Exp
status = read(d->cdda_fd, sg_hd, SG_OFF + out_size);
sigprocmask ( SIG_UNBLOCK, &(d->sigset), NULL );
@@ -229,6 +278,13 @@ static int handle_scsi_cmd(cdrom_drive *
@@ -229,6 +278,13 @@ static int handle_scsi_cmd(cdrom_drive *d,
char key=sg_hd->sense_buffer[2]&0xf;
char ASC=sg_hd->sense_buffer[12];
char ASCQ=sg_hd->sense_buffer[13];
@ -136,7 +136,7 @@ $OpenBSD: patch-interface_scsi_interface_c,v 1.3 2005/12/23 06:31:31 jakemsr Exp
switch(key){
case 0:
if(errno==0)errno=EIO;
@@ -266,9 +322,19 @@ static int handle_scsi_cmd(cdrom_drive *
@@ -266,9 +322,19 @@ static int handle_scsi_cmd(cdrom_drive *d,
commands still get through. Perhaps no data comes back even
though the target reports success? */
@ -156,7 +156,7 @@ $OpenBSD: patch-interface_scsi_interface_c,v 1.3 2005/12/23 06:31:31 jakemsr Exp
if(d->sg_buffer[i]!=bytefill){
flag=1;
break;
@@ -600,6 +666,24 @@ static int scsi_read_toc2 (cdrom_drive *
@@ -600,6 +666,24 @@ static int scsi_read_toc2 (cdrom_drive *d){
return(tracks);
}
@ -181,7 +181,7 @@ $OpenBSD: patch-interface_scsi_interface_c,v 1.3 2005/12/23 06:31:31 jakemsr Exp
/* These do one 'extra' copy in the name of clean code */
static int i_read_28 (cdrom_drive *d, void *p, long begin, long sectors){
@@ -833,16 +917,28 @@ static long scsi_read_map (cdrom_drive *
@@ -833,16 +917,28 @@ static long scsi_read_map (cdrom_drive *d, void *p, lo
while(1) {
if((err=map(d,(p?buffer:NULL),begin,sectors))){
if(d->report_all){
@ -210,7 +210,7 @@ $OpenBSD: patch-interface_scsi_interface_c,v 1.3 2005/12/23 06:31:31 jakemsr Exp
cdmessage(d,b);
sprintf(b," Transport error: %s\n",strerror_tr[err]);
cdmessage(d,b);
@@ -852,9 +948,16 @@ static long scsi_read_map (cdrom_drive *
@@ -852,9 +948,16 @@ static long scsi_read_map (cdrom_drive *d, void *p, lo
fprintf(stderr,"scsi_read error: sector=%ld length=%ld retry=%d\n",
begin,sectors,retry_count);
fprintf(stderr," Sense key: %x ASC: %x ASCQ: %x\n",
@ -227,7 +227,7 @@ $OpenBSD: patch-interface_scsi_interface_c,v 1.3 2005/12/23 06:31:31 jakemsr Exp
fprintf(stderr," Transport error: %s\n",strerror_tr[err]);
fprintf(stderr," System error: %s\n",strerror(errno));
}
@@ -1308,21 +1411,37 @@ static void check_fua_bit(cdrom_drive *d
@@ -1308,21 +1411,37 @@ static void check_fua_bit(cdrom_drive *d){
}
static int check_atapi(cdrom_drive *d){

12
audio/cdparanoia/patches/patch-interface_utils_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-interface_utils_h,v 1.3 2002/09/16 13:35:52 lebel Exp $
$OpenBSD: patch-interface_utils_h,v 1.4 2007/10/27 15:01:53 espie Exp $
--- interface/utils.h.orig Thu Apr 20 00:41:04 2000
+++ interface/utils.h Sat Sep 7 20:59:41 2002
+++ interface/utils.h Sat Oct 27 16:57:49 2007
@@ -1,4 +1,16 @@
+#ifdef __linux__
#include <endian.h>
@ -34,7 +34,7 @@ $OpenBSD: patch-interface_utils_h,v 1.3 2002/09/16 13:35:52 lebel Exp $
#if BYTE_ORDER == LITTLE_ENDIAN
@@ -112,6 +126,7 @@ static void cderror(cdrom_drive *d,const
@@ -112,6 +126,7 @@ static void cderror(cdrom_drive *d,const char *s){
break;
case CDDA_MESSAGE_FORGETIT:
default:
@ -42,7 +42,7 @@ $OpenBSD: patch-interface_utils_h,v 1.3 2002/09/16 13:35:52 lebel Exp $
}
}
}
@@ -127,6 +142,7 @@ static void cdmessage(cdrom_drive *d,con
@@ -127,6 +142,7 @@ static void cdmessage(cdrom_drive *d,const char *s){
break;
case CDDA_MESSAGE_FORGETIT:
default:
@ -50,7 +50,7 @@ $OpenBSD: patch-interface_utils_h,v 1.3 2002/09/16 13:35:52 lebel Exp $
}
}
}
@@ -169,6 +185,7 @@ static void idperror(int messagedest,cha
@@ -169,6 +185,7 @@ static void idperror(int messagedest,char **messages,c
break;
case CDDA_MESSAGE_FORGETIT:
default:
@ -58,7 +58,7 @@ $OpenBSD: patch-interface_utils_h,v 1.3 2002/09/16 13:35:52 lebel Exp $
}
}
if(malloced)free(buffer);
@@ -205,6 +222,7 @@ static void idmessage(int messagedest,ch
@@ -205,6 +222,7 @@ static void idmessage(int messagedest,char **messages,
break;
case CDDA_MESSAGE_FORGETIT:
default:

8
audio/cdparanoia/patches/patch-main_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-main_c,v 1.5 2003/01/23 23:45:24 espie Exp $
--- main.c.orig Fri Jan 24 00:36:25 2003
+++ main.c Fri Jan 24 00:38:12 2003
@@ -376,7 +376,7 @@ static void callback(long inpos, int fun
$OpenBSD: patch-main_c,v 1.6 2007/10/27 15:01:53 espie Exp $
--- main.c.orig Mon Mar 26 05:44:50 2001
+++ main.c Sat Oct 27 16:57:49 2007
@@ -376,7 +376,7 @@ static void callback(long inpos, int function){
int graph=30;
char buffer[256];
static long c_sector=0,v_sector=0;

27
audio/cdparanoia/patches/patch-paranoia_Makefile_in
View File

@ -1,27 +1,34 @@
$OpenBSD: patch-paranoia_Makefile_in,v 1.5 2005/12/23 15:03:06 espie Exp $
$OpenBSD: patch-paranoia_Makefile_in,v 1.6 2007/10/27 15:01:53 espie Exp $
--- paranoia/Makefile.in.orig Tue Dec 14 05:28:04 1999
+++ paranoia/Makefile.in Fri Dec 23 15:42:25 2005
@@ -22,8 +22,9 @@ OFILES = paranoia.o p_block.o overlap.o
+++ paranoia/Makefile.in Sat Oct 27 17:00:19 2007
@@ -22,20 +22,17 @@ OFILES = paranoia.o p_block.o overlap.o gap.o isort.o
#TFILES = isort.t gap.t p_block.t paranoia.t
LIBS = ../interface/libcdda_interface.a -lm
-export VERSION
-all: lib slib
+LIBcdda_paranoia_VERSION=0.0
+
all: lib slib
debug:
@@ -34,7 +35,7 @@ lib:
slib:
-debug:
- $(MAKE) libcdda_paranoia.a CFLAGS="$(DEBUG)"
-
-lib:
+all:
$(MAKE) libcdda_paranoia.a CFLAGS="$(OPT)"
-
-slib:
$(MAKE) lessmessy
- $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fpic"
+ $(MAKE) libcdda_paranoia.so.$(LIBcdda_paranoia_VERSION) VERSION=$(VERSION) CFLAGS="$(OPT) -fpic"
+debug:
+ $(MAKE) libcdda_paranoia.a CFLAGS="$(DEBUG)"
+
#test: $(TFILES)
#
@@ -43,10 +44,8 @@ libcdda_paranoia.a: $(OFILES)
@@ -43,10 +40,8 @@ libcdda_paranoia.a: $(OFILES)
$(AR) -r libcdda_paranoia.a $(OFILES)
$(RANLIB) libcdda_paranoia.a