--- ./Makefile	Wed Feb  8 14:08:20 1995
+++ ../sono/./Makefile	Mon Nov 12 15:20:16 2001
@@ -1,16 +1,19 @@
 # Makefile for sono
 #
 
+CC= cc
 XFLAGS= -lXm -lXt -lX11 -lPW
 AUDIOFLAGS= -laudiofile -laudio
 CFLAGS= -O2 -mips2
 
-Sono: Matrix.o Clip.o sono.o
-	cc Matrix.o Clip.o sono.o -o sono $(XFLAGS) $(AUDIOFLAGS) -lm
+sono: Matrix.o Clip.o sono.o
+	$(CC) Matrix.o Clip.o sono.o -o $@ $(XFLAGS) $(AUDIOFLAGS) -lm
 
 matrix: Matrix.c Clip.c
-	cc -c $(CFLAGS) Matrix.c Clip.c
+	$(CC) -c $(CFLAGS) -o $@ Matrix.c Clip.c
 
 msono: sono.c pixmaps.h
-	cc -c $(CFLAGS) sono.c
+	$(CC) -c $(CFLAGS) -o $@ sono.c
 
+clean:
+	rm -f sono matrix msono *.o
--- ./sono.c	Fri Aug 11 14:33:08 1995
+++ ../sono/./sono.c	Mon Nov 12 15:17:56 2001
@@ -395,7 +395,7 @@
     }
     if (si_valid==N) {
       short int *frames = framebuff;
-      int sampsread=AFreadframes(infile, AF_DEFAULT_TRACK, frames, D);
+      int sampsread=afReadFrames(infile, AF_DEFAULT_TRACK, frames, D);
       if (samps_per_frame==1) {
 	si_valid = sampsread+N-D;
 	while(sampsread--) { 
@@ -627,7 +627,7 @@
     return;
   }
 
-  infile=AFopenfile(infilename, "r", in_AFsetup);
+  infile=afOpenFile(infilename, "r", in_AFsetup);
   if (infile==NULL) {
     printf("Couldn't open sound file\n");
     fclose(fil);
@@ -634,12 +634,12 @@
     return;
   }
 
-  samps_per_frame   = AFgetchannels(infile, AF_DEFAULT_TRACK);
-  R                 = (int)AFgetrate(infile, AF_DEFAULT_TRACK);
-  compression       = AFgetcompression(infile, AF_DEFAULT_TRACK);
-  filefmt           = AFgetfilefmt(infile, &vers);   
-  AFgetsampfmt(infile, AF_DEFAULT_TRACK, &samp_type, &bits_per_samp);
-  framecnt          = AFgetframecnt(infile,  AF_DEFAULT_TRACK);
+  samps_per_frame   = afGetChannels(infile, AF_DEFAULT_TRACK);
+  R                 = (int)afGetRate(infile, AF_DEFAULT_TRACK);
+  compression       = afGetCompression(infile, AF_DEFAULT_TRACK);
+  filefmt           = afGetFileFormat(infile, &vers);   
+  afGetSampleFormat(infile, AF_DEFAULT_TRACK, &samp_type, &bits_per_samp);
+  framecnt          = afGetFrameCount(infile, AF_DEFAULT_TRACK);
   
   horiz_num = (framecnt/D)+8;
   duration = (float)framecnt/R;
@@ -734,7 +734,7 @@
   fprintf(fil,"stroke\n");
   showimage(t);
   fprintf(fil,"%%%%EOF\n");
-  AFclosefile(infile);
+  afCloseFile(infile);
   fclose(fil);
   XtVaSetValues(view,XmNsensitive,True,NULL);
   XSetForeground(theDisplay, showGC, white.pixel);