*** Imakefile.orig	Thu Jan 17 08:37:02 1991
--- Imakefile	Tue Mar  5 00:02:24 1991
***************
*** 6,10 ****
--- 6,14 ----
  DEFINES = ExtensionDefines 
  INCLUDES = -I$(TOP) -I$(TOP)/X11 -I/usr/demo/SOUND
+ #ifdef SparcArchitecture
  SYS_LIBRARIES = -L/usr/demo/SOUND -laudio -lm
+ #else
+ SYS_LIBRARIES = -lm
+ #endif
  /* Use the following for SunOS 4.0.3: */
  /*
***************
*** 20,25 ****
  OBJS = oclock.o Clock.o transform.o play.o libst.o libsst.o
  #else
! SRCS = oclock.c Clock.c transform.c
! OBJS = oclock.o Clock.o transform.o
  #endif
  
--- 24,29 ----
  OBJS = oclock.o Clock.o transform.o play.o libst.o libsst.o
  #else
! SRCS = oclock.c Clock.c transform.c play.c
! OBJS = oclock.o Clock.o transform.o play.o
  #endif
  
*** oclock++.man.orig	Thu Jan 17 08:37:59 1991
--- oclock++.man	Mon Mar  4 23:42:57 1991
***************
*** 108,110 ****
  .br
  SPARCstation sound interface by Jef Poskanzer.
! SunOS 4.1 patches by Greg Earle.
--- 108,112 ----
  .br
  SPARCstation sound interface by Jef Poskanzer.
! .br
! SunOS 4.1 patches and support for WM_DELETE_WINDOW hack by Greg Earle.
! 
*** play.c.orig	Tue Mar  5 00:02:49 1991
--- play.c	Tue Mar  5 00:09:12 1991
***************
*** 10,14 ****
   ** implied warranty.
   */
! 
  #include <stdio.h>
  #include <fcntl.h>
--- 10,14 ----
   ** implied warranty.
   */
! #ifdef sun4c
  #include <stdio.h>
  #include <fcntl.h>
***************
*** 131,132 ****
--- 131,140 ----
      exit( 1 );
  }
+ #else
+ play_sound(sound_file, volume)
+     char *sound_file;
+     int volume;
+ {
+     return( 1 );
+ }
+ #endif
*** Imakefile.orig	Thu Jan 17 08:37:02 1991
--- Imakefile	Tue Mar  5 00:02:24 1991
***************
*** 6,10 ****
--- 6,14 ----
  DEFINES = ExtensionDefines 
  INCLUDES = -I$(TOP) -I$(TOP)/X11 -I/usr/demo/SOUND
+ #ifdef SparcArchitecture
  SYS_LIBRARIES = -L/usr/demo/SOUND -laudio -lm
+ #else
+ SYS_LIBRARIES = -lm
+ #endif
  /* Use the following for SunOS 4.0.3: */
  /*
***************
*** 20,25 ****
  OBJS = oclock.o Clock.o transform.o play.o libst.o libsst.o
  #else
! SRCS = oclock.c Clock.c transform.c
! OBJS = oclock.o Clock.o transform.o
  #endif
  
--- 24,29 ----
  OBJS = oclock.o Clock.o transform.o play.o libst.o libsst.o
  #else
! SRCS = oclock.c Clock.c transform.c play.c
! OBJS = oclock.o Clock.o transform.o play.o
  #endif
  
*** Makefile.orig	Tue Mar  5 00:24:21 1991
--- Makefile	Tue Mar  5 00:24:51 1991
***************
*** 42,46 ****
                 AR = ar cq
    BOOTSTRAPCFLAGS =
!                CC = gcc -DNOSTDHDRS -fstrength-reduce -fpcc-struct-return -fwritable-strings -traditional
  
           COMPRESS = compress
--- 42,46 ----
                 AR = ar cq
    BOOTSTRAPCFLAGS =
!                CC = cc
  
           COMPRESS = compress
***************
*** 86,90 ****
  
        CDEBUGFLAGS = -O
!         CCOPTIONS = -m68881
        COMPATFLAGS =
  
--- 86,90 ----
  
        CDEBUGFLAGS = -O
!         CCOPTIONS = -f68881
        COMPATFLAGS =
  
***************
*** 119,123 ****
            PATHSEP = /
          USRLIBDIR = $(DESTDIR)/usr/local/lib
!            BINDIR = $(DESTDIR)/usr/public/x11r4/bin4
            INCROOT = $(DESTDIR)/usr/local/include
       BUILDINCROOT = $(TOP)
--- 119,123 ----
            PATHSEP = /
          USRLIBDIR = $(DESTDIR)/usr/local/lib
!            BINDIR = $(DESTDIR)/usr/local/bin/X11
            INCROOT = $(DESTDIR)/usr/local/include
       BUILDINCROOT = $(TOP)
*** oclock++.man.orig	Thu Jan 17 08:37:59 1991
--- oclock++.man	Tue Mar  5 00:16:13 1991
***************
*** 108,110 ****
  .br
  SPARCstation sound interface by Jef Poskanzer.
! SunOS 4.1 patches by Greg Earle.
--- 108,112 ----
  .br
  SPARCstation sound interface by Jef Poskanzer.
! .br
! SunOS 4.1.x patches and support for WM_DELETE_WINDOW hack by Greg Earle.
! 
*** play.c.orig	Tue Mar  5 00:02:49 1991
--- play.c	Wed Mar  6 13:07:13 1991
***************
*** 10,14 ****
   ** implied warranty.
   */
! 
  #include <stdio.h>
  #include <fcntl.h>
--- 10,14 ----
   ** implied warranty.
   */
! #ifdef sparc
  #include <stdio.h>
  #include <fcntl.h>
***************
*** 131,132 ****
--- 131,140 ----
      exit( 1 );
  }
+ #else
+ play_sound(sound_file, volume)
+     char *sound_file;
+     int volume;
+ {
+     return( 1 );
+ }
+ #endif