--- ./src/audio/esd/Makefile.am	Wed Mar  6 00:20:11 2002
+++ ../SDL-1.2.5/./src/audio/esd/Makefile.am	Mon Mar  3 17:43:24 2003
@@ -1,8 +1,8 @@
 
 ## Makefile.am for SDL using the Enlightened Sound Daemon sound driver
 
-noinst_LTLIBRARIES = libaudio_esd.la
-libaudio_esd_la_SOURCES = $(SRCS)
+noinst_LIBRARIES = libaudio_esd.a
+libaudio_esd_a_SOURCES = $(SRCS)
 
 esd_lib = \"@esd_lib@\"
 
--- ./src/audio/esd/Makefile.in	Sun Oct  6 16:34:55 2002
+++ ../SDL-1.2.5/./src/audio/esd/Makefile.in	Mon Mar  3 17:43:24 2003
@@ -115,8 +115,8 @@
 VIDEO_SUBDIRS = @VIDEO_SUBDIRS@
 arts_lib = @arts_lib@
 
-noinst_LTLIBRARIES = libaudio_esd.la
-libaudio_esd_la_SOURCES = $(SRCS)
+noinst_LIBRARIES = libaudio_esd.a
+libaudio_esd_a_SOURCES = $(SRCS)
 
 esd_lib = \"@esd_lib@\"
 
@@ -125,7 +125,7 @@
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
+LIBRARIES =  $(noinst_LIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) 
@@ -136,9 +136,9 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libaudio_esd_la_LDFLAGS = 
-libaudio_esd_la_LIBADD = 
-libaudio_esd_la_OBJECTS =  SDL_esdaudio.lo
+libaudio_esd_a_LDFLAGS = 
+libaudio_esd_a_LIBADD = 
+libaudio_esd_a_OBJECTS =  SDL_esdaudio.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -151,8 +151,8 @@
 
 TAR = gtar
 GZIP_ENV = --best
-SOURCES = $(libaudio_esd_la_SOURCES)
-OBJECTS = $(libaudio_esd_la_OBJECTS)
+SOURCES = $(libaudio_esd_a_SOURCES)
+OBJECTS = $(libaudio_esd_a_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -165,14 +165,14 @@
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-mostlyclean-noinstLTLIBRARIES:
+mostlyclean-noinstLIBRARIES:
 
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 
-distclean-noinstLTLIBRARIES:
+distclean-noinstLIBRARIES:
 
-maintainer-clean-noinstLTLIBRARIES:
+maintainer-clean-noinstLIBRARIES:
 
 .c.o:
 	$(COMPILE) -c $<
@@ -212,8 +212,8 @@
 
 maintainer-clean-libtool:
 
-libaudio_esd.la: $(libaudio_esd_la_OBJECTS) $(libaudio_esd_la_DEPENDENCIES)
-	$(LINK)  $(libaudio_esd_la_LDFLAGS) $(libaudio_esd_la_OBJECTS) $(libaudio_esd_la_LIBADD) $(LIBS)
+libaudio_esd.a: $(libaudio_esd_a_OBJECTS) $(libaudio_esd_a_DEPENDENCIES)
+	$(LINK)  $(libaudio_esd_a_LDFLAGS) $(libaudio_esd_a_OBJECTS) $(libaudio_esd_a_LIBADD) $(LIBS)
 
 tags: TAGS
 
@@ -278,7 +278,7 @@
 install: install-am
 uninstall-am:
 uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LIBRARIES)
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -294,18 +294,18 @@
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
+mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
 		mostlyclean-libtool mostlyclean-tags \
 		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
+clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
 		clean-tags clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
+distclean-am:  distclean-noinstLIBRARIES distclean-compile \
 		distclean-libtool distclean-tags distclean-generic \
 		clean-am
 	-rm -f libtool
@@ -312,7 +312,7 @@
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
+maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-libtool \
 		maintainer-clean-tags maintainer-clean-generic \
 		distclean-am
@@ -321,8 +321,8 @@
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
-clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--- ./src/audio/nas/Makefile.am	Thu Apr 26 12:45:44 2001
+++ ../SDL-1.2.5/./src/audio/nas/Makefile.am	Mon Mar  3 17:43:24 2003
@@ -1,8 +1,8 @@
 
 ## Makefile.am for SDL using the Network Audio System sound driver
 
-noinst_LTLIBRARIES = libaudio_nas.la
-libaudio_nas_la_SOURCES = $(SRCS)
+noinst_LIBRARIES = libaudio_nas.a
+libaudio_nas_a_SOURCES = $(SRCS)
 
 # The SDL audio driver sources
 SRCS =	SDL_nasaudio.c	\
--- ./src/audio/nas/Makefile.in	Sun Oct  6 16:34:56 2002
+++ ../SDL-1.2.5/./src/audio/nas/Makefile.in	Mon Mar  3 17:43:24 2003
@@ -116,8 +116,8 @@
 arts_lib = @arts_lib@
 esd_lib = @esd_lib@
 
-noinst_LTLIBRARIES = libaudio_nas.la
-libaudio_nas_la_SOURCES = $(SRCS)
+noinst_LIBRARIES = libaudio_nas.a
+libaudio_nas_a_SOURCES = $(SRCS)
 
 # The SDL audio driver sources
 SRCS = SDL_nasaudio.c		SDL_nasaudio.h
@@ -124,7 +124,7 @@
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
+LIBRARIES =  $(noinst_LIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) 
@@ -135,9 +135,9 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libaudio_nas_la_LDFLAGS = 
-libaudio_nas_la_LIBADD = 
-libaudio_nas_la_OBJECTS =  SDL_nasaudio.lo
+libaudio_nas_a_LDFLAGS = 
+libaudio_nas_a_LIBADD = 
+libaudio_nas_a_OBJECTS =  SDL_nasaudio.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -150,8 +150,8 @@
 
 TAR = gtar
 GZIP_ENV = --best
-SOURCES = $(libaudio_nas_la_SOURCES)
-OBJECTS = $(libaudio_nas_la_OBJECTS)
+SOURCES = $(libaudio_nas_a_SOURCES)
+OBJECTS = $(libaudio_nas_a_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -164,14 +164,14 @@
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-mostlyclean-noinstLTLIBRARIES:
+mostlyclean-noinstLIBRARIES:
 
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 
-distclean-noinstLTLIBRARIES:
+distclean-noinstLIBRARIES:
 
-maintainer-clean-noinstLTLIBRARIES:
+maintainer-clean-noinstLIBRARIES:
 
 .c.o:
 	$(COMPILE) -c $<
@@ -211,8 +211,8 @@
 
 maintainer-clean-libtool:
 
-libaudio_nas.la: $(libaudio_nas_la_OBJECTS) $(libaudio_nas_la_DEPENDENCIES)
-	$(LINK)  $(libaudio_nas_la_LDFLAGS) $(libaudio_nas_la_OBJECTS) $(libaudio_nas_la_LIBADD) $(LIBS)
+libaudio_nas.a: $(libaudio_nas_a_OBJECTS) $(libaudio_nas_a_DEPENDENCIES)
+	$(LINK)  $(libaudio_nas_a_LDFLAGS) $(libaudio_nas_a_OBJECTS) $(libaudio_nas_a_LIBADD) $(LIBS)
 
 tags: TAGS
 
@@ -277,7 +277,7 @@
 install: install-am
 uninstall-am:
 uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LIBRARIES)
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -293,18 +293,18 @@
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
+mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
 		mostlyclean-libtool mostlyclean-tags \
 		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
+clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
 		clean-tags clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
+distclean-am:  distclean-noinstLIBRARIES distclean-compile \
 		distclean-libtool distclean-tags distclean-generic \
 		clean-am
 	-rm -f libtool
@@ -311,7 +311,7 @@
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
+maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-libtool \
 		maintainer-clean-tags maintainer-clean-generic \
 		distclean-am
@@ -320,8 +320,8 @@
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
-clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--- ./src/audio/nas/SDL_nasaudio.h	Wed Mar  6 06:23:02 2002
+++ ../SDL-1.2.5/./src/audio/nas/SDL_nasaudio.h	Mon Mar  3 17:43:24 2003
@@ -32,7 +32,11 @@
 #ifndef _SDL_nasaudio_h
 #define _SDL_nasaudio_h
 
+#ifdef __sgi
+#include <nas/audiolib.h>
+#else
 #include <audio/audiolib.h>
+#endif
 #include <sys/time.h>
 #include "SDL_sysaudio.h"
 
--- ./src/audio/disk/Makefile.am	Fri Jun 15 21:51:42 2001
+++ ../SDL-1.2.5/./src/audio/disk/Makefile.am	Mon Mar  3 17:43:24 2003
@@ -1,8 +1,8 @@
 
 ## Makefile.am for SDL audio "driver" that writes to a file.
 
-noinst_LTLIBRARIES = libaudio_disk.la
-libaudio_disk_la_SOURCES = $(SRCS)
+noinst_LIBRARIES = libaudio_disk.a
+libaudio_disk_a_SOURCES = $(SRCS)
 
 # The SDL audio driver sources
 SRCS =	SDL_diskaudio.c	\
--- ./src/audio/disk/Makefile.in	Sun Oct  6 16:34:56 2002
+++ ../SDL-1.2.5/./src/audio/disk/Makefile.in	Mon Mar  3 17:43:24 2003
@@ -116,8 +116,8 @@
 arts_lib = @arts_lib@
 esd_lib = @esd_lib@
 
-noinst_LTLIBRARIES = libaudio_disk.la
-libaudio_disk_la_SOURCES = $(SRCS)
+noinst_LIBRARIES = libaudio_disk.a
+libaudio_disk_a_SOURCES = $(SRCS)
 
 # The SDL audio driver sources
 SRCS = SDL_diskaudio.c		SDL_diskaudio.h
@@ -124,7 +124,7 @@
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
+LIBRARIES =  $(noinst_LIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) 
@@ -135,9 +135,9 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libaudio_disk_la_LDFLAGS = 
-libaudio_disk_la_LIBADD = 
-libaudio_disk_la_OBJECTS =  SDL_diskaudio.lo
+libaudio_disk_a_LDFLAGS = 
+libaudio_disk_a_LIBADD = 
+libaudio_disk_a_OBJECTS =  SDL_diskaudio.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -150,8 +150,8 @@
 
 TAR = gtar
 GZIP_ENV = --best
-SOURCES = $(libaudio_disk_la_SOURCES)
-OBJECTS = $(libaudio_disk_la_OBJECTS)
+SOURCES = $(libaudio_disk_a_SOURCES)
+OBJECTS = $(libaudio_disk_a_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -164,14 +164,14 @@
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-mostlyclean-noinstLTLIBRARIES:
+mostlyclean-noinstLIBRARIES:
 
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 
-distclean-noinstLTLIBRARIES:
+distclean-noinstLIBRARIES:
 
-maintainer-clean-noinstLTLIBRARIES:
+maintainer-clean-noinstLIBRARIES:
 
 .c.o:
 	$(COMPILE) -c $<
@@ -211,8 +211,8 @@
 
 maintainer-clean-libtool:
 
-libaudio_disk.la: $(libaudio_disk_la_OBJECTS) $(libaudio_disk_la_DEPENDENCIES)
-	$(LINK)  $(libaudio_disk_la_LDFLAGS) $(libaudio_disk_la_OBJECTS) $(libaudio_disk_la_LIBADD) $(LIBS)
+libaudio_disk.a: $(libaudio_disk_a_OBJECTS) $(libaudio_disk_a_DEPENDENCIES)
+	$(LINK)  $(libaudio_disk_a_LDFLAGS) $(libaudio_disk_a_OBJECTS) $(libaudio_disk_a_LIBADD) $(LIBS)
 
 tags: TAGS
 
@@ -277,7 +277,7 @@
 install: install-am
 uninstall-am:
 uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LIBRARIES)
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -293,18 +293,18 @@
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
+mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
 		mostlyclean-libtool mostlyclean-tags \
 		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
+clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
 		clean-tags clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
+distclean-am:  distclean-noinstLIBRARIES distclean-compile \
 		distclean-libtool distclean-tags distclean-generic \
 		clean-am
 	-rm -f libtool
@@ -311,7 +311,7 @@
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
+maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-libtool \
 		maintainer-clean-tags maintainer-clean-generic \
 		distclean-am
@@ -320,8 +320,8 @@
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
-clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--- ./src/audio/Makefile.am	Sat Oct  5 12:50:56 2002
+++ ../SDL-1.2.5/./src/audio/Makefile.am	Mon Mar  3 17:43:24 2003
@@ -25,5 +25,5 @@
 	SDL_wave.h
 
 libaudio_la_SOURCES = $(COMMON_SRCS)
-libaudio_la_LIBADD = $(DRIVERS)
+libaudio_la_LIBADD = $(foreach lib,$(DRIVERS),$(addprefix $(dir $(lib)),$(subst .o,.lo,$(shell ar t $(lib)))))
 libaudio_la_DEPENDENCIES = $(DRIVERS)
--- ./src/audio/Makefile.in	Sun Oct  6 16:34:55 2002
+++ ../SDL-1.2.5/./src/audio/Makefile.in	Mon Mar  3 17:43:24 2003
@@ -130,7 +130,7 @@
 
 
 libaudio_la_SOURCES = $(COMMON_SRCS)
-libaudio_la_LIBADD = $(DRIVERS)
+libaudio_la_LIBADD = $(foreach lib,$(DRIVERS),$(addprefix $(dir $(lib)),$(subst .o,.lo,$(shell ar t $(lib)))))
 libaudio_la_DEPENDENCIES = $(DRIVERS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
--- ./src/audio/dmedia/SDL_irixaudio.c	Wed Mar  6 06:23:02 2002
+++ ../SDL-1.2.5/./src/audio/dmedia/SDL_irixaudio.c	Mon Mar  3 17:39:55 2003
@@ -129,7 +129,7 @@
 		mixbuf = NULL;
 	}
 	if ( audio_port != NULL ) {
-		ALcloseport(audio_port);
+		alClosePort(audio_port);
 		audio_port = NULL;
 	}
 }
@@ -180,7 +180,7 @@
 	     (alSetWidth(audio_config, width) >= 0) &&
 	     (alSetQueueSize(audio_config, spec->samples*2) >= 0) &&
 	     (alSetChannels(audio_config, spec->channels) >= 0) ) {
-		audio_port = ALopenport("SDL audio", "w", audio_config);
+		audio_port = alOpenPort("SDL audio", "w", audio_config);
 	}
 	alFreeConfig(audio_config);
 	if( audio_port == NULL ) {
--- ./src/audio/dmedia/Makefile.am	Thu Apr 26 12:45:44 2001
+++ ../SDL-1.2.5/./src/audio/dmedia/Makefile.am	Mon Mar  3 17:43:24 2003
@@ -1,8 +1,8 @@
 
 ## Makefile.am for SDL using the IRIX DMedia sound driver
 
-noinst_LTLIBRARIES = libaudio_dmedia.la
-libaudio_dmedia_la_SOURCES = $(SRCS)
+noinst_LIBRARIES = libaudio_dmedia.a
+libaudio_dmedia_a_SOURCES = $(SRCS)
 
 # The SDL audio driver sources
 SRCS =	SDL_irixaudio.c	\
--- ./src/audio/dmedia/Makefile.in	Sun Oct  6 16:34:55 2002
+++ ../SDL-1.2.5/./src/audio/dmedia/Makefile.in	Mon Mar  3 17:43:24 2003
@@ -116,8 +116,8 @@
 arts_lib = @arts_lib@
 esd_lib = @esd_lib@
 
-noinst_LTLIBRARIES = libaudio_dmedia.la
-libaudio_dmedia_la_SOURCES = $(SRCS)
+noinst_LIBRARIES = libaudio_dmedia.a
+libaudio_dmedia_a_SOURCES = $(SRCS)
 
 # The SDL audio driver sources
 SRCS = SDL_irixaudio.c		SDL_irixaudio.h
@@ -124,7 +124,7 @@
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
+LIBRARIES =  $(noinst_LIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) 
@@ -135,9 +135,9 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libaudio_dmedia_la_LDFLAGS = 
-libaudio_dmedia_la_LIBADD = 
-libaudio_dmedia_la_OBJECTS =  SDL_irixaudio.lo
+libaudio_dmedia_a_LDFLAGS = 
+libaudio_dmedia_a_LIBADD = 
+libaudio_dmedia_a_OBJECTS =  SDL_irixaudio.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -150,8 +150,8 @@
 
 TAR = gtar
 GZIP_ENV = --best
-SOURCES = $(libaudio_dmedia_la_SOURCES)
-OBJECTS = $(libaudio_dmedia_la_OBJECTS)
+SOURCES = $(libaudio_dmedia_a_SOURCES)
+OBJECTS = $(libaudio_dmedia_a_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -164,14 +164,14 @@
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-mostlyclean-noinstLTLIBRARIES:
+mostlyclean-noinstLIBRARIES:
 
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 
-distclean-noinstLTLIBRARIES:
+distclean-noinstLIBRARIES:
 
-maintainer-clean-noinstLTLIBRARIES:
+maintainer-clean-noinstLIBRARIES:
 
 .c.o:
 	$(COMPILE) -c $<
@@ -211,8 +211,8 @@
 
 maintainer-clean-libtool:
 
-libaudio_dmedia.la: $(libaudio_dmedia_la_OBJECTS) $(libaudio_dmedia_la_DEPENDENCIES)
-	$(LINK)  $(libaudio_dmedia_la_LDFLAGS) $(libaudio_dmedia_la_OBJECTS) $(libaudio_dmedia_la_LIBADD) $(LIBS)
+libaudio_dmedia.a: $(libaudio_dmedia_a_OBJECTS) $(libaudio_dmedia_a_DEPENDENCIES)
+	$(LINK)  $(libaudio_dmedia_a_LDFLAGS) $(libaudio_dmedia_a_OBJECTS) $(libaudio_dmedia_a_LIBADD) $(LIBS)
 
 tags: TAGS
 
@@ -277,7 +277,7 @@
 install: install-am
 uninstall-am:
 uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LIBRARIES)
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -293,18 +293,18 @@
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
+mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
 		mostlyclean-libtool mostlyclean-tags \
 		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
+clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
 		clean-tags clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
+distclean-am:  distclean-noinstLIBRARIES distclean-compile \
 		distclean-libtool distclean-tags distclean-generic \
 		clean-am
 	-rm -f libtool
@@ -311,7 +311,7 @@
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
+maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-libtool \
 		maintainer-clean-tags maintainer-clean-generic \
 		distclean-am
@@ -320,8 +320,8 @@
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
-clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--- ./src/Makefile.am	Wed Mar  6 06:05:47 2002
+++ ../SDL-1.2.5/./src/Makefile.am	Mon Mar  3 17:43:24 2003
@@ -23,8 +23,7 @@
         -release $(LT_RELEASE)	\
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 libSDL_la_LIBADD =		\
-	main/libarch.la		\
-	@SDL_EXTRALIBS@		\
+	$(shell find */ -name \*.lo -print) \
 	@SYSTEM_LIBS@
 libSDL_la_DEPENDENCIES =	\
 	main/libarch.la		\
--- ./src/Makefile.in	Sun Oct  6 16:34:55 2002
+++ ../SDL-1.2.5/./src/Makefile.in	Mon Mar  3 17:43:24 2003
@@ -137,7 +137,7 @@
 libSDL_la_SOURCES = $(GENERAL_SRCS)
 libSDL_la_LDFLAGS =          -release $(LT_RELEASE)		-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
-libSDL_la_LIBADD =  	main/libarch.la			@SDL_EXTRALIBS@			@SYSTEM_LIBS@
+libSDL_la_LIBADD =  	$(shell find */ -name \*.lo -print)			@SYSTEM_LIBS@
 
 libSDL_la_DEPENDENCIES =  	main/libarch.la			@SDL_EXTRALIBS@
 
--- ./src/cdrom/Makefile.am	Sat Oct  5 12:50:56 2002
+++ ../SDL-1.2.5/./src/cdrom/Makefile.am	Mon Mar  3 17:43:24 2003
@@ -15,5 +15,5 @@
 	SDL_syscdrom.h
 
 libcdrom_la_SOURCES = $(COMMON_SRCS)
-libcdrom_la_LIBADD = $(DRIVERS)
+libcdrom_la_LIBADD = $(foreach lib,$(DRIVERS),$(addprefix $(dir $(lib)),$(subst .o,.lo,$(shell ar t $(lib)))))
 libcdrom_la_DEPENDENCIES = $(DRIVERS)
--- ./src/cdrom/Makefile.in	Sun Oct  6 16:35:00 2002
+++ ../SDL-1.2.5/./src/cdrom/Makefile.in	Mon Mar  3 17:43:25 2003
@@ -129,7 +129,7 @@
 
 
 libcdrom_la_SOURCES = $(COMMON_SRCS)
-libcdrom_la_LIBADD = $(DRIVERS)
+libcdrom_la_LIBADD = $(foreach lib,$(DRIVERS),$(addprefix $(dir $(lib)),$(subst .o,.lo,$(shell ar t $(lib)))))
 libcdrom_la_DEPENDENCIES = $(DRIVERS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
--- ./src/cdrom/dummy/Makefile.am	Sat Aug 18 18:03:11 2001
+++ ../SDL-1.2.5/./src/cdrom/dummy/Makefile.am	Mon Mar  3 17:43:25 2003
@@ -1,8 +1,8 @@
 
 ## Makefile.am for the dummy cdrom driver for SDL
 
-noinst_LTLIBRARIES = libcdrom_dummy.la
-libcdrom_dummy_la_SOURCES = $(SRCS)
+noinst_LIBRARIES = libcdrom_dummy.a
+libcdrom_dummy_a_SOURCES = $(SRCS)
 
 # The SDL cdrom driver sources
 SRCS =  SDL_syscdrom.c
--- ./src/cdrom/dummy/Makefile.in	Sun Oct  6 16:35:00 2002
+++ ../SDL-1.2.5/./src/cdrom/dummy/Makefile.in	Mon Mar  3 17:43:25 2003
@@ -116,14 +116,14 @@
 arts_lib = @arts_lib@
 esd_lib = @esd_lib@
 
-noinst_LTLIBRARIES = libcdrom_dummy.la
-libcdrom_dummy_la_SOURCES = $(SRCS)
+noinst_LIBRARIES = libcdrom_dummy.a
+libcdrom_dummy_a_SOURCES = $(SRCS)
 
 # The SDL cdrom driver sources
 SRCS = SDL_syscdrom.c
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
+LIBRARIES =  $(noinst_LIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) 
@@ -134,9 +134,9 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libcdrom_dummy_la_LDFLAGS = 
-libcdrom_dummy_la_LIBADD = 
-libcdrom_dummy_la_OBJECTS =  SDL_syscdrom.lo
+libcdrom_dummy_a_LDFLAGS = 
+libcdrom_dummy_a_LIBADD = 
+libcdrom_dummy_a_OBJECTS =  SDL_syscdrom.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -149,8 +149,8 @@
 
 TAR = gtar
 GZIP_ENV = --best
-SOURCES = $(libcdrom_dummy_la_SOURCES)
-OBJECTS = $(libcdrom_dummy_la_OBJECTS)
+SOURCES = $(libcdrom_dummy_a_SOURCES)
+OBJECTS = $(libcdrom_dummy_a_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -163,14 +163,14 @@
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-mostlyclean-noinstLTLIBRARIES:
+mostlyclean-noinstLIBRARIES:
 
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 
-distclean-noinstLTLIBRARIES:
+distclean-noinstLIBRARIES:
 
-maintainer-clean-noinstLTLIBRARIES:
+maintainer-clean-noinstLIBRARIES:
 
 .c.o:
 	$(COMPILE) -c $<
@@ -210,8 +210,8 @@
 
 maintainer-clean-libtool:
 
-libcdrom_dummy.la: $(libcdrom_dummy_la_OBJECTS) $(libcdrom_dummy_la_DEPENDENCIES)
-	$(LINK)  $(libcdrom_dummy_la_LDFLAGS) $(libcdrom_dummy_la_OBJECTS) $(libcdrom_dummy_la_LIBADD) $(LIBS)
+libcdrom_dummy.a: $(libcdrom_dummy_a_OBJECTS) $(libcdrom_dummy_a_DEPENDENCIES)
+	$(LINK)  $(libcdrom_dummy_a_LDFLAGS) $(libcdrom_dummy_a_OBJECTS) $(libcdrom_dummy_a_LIBADD) $(LIBS)
 
 tags: TAGS
 
@@ -276,7 +276,7 @@
 install: install-am
 uninstall-am:
 uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LIBRARIES)
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -292,18 +292,18 @@
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
+mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
 		mostlyclean-libtool mostlyclean-tags \
 		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
+clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
 		clean-tags clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
+distclean-am:  distclean-noinstLIBRARIES distclean-compile \
 		distclean-libtool distclean-tags distclean-generic \
 		clean-am
 	-rm -f libtool
@@ -310,7 +310,7 @@
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
+maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-libtool \
 		maintainer-clean-tags maintainer-clean-generic \
 		distclean-am
@@ -319,8 +319,8 @@
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
-clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--- ./src/joystick/Makefile.am	Sat Oct  5 12:50:56 2002
+++ ../SDL-1.2.5/./src/joystick/Makefile.am	Mon Mar  3 17:43:25 2003
@@ -16,5 +16,5 @@
 	SDL_sysjoystick.h
 
 libjoystick_la_SOURCES = $(COMMON_SRCS)
-libjoystick_la_LIBADD = $(DRIVERS)
+libjoystick_la_LIBADD = $(foreach lib,$(DRIVERS),$(addprefix $(dir $(lib)),$(subst .o,.lo,$(shell ar t $(lib)))))
 libjoystick_la_DEPENDENCIES = $(DRIVERS)
--- ./src/joystick/Makefile.in	Sun Oct  6 16:34:59 2002
+++ ../SDL-1.2.5/./src/joystick/Makefile.in	Mon Mar  3 17:43:25 2003
@@ -129,7 +129,7 @@
 
 
 libjoystick_la_SOURCES = $(COMMON_SRCS)
-libjoystick_la_LIBADD = $(DRIVERS)
+libjoystick_la_LIBADD = $(foreach lib,$(DRIVERS),$(addprefix $(dir $(lib)),$(subst .o,.lo,$(shell ar t $(lib)))))
 libjoystick_la_DEPENDENCIES = $(DRIVERS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
--- ./src/joystick/dummy/Makefile.am	Thu Apr 26 12:45:45 2001
+++ ../SDL-1.2.5/./src/joystick/dummy/Makefile.am	Mon Mar  3 17:43:25 2003
@@ -1,8 +1,8 @@
 
 ## Makefile.am for the dummy joystick driver for SDL
 
-noinst_LTLIBRARIES = libjoystick_dummy.la
-libjoystick_dummy_la_SOURCES = $(SRCS)
+noinst_LIBRARIES = libjoystick_dummy.a
+libjoystick_dummy_a_SOURCES = $(SRCS)
 
 # The SDL joystick driver sources
 SRCS =  SDL_sysjoystick.c
--- ./src/joystick/dummy/Makefile.in	Sun Oct  6 16:35:00 2002
+++ ../SDL-1.2.5/./src/joystick/dummy/Makefile.in	Mon Mar  3 17:43:25 2003
@@ -116,14 +116,14 @@
 arts_lib = @arts_lib@
 esd_lib = @esd_lib@
 
-noinst_LTLIBRARIES = libjoystick_dummy.la
-libjoystick_dummy_la_SOURCES = $(SRCS)
+noinst_LIBRARIES = libjoystick_dummy.a
+libjoystick_dummy_a_SOURCES = $(SRCS)
 
 # The SDL joystick driver sources
 SRCS = SDL_sysjoystick.c
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
+LIBRARIES =  $(noinst_LIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) 
@@ -134,9 +134,9 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libjoystick_dummy_la_LDFLAGS = 
-libjoystick_dummy_la_LIBADD = 
-libjoystick_dummy_la_OBJECTS =  SDL_sysjoystick.lo
+libjoystick_dummy_a_LDFLAGS = 
+libjoystick_dummy_a_LIBADD = 
+libjoystick_dummy_a_OBJECTS =  SDL_sysjoystick.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -149,8 +149,8 @@
 
 TAR = gtar
 GZIP_ENV = --best
-SOURCES = $(libjoystick_dummy_la_SOURCES)
-OBJECTS = $(libjoystick_dummy_la_OBJECTS)
+SOURCES = $(libjoystick_dummy_a_SOURCES)
+OBJECTS = $(libjoystick_dummy_a_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -163,14 +163,14 @@
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-mostlyclean-noinstLTLIBRARIES:
+mostlyclean-noinstLIBRARIES:
 
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 
-distclean-noinstLTLIBRARIES:
+distclean-noinstLIBRARIES:
 
-maintainer-clean-noinstLTLIBRARIES:
+maintainer-clean-noinstLIBRARIES:
 
 .c.o:
 	$(COMPILE) -c $<
@@ -210,8 +210,8 @@
 
 maintainer-clean-libtool:
 
-libjoystick_dummy.la: $(libjoystick_dummy_la_OBJECTS) $(libjoystick_dummy_la_DEPENDENCIES)
-	$(LINK)  $(libjoystick_dummy_la_LDFLAGS) $(libjoystick_dummy_la_OBJECTS) $(libjoystick_dummy_la_LIBADD) $(LIBS)
+libjoystick_dummy.a: $(libjoystick_dummy_a_OBJECTS) $(libjoystick_dummy_a_DEPENDENCIES)
+	$(LINK)  $(libjoystick_dummy_a_LDFLAGS) $(libjoystick_dummy_a_OBJECTS) $(libjoystick_dummy_a_LIBADD) $(LIBS)
 
 tags: TAGS
 
@@ -276,7 +276,7 @@
 install: install-am
 uninstall-am:
 uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LIBRARIES)
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -292,18 +292,18 @@
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
+mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
 		mostlyclean-libtool mostlyclean-tags \
 		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
+clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
 		clean-tags clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
+distclean-am:  distclean-noinstLIBRARIES distclean-compile \
 		distclean-libtool distclean-tags distclean-generic \
 		clean-am
 	-rm -f libtool
@@ -310,7 +310,7 @@
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
+maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-libtool \
 		maintainer-clean-tags maintainer-clean-generic \
 		distclean-am
@@ -319,8 +319,8 @@
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
-clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--- ./src/video/x11/Makefile.am	Thu Apr 26 12:45:46 2001
+++ ../SDL-1.2.5/./src/video/x11/Makefile.am	Mon Mar  3 17:43:25 2003
@@ -1,8 +1,8 @@
 
 ## Makefile.am for SDL using the X11 video driver
 
-noinst_LTLIBRARIES = libvideo_x11.la
-libvideo_x11_la_SOURCES = $(X11_SRCS)
+noinst_LIBRARIES = libvideo_x11.a
+libvideo_x11_a_SOURCES = $(X11_SRCS)
 
 # The SDL X11 video driver sources
 X11_SRCS = 			\
--- ./src/video/x11/Makefile.in	Sun Oct  6 16:34:57 2002
+++ ../SDL-1.2.5/./src/video/x11/Makefile.in	Mon Mar  3 17:43:25 2003
@@ -116,8 +116,8 @@
 arts_lib = @arts_lib@
 esd_lib = @esd_lib@
 
-noinst_LTLIBRARIES = libvideo_x11.la
-libvideo_x11_la_SOURCES = $(X11_SRCS)
+noinst_LIBRARIES = libvideo_x11.a
+libvideo_x11_a_SOURCES = $(X11_SRCS)
 
 # The SDL X11 video driver sources
 X11_SRCS =  	SDL_x11dga.c			SDL_x11dga_c.h			SDL_x11events.c			SDL_x11events_c.h		SDL_x11gamma.c			SDL_x11gamma_c.h		SDL_x11gl.c			SDL_x11gl_c.h			SDL_x11image.c			SDL_x11image_c.h		SDL_x11modes.c			SDL_x11modes_c.h		SDL_x11mouse.c			SDL_x11mouse_c.h		SDL_x11video.c			SDL_x11video.h			SDL_x11wm.c			SDL_x11wm_c.h			SDL_x11yuv.c			SDL_x11yuv_c.h
@@ -124,7 +124,7 @@
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
+LIBRARIES =  $(noinst_LIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) 
@@ -135,9 +135,9 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libvideo_x11_la_LDFLAGS = 
-libvideo_x11_la_LIBADD = 
-libvideo_x11_la_OBJECTS =  SDL_x11dga.lo SDL_x11events.lo \
+libvideo_x11_a_LDFLAGS = 
+libvideo_x11_a_LIBADD = 
+libvideo_x11_a_OBJECTS =  SDL_x11dga.lo SDL_x11events.lo \
 SDL_x11gamma.lo SDL_x11gl.lo SDL_x11image.lo SDL_x11modes.lo \
 SDL_x11mouse.lo SDL_x11video.lo SDL_x11wm.lo SDL_x11yuv.lo
 CFLAGS = @CFLAGS@
@@ -152,8 +152,8 @@
 
 TAR = gtar
 GZIP_ENV = --best
-SOURCES = $(libvideo_x11_la_SOURCES)
-OBJECTS = $(libvideo_x11_la_OBJECTS)
+SOURCES = $(libvideo_x11_a_SOURCES)
+OBJECTS = $(libvideo_x11_a_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -166,14 +166,14 @@
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-mostlyclean-noinstLTLIBRARIES:
+mostlyclean-noinstLIBRARIES:
 
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 
-distclean-noinstLTLIBRARIES:
+distclean-noinstLIBRARIES:
 
-maintainer-clean-noinstLTLIBRARIES:
+maintainer-clean-noinstLIBRARIES:
 
 .c.o:
 	$(COMPILE) -c $<
@@ -213,8 +213,8 @@
 
 maintainer-clean-libtool:
 
-libvideo_x11.la: $(libvideo_x11_la_OBJECTS) $(libvideo_x11_la_DEPENDENCIES)
-	$(LINK)  $(libvideo_x11_la_LDFLAGS) $(libvideo_x11_la_OBJECTS) $(libvideo_x11_la_LIBADD) $(LIBS)
+libvideo_x11.a: $(libvideo_x11_a_OBJECTS) $(libvideo_x11_a_DEPENDENCIES)
+	$(LINK)  $(libvideo_x11_a_LDFLAGS) $(libvideo_x11_a_OBJECTS) $(libvideo_x11_a_LIBADD) $(LIBS)
 
 tags: TAGS
 
@@ -279,7 +279,7 @@
 install: install-am
 uninstall-am:
 uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LIBRARIES)
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -295,18 +295,18 @@
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
+mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
 		mostlyclean-libtool mostlyclean-tags \
 		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
+clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
 		clean-tags clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
+distclean-am:  distclean-noinstLIBRARIES distclean-compile \
 		distclean-libtool distclean-tags distclean-generic \
 		clean-am
 	-rm -f libtool
@@ -313,7 +313,7 @@
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
+maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-libtool \
 		maintainer-clean-tags maintainer-clean-generic \
 		distclean-am
@@ -322,8 +322,8 @@
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
-clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--- ./src/video/x11/SDL_x11image.c	Wed Mar  6 06:23:08 2002
+++ ../SDL-1.2.5/./src/video/x11/SDL_x11image.c	Mon Mar  3 17:39:55 2003
@@ -167,6 +167,8 @@
                }
                fclose(pstat);
            }
+#elif defined(__sgi)
+	   num_cpus = sysconf(_SC_NPROC_ONLN);
 #elif defined(_SC_NPROCESSORS_ONLN)
 	   /* number of processors online (SVR4.0MP compliant machines) */
            num_cpus = sysconf(_SC_NPROCESSORS_ONLN);
--- ./src/video/aalib/Makefile.in	Sun Oct  6 16:34:58 2002
+++ ../SDL-1.2.5/./src/video/aalib/Makefile.in	Tue Mar  4 15:50:39 2003
@@ -116,8 +116,8 @@
 arts_lib = @arts_lib@
 esd_lib = @esd_lib@
 
-noinst_LTLIBRARIES = libvideo_aa.la
-libvideo_aa_la_SOURCES = $(AA_SRCS)
+noinst_LIBRARIES = libvideo_aa.a
+libvideo_aa_a_SOURCES = $(AA_SRCS)
 
 # The SDL AAlib video driver sources
 AA_SRCS =  	SDL_aavideo.h			SDL_aaevents.c		SDL_aaevents_c.h		SDL_aamouse.c			SDL_aamouse_c.h		SDL_aavideo.c
@@ -124,7 +124,7 @@
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
+LIBRARIES =  $(noinst_LIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) 
@@ -135,9 +135,9 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libvideo_aa_la_LDFLAGS = 
-libvideo_aa_la_LIBADD = 
-libvideo_aa_la_OBJECTS =  SDL_aaevents.lo SDL_aamouse.lo SDL_aavideo.lo
+libvideo_aa_a_LDFLAGS = 
+libvideo_aa_a_LIBADD = 
+libvideo_aa_a_OBJECTS =  SDL_aaevents.lo SDL_aamouse.lo SDL_aavideo.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -150,8 +150,8 @@
 
 TAR = gtar
 GZIP_ENV = --best
-SOURCES = $(libvideo_aa_la_SOURCES)
-OBJECTS = $(libvideo_aa_la_OBJECTS)
+SOURCES = $(libvideo_aa_a_SOURCES)
+OBJECTS = $(libvideo_aa_a_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -164,14 +164,14 @@
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-mostlyclean-noinstLTLIBRARIES:
+mostlyclean-noinstLIBRARIES:
 
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 
-distclean-noinstLTLIBRARIES:
+distclean-noinstLIBRARIES:
 
-maintainer-clean-noinstLTLIBRARIES:
+maintainer-clean-noinstLIBRARIES:
 
 .c.o:
 	$(COMPILE) -c $<
@@ -211,8 +211,8 @@
 
 maintainer-clean-libtool:
 
-libvideo_aa.la: $(libvideo_aa_la_OBJECTS) $(libvideo_aa_la_DEPENDENCIES)
-	$(LINK)  $(libvideo_aa_la_LDFLAGS) $(libvideo_aa_la_OBJECTS) $(libvideo_aa_la_LIBADD) $(LIBS)
+libvideo_aa.a: $(libvideo_aa_a_OBJECTS) $(libvideo_aa_a_DEPENDENCIES)
+	$(LINK)  $(libvideo_aa_a_LDFLAGS) $(libvideo_aa_a_OBJECTS) $(libvideo_aa_a_LIBADD) $(LIBS)
 
 tags: TAGS
 
@@ -277,7 +277,7 @@
 install: install-am
 uninstall-am:
 uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LIBRARIES)
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -293,18 +293,18 @@
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
+mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
 		mostlyclean-libtool mostlyclean-tags \
 		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
+clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
 		clean-tags clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
+distclean-am:  distclean-noinstLIBRARIES distclean-compile \
 		distclean-libtool distclean-tags distclean-generic \
 		clean-am
 	-rm -f libtool
@@ -311,7 +311,7 @@
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
+maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-libtool \
 		maintainer-clean-tags maintainer-clean-generic \
 		distclean-am
@@ -320,8 +320,8 @@
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
-clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--- ./src/video/Makefile.am	Sun Oct  6 14:47:20 2002
+++ ../SDL-1.2.5/./src/video/Makefile.am	Mon Mar  3 17:43:25 2003
@@ -46,5 +46,5 @@
 	default_cursor.h
 
 libvideo_la_SOURCES = $(COMMON_SRCS)
-libvideo_la_LIBADD = $(DRIVERS)
+libvideo_la_LIBADD = $(foreach lib,$(DRIVERS),$(addprefix $(dir $(lib)),$(subst .o,.lo,$(shell ar t $(lib)))))
 libvideo_la_DEPENDENCIES = $(DRIVERS)
--- ./src/video/Makefile.in	Sun Oct  6 16:34:56 2002
+++ ../SDL-1.2.5/./src/video/Makefile.in	Mon Mar  3 17:43:25 2003
@@ -130,7 +130,7 @@
 
 
 libvideo_la_SOURCES = $(COMMON_SRCS)
-libvideo_la_LIBADD = $(DRIVERS)
+libvideo_la_LIBADD = $(foreach lib,$(DRIVERS),$(addprefix $(dir $(lib)),$(subst .o,.lo,$(shell ar t $(lib)))))
 libvideo_la_DEPENDENCIES = $(DRIVERS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
--- ./src/video/XFree86/Xv/Makefile.in	Sun Oct  6 16:34:57 2002
+++ ../SDL-1.2.5/./src/video/XFree86/Xv/Makefile.in	Tue Mar  4 13:52:28 2003
@@ -116,11 +116,11 @@
 arts_lib = @arts_lib@
 esd_lib = @esd_lib@
 
-noinst_LTLIBRARIES = libXFree86_Xv.la
-libXFree86_Xv_la_SOURCES = Xv.c Xvlibint.h
+noinst_LIBRARIES = libXFree86_Xv.a
+libXFree86_Xv_a_SOURCES = Xv.c Xvlibint.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
+LIBRARIES =  $(noinst_LIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) 
@@ -131,9 +131,9 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libXFree86_Xv_la_LDFLAGS = 
-libXFree86_Xv_la_LIBADD = 
-libXFree86_Xv_la_OBJECTS =  Xv.lo
+libXFree86_Xv_a_LDFLAGS = 
+libXFree86_Xv_a_LIBADD = 
+libXFree86_Xv_a_OBJECTS =  Xv.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -146,8 +146,8 @@
 
 TAR = gtar
 GZIP_ENV = --best
-SOURCES = $(libXFree86_Xv_la_SOURCES)
-OBJECTS = $(libXFree86_Xv_la_OBJECTS)
+SOURCES = $(libXFree86_Xv_a_SOURCES)
+OBJECTS = $(libXFree86_Xv_a_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -160,14 +160,14 @@
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-mostlyclean-noinstLTLIBRARIES:
+mostlyclean-noinstLIBRARIES:
 
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 
-distclean-noinstLTLIBRARIES:
+distclean-noinstLIBRARIES:
 
-maintainer-clean-noinstLTLIBRARIES:
+maintainer-clean-noinstLIBRARIES:
 
 .c.o:
 	$(COMPILE) -c $<
@@ -207,8 +207,8 @@
 
 maintainer-clean-libtool:
 
-libXFree86_Xv.la: $(libXFree86_Xv_la_OBJECTS) $(libXFree86_Xv_la_DEPENDENCIES)
-	$(LINK)  $(libXFree86_Xv_la_LDFLAGS) $(libXFree86_Xv_la_OBJECTS) $(libXFree86_Xv_la_LIBADD) $(LIBS)
+libXFree86_Xv.a: $(libXFree86_Xv_a_OBJECTS) $(libXFree86_Xv_a_DEPENDENCIES)
+	$(LINK)  $(libXFree86_Xv_a_LDFLAGS) $(libXFree86_Xv_a_OBJECTS) $(libXFree86_Xv_a_LIBADD) $(LIBS)
 
 tags: TAGS
 
@@ -273,7 +273,7 @@
 install: install-am
 uninstall-am:
 uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LIBRARIES)
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -289,18 +289,18 @@
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
+mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
 		mostlyclean-libtool mostlyclean-tags \
 		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
+clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
 		clean-tags clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
+distclean-am:  distclean-noinstLIBRARIES distclean-compile \
 		distclean-libtool distclean-tags distclean-generic \
 		clean-am
 	-rm -f libtool
@@ -307,7 +307,7 @@
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
+maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-libtool \
 		maintainer-clean-tags maintainer-clean-generic \
 		distclean-am
@@ -316,8 +316,8 @@
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
-clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--- ./src/video/XFree86/Xinerama/Makefile.in	Sun Oct  6 16:34:57 2002
+++ ../SDL-1.2.5/./src/video/XFree86/Xinerama/Makefile.in	Tue Mar  4 13:50:35 2003
@@ -116,11 +116,11 @@
 arts_lib = @arts_lib@
 esd_lib = @esd_lib@
 
-noinst_LTLIBRARIES = libXFree86_Xinerama.la
-libXFree86_Xinerama_la_SOURCES = Xinerama.c
+noinst_LIBRARIES = libXFree86_Xinerama.a
+libXFree86_Xinerama_a_SOURCES = Xinerama.c
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
+LIBRARIES =  $(noinst_LIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) 
@@ -131,9 +131,9 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libXFree86_Xinerama_la_LDFLAGS = 
-libXFree86_Xinerama_la_LIBADD = 
-libXFree86_Xinerama_la_OBJECTS =  Xinerama.lo
+libXFree86_Xinerama_a_LDFLAGS = 
+libXFree86_Xinerama_a_LIBADD = 
+libXFree86_Xinerama_a_OBJECTS =  Xinerama.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -146,8 +146,8 @@
 
 TAR = gtar
 GZIP_ENV = --best
-SOURCES = $(libXFree86_Xinerama_la_SOURCES)
-OBJECTS = $(libXFree86_Xinerama_la_OBJECTS)
+SOURCES = $(libXFree86_Xinerama_a_SOURCES)
+OBJECTS = $(libXFree86_Xinerama_a_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -160,14 +160,14 @@
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-mostlyclean-noinstLTLIBRARIES:
+mostlyclean-noinstLIBRARIES:
 
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 
-distclean-noinstLTLIBRARIES:
+distclean-noinstLIBRARIES:
 
-maintainer-clean-noinstLTLIBRARIES:
+maintainer-clean-noinstLIBRARIES:
 
 .c.o:
 	$(COMPILE) -c $<
@@ -207,8 +207,8 @@
 
 maintainer-clean-libtool:
 
-libXFree86_Xinerama.la: $(libXFree86_Xinerama_la_OBJECTS) $(libXFree86_Xinerama_la_DEPENDENCIES)
-	$(LINK)  $(libXFree86_Xinerama_la_LDFLAGS) $(libXFree86_Xinerama_la_OBJECTS) $(libXFree86_Xinerama_la_LIBADD) $(LIBS)
+libXFree86_Xinerama.a: $(libXFree86_Xinerama_a_OBJECTS) $(libXFree86_Xinerama_a_DEPENDENCIES)
+	$(LINK)  $(libXFree86_Xinerama_a_LDFLAGS) $(libXFree86_Xinerama_a_OBJECTS) $(libXFree86_Xinerama_a_LIBADD) $(LIBS)
 
 tags: TAGS
 
@@ -273,7 +273,7 @@
 install: install-am
 uninstall-am:
 uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LIBRARIES)
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -289,18 +289,18 @@
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
+mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
 		mostlyclean-libtool mostlyclean-tags \
 		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
+clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
 		clean-tags clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
+distclean-am:  distclean-noinstLIBRARIES distclean-compile \
 		distclean-libtool distclean-tags distclean-generic \
 		clean-am
 	-rm -f libtool
@@ -307,7 +307,7 @@
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
+maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-libtool \
 		maintainer-clean-tags maintainer-clean-generic \
 		distclean-am
@@ -316,8 +316,8 @@
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
-clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--- ./src/video/XFree86/Xxf86vm/Makefile.in	Sun Oct  6 16:34:57 2002
+++ ../SDL-1.2.5/./src/video/XFree86/Xxf86vm/Makefile.in	Tue Mar  4 13:51:44 2003
@@ -116,11 +116,11 @@
 arts_lib = @arts_lib@
 esd_lib = @esd_lib@
 
-noinst_LTLIBRARIES = libXFree86_Xxf86vm.la
-libXFree86_Xxf86vm_la_SOURCES = XF86VMode.c
+noinst_LIBRARIES = libXFree86_Xxf86vm.a
+libXFree86_Xxf86vm_a_SOURCES = XF86VMode.c
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
+LIBRARIES =  $(noinst_LIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) 
@@ -131,9 +131,9 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libXFree86_Xxf86vm_la_LDFLAGS = 
-libXFree86_Xxf86vm_la_LIBADD = 
-libXFree86_Xxf86vm_la_OBJECTS =  XF86VMode.lo
+libXFree86_Xxf86vm_a_LDFLAGS = 
+libXFree86_Xxf86vm_a_LIBADD = 
+libXFree86_Xxf86vm_a_OBJECTS =  XF86VMode.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -146,8 +146,8 @@
 
 TAR = gtar
 GZIP_ENV = --best
-SOURCES = $(libXFree86_Xxf86vm_la_SOURCES)
-OBJECTS = $(libXFree86_Xxf86vm_la_OBJECTS)
+SOURCES = $(libXFree86_Xxf86vm_a_SOURCES)
+OBJECTS = $(libXFree86_Xxf86vm_a_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -160,14 +160,14 @@
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-mostlyclean-noinstLTLIBRARIES:
+mostlyclean-noinstLIBRARIES:
 
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 
-distclean-noinstLTLIBRARIES:
+distclean-noinstLIBRARIES:
 
-maintainer-clean-noinstLTLIBRARIES:
+maintainer-clean-noinstLIBRARIES:
 
 .c.o:
 	$(COMPILE) -c $<
@@ -207,8 +207,8 @@
 
 maintainer-clean-libtool:
 
-libXFree86_Xxf86vm.la: $(libXFree86_Xxf86vm_la_OBJECTS) $(libXFree86_Xxf86vm_la_DEPENDENCIES)
-	$(LINK)  $(libXFree86_Xxf86vm_la_LDFLAGS) $(libXFree86_Xxf86vm_la_OBJECTS) $(libXFree86_Xxf86vm_la_LIBADD) $(LIBS)
+libXFree86_Xxf86vm.a: $(libXFree86_Xxf86vm_a_OBJECTS) $(libXFree86_Xxf86vm_a_DEPENDENCIES)
+	$(LINK)  $(libXFree86_Xxf86vm_a_LDFLAGS) $(libXFree86_Xxf86vm_a_OBJECTS) $(libXFree86_Xxf86vm_a_LIBADD) $(LIBS)
 
 tags: TAGS
 
@@ -273,7 +273,7 @@
 install: install-am
 uninstall-am:
 uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LIBRARIES)
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -289,18 +289,18 @@
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
+mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
 		mostlyclean-libtool mostlyclean-tags \
 		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
+clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
 		clean-tags clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
+distclean-am:  distclean-noinstLIBRARIES distclean-compile \
 		distclean-libtool distclean-tags distclean-generic \
 		clean-am
 	-rm -f libtool
@@ -307,7 +307,7 @@
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
+maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-libtool \
 		maintainer-clean-tags maintainer-clean-generic \
 		distclean-am
@@ -316,8 +316,8 @@
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
-clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--- ./src/video/XFree86/Xxf86dga/Makefile.in	Sun Oct  6 16:34:57 2002
+++ ../SDL-1.2.5/./src/video/XFree86/Xxf86dga/Makefile.in	Tue Mar  4 13:52:05 2003
@@ -116,11 +116,11 @@
 arts_lib = @arts_lib@
 esd_lib = @esd_lib@
 
-noinst_LTLIBRARIES = libXFree86_Xxf86dga.la
-libXFree86_Xxf86dga_la_SOURCES = XF86DGA2.c XF86DGA.c
+noinst_LIBRARIES = libXFree86_Xxf86dga.a
+libXFree86_Xxf86dga_a_SOURCES = XF86DGA2.c XF86DGA.c
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
+LIBRARIES =  $(noinst_LIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) 
@@ -131,9 +131,9 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libXFree86_Xxf86dga_la_LDFLAGS = 
-libXFree86_Xxf86dga_la_LIBADD = 
-libXFree86_Xxf86dga_la_OBJECTS =  XF86DGA2.lo XF86DGA.lo
+libXFree86_Xxf86dga_a_LDFLAGS = 
+libXFree86_Xxf86dga_a_LIBADD = 
+libXFree86_Xxf86dga_a_OBJECTS =  XF86DGA2.lo XF86DGA.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -146,8 +146,8 @@
 
 TAR = gtar
 GZIP_ENV = --best
-SOURCES = $(libXFree86_Xxf86dga_la_SOURCES)
-OBJECTS = $(libXFree86_Xxf86dga_la_OBJECTS)
+SOURCES = $(libXFree86_Xxf86dga_a_SOURCES)
+OBJECTS = $(libXFree86_Xxf86dga_a_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -160,14 +160,14 @@
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-mostlyclean-noinstLTLIBRARIES:
+mostlyclean-noinstLIBRARIES:
 
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 
-distclean-noinstLTLIBRARIES:
+distclean-noinstLIBRARIES:
 
-maintainer-clean-noinstLTLIBRARIES:
+maintainer-clean-noinstLIBRARIES:
 
 .c.o:
 	$(COMPILE) -c $<
@@ -207,8 +207,8 @@
 
 maintainer-clean-libtool:
 
-libXFree86_Xxf86dga.la: $(libXFree86_Xxf86dga_la_OBJECTS) $(libXFree86_Xxf86dga_la_DEPENDENCIES)
-	$(LINK)  $(libXFree86_Xxf86dga_la_LDFLAGS) $(libXFree86_Xxf86dga_la_OBJECTS) $(libXFree86_Xxf86dga_la_LIBADD) $(LIBS)
+libXFree86_Xxf86dga.a: $(libXFree86_Xxf86dga_a_OBJECTS) $(libXFree86_Xxf86dga_a_DEPENDENCIES)
+	$(LINK)  $(libXFree86_Xxf86dga_a_LDFLAGS) $(libXFree86_Xxf86dga_a_OBJECTS) $(libXFree86_Xxf86dga_a_LIBADD) $(LIBS)
 
 tags: TAGS
 
@@ -273,7 +273,7 @@
 install: install-am
 uninstall-am:
 uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LIBRARIES)
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -289,18 +289,18 @@
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
+mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
 		mostlyclean-libtool mostlyclean-tags \
 		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
+clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
 		clean-tags clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
+distclean-am:  distclean-noinstLIBRARIES distclean-compile \
 		distclean-libtool distclean-tags distclean-generic \
 		clean-am
 	-rm -f libtool
@@ -307,7 +307,7 @@
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
+maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-libtool \
 		maintainer-clean-tags maintainer-clean-generic \
 		distclean-am
@@ -316,8 +316,8 @@
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
-clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--- ./src/video/dummy/Makefile.am	Thu Apr 26 12:50:18 2001
+++ ../SDL-1.2.5/./src/video/dummy/Makefile.am	Mon Mar  3 17:43:25 2003
@@ -1,8 +1,8 @@
 
 ## Makefile.am for SDL using the null video driver
 
-noinst_LTLIBRARIES = libvideo_null.la
-libvideo_null_la_SOURCES = $(NULL_SRCS)
+noinst_LIBRARIES = libvideo_null.a
+libvideo_null_a_SOURCES = $(NULL_SRCS)
 
 # The SDL null video driver sources
 NULL_SRCS = 			\
--- ./src/video/dummy/Makefile.in	Sun Oct  6 16:34:58 2002
+++ ../SDL-1.2.5/./src/video/dummy/Makefile.in	Mon Mar  3 17:43:25 2003
@@ -116,8 +116,8 @@
 arts_lib = @arts_lib@
 esd_lib = @esd_lib@
 
-noinst_LTLIBRARIES = libvideo_null.la
-libvideo_null_la_SOURCES = $(NULL_SRCS)
+noinst_LIBRARIES = libvideo_null.a
+libvideo_null_a_SOURCES = $(NULL_SRCS)
 
 # The SDL null video driver sources
 NULL_SRCS =  	SDL_nullvideo.h			SDL_nullevents.c		SDL_nullevents_c.h		SDL_nullmouse.c			SDL_nullmouse_c.h		SDL_nullvideo.c
@@ -124,7 +124,7 @@
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
+LIBRARIES =  $(noinst_LIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) 
@@ -135,9 +135,9 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libvideo_null_la_LDFLAGS = 
-libvideo_null_la_LIBADD = 
-libvideo_null_la_OBJECTS =  SDL_nullevents.lo SDL_nullmouse.lo \
+libvideo_null_a_LDFLAGS = 
+libvideo_null_a_LIBADD = 
+libvideo_null_a_OBJECTS =  SDL_nullevents.lo SDL_nullmouse.lo \
 SDL_nullvideo.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -151,8 +151,8 @@
 
 TAR = gtar
 GZIP_ENV = --best
-SOURCES = $(libvideo_null_la_SOURCES)
-OBJECTS = $(libvideo_null_la_OBJECTS)
+SOURCES = $(libvideo_null_a_SOURCES)
+OBJECTS = $(libvideo_null_a_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -165,14 +165,14 @@
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-mostlyclean-noinstLTLIBRARIES:
+mostlyclean-noinstLIBRARIES:
 
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 
-distclean-noinstLTLIBRARIES:
+distclean-noinstLIBRARIES:
 
-maintainer-clean-noinstLTLIBRARIES:
+maintainer-clean-noinstLIBRARIES:
 
 .c.o:
 	$(COMPILE) -c $<
@@ -212,8 +212,8 @@
 
 maintainer-clean-libtool:
 
-libvideo_null.la: $(libvideo_null_la_OBJECTS) $(libvideo_null_la_DEPENDENCIES)
-	$(LINK)  $(libvideo_null_la_LDFLAGS) $(libvideo_null_la_OBJECTS) $(libvideo_null_la_LIBADD) $(LIBS)
+libvideo_null.a: $(libvideo_null_a_OBJECTS) $(libvideo_null_a_DEPENDENCIES)
+	$(LINK)  $(libvideo_null_a_LDFLAGS) $(libvideo_null_a_OBJECTS) $(libvideo_null_a_LIBADD) $(LIBS)
 
 tags: TAGS
 
@@ -278,7 +278,7 @@
 install: install-am
 uninstall-am:
 uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LIBRARIES)
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -294,18 +294,18 @@
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
+mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
 		mostlyclean-libtool mostlyclean-tags \
 		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
+clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
 		clean-tags clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
+distclean-am:  distclean-noinstLIBRARIES distclean-compile \
 		distclean-libtool distclean-tags distclean-generic \
 		clean-am
 	-rm -f libtool
@@ -312,7 +312,7 @@
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
+maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-libtool \
 		maintainer-clean-tags maintainer-clean-generic \
 		distclean-am
@@ -321,8 +321,8 @@
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
-clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
--- ./test/testoverlay.c	Wed Feb 13 19:47:46 2002
+++ ../SDL-1.2.5/./test/testoverlay.c	Mon Mar  3 17:39:55 2003
@@ -62,7 +62,7 @@
 	/* Convert */
 	for(y=0; y<s->h && y<o->h; y++)
 	{
-		p=s->pixels+s->pitch*y;
+		p=((Uint8 *) s->pixels)+s->pitch*y;
 		op[0]=o->pixels[0]+o->pitches[0]*y;
 		op[1]=o->pixels[1]+o->pitches[1]*(y/2);
 		op[2]=o->pixels[2]+o->pitches[2]*(y/2);
@@ -102,7 +102,7 @@
 	/* Convert */
 	for(y=0; y<s->h && y<o->h; y++)
 	{
-		p=s->pixels+s->pitch*y;
+		p=((Uint8 *) s->pixels)+s->pitch*y;
 		op[0]=o->pixels[0]+o->pitches[0]*y;
 		op[1]=o->pixels[1]+o->pitches[1]*(y/2);
 		op[2]=o->pixels[2]+o->pitches[2]*(y/2);
@@ -134,7 +134,7 @@
 
 	for(y=0; y<s->h && y<o->h; y++)
 	{
-		p=s->pixels+s->pitch*y;
+		p=((Uint8 *) s->pixels)+s->pitch*y;
 		op=o->pixels[0]+o->pitches[0]*y;
 		for(x=0; x<s->w && x<o->w; x++)
 		{
@@ -167,7 +167,7 @@
 
 	for(y=0; y<s->h && y<o->h; y++)
 	{
-		p=s->pixels+s->pitch*y;
+		p=((Uint8 *) s->pixels)+s->pitch*y;
 		op=o->pixels[0]+o->pitches[0]*y;
 		for(x=0; x<s->w && x<o->w; x++)
 		{
@@ -203,7 +203,7 @@
 
 	for(y=0; y<s->h && y<o->h; y++)
 	{
-		p=s->pixels+s->pitch*y;
+		p=((Uint8 *) s->pixels)+s->pitch*y;
 		op=o->pixels[0]+o->pitches[0]*y;
 		for(x=0; x<s->w && x<o->w; x++)
 		{
--- ./ltmain.sh	Sat Jun  8 15:33:48 2002
+++ ../SDL-1.2.5/./ltmain.sh	Mon Mar  3 17:44:53 2003
@@ -60,7 +60,7 @@
 default_mode=
 help="Try \`$progname --help' for more information."
 magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
+mkdir="mkdir -p"
 mv="mv -f"
 rm="rm -f"
 
--- ./configure	Sun Oct  6 16:35:02 2002
+++ ../SDL-1.2.5/./configure	Tue Mar  4 15:49:56 2003
@@ -3223,10 +3223,11 @@
         if test x$have_dmedia = xyes; then
             CFLAGS="$CFLAGS -DDMEDIA_SUPPORT"
             AUDIO_SUBDIRS="$AUDIO_SUBDIRS dmedia"
-            AUDIO_DRIVERS="$AUDIO_DRIVERS dmedia/libaudio_dmedia.la"
+            AUDIO_DRIVERS="$AUDIO_DRIVERS dmedia/libaudio_dmedia.a"
             SYSTEM_LIBS="$SYSTEM_LIBS -laudio"
         fi
     fi
+echo "$ac_t""$have_dmedia" 1>&6
 }
 
 CheckESD()
@@ -3501,7 +3502,7 @@
                 SYSTEM_LIBS="$SYSTEM_LIBS $ESD_LIBS"
             fi
             AUDIO_SUBDIRS="$AUDIO_SUBDIRS esd"
-            AUDIO_DRIVERS="$AUDIO_DRIVERS esd/libaudio_esd.la"
+            AUDIO_DRIVERS="$AUDIO_DRIVERS esd/libaudio_esd.a"
         fi
     fi
 }
@@ -3611,7 +3612,7 @@
                     SYSTEM_LIBS="$SYSTEM_LIBS $ARTSC_LIBS"
                 fi
                 AUDIO_SUBDIRS="$AUDIO_SUBDIRS arts"
-                AUDIO_DRIVERS="$AUDIO_DRIVERS arts/libaudio_arts.la"
+                AUDIO_DRIVERS="$AUDIO_DRIVERS arts/libaudio_arts.a"
             fi
         fi
     fi
@@ -3633,14 +3634,18 @@
         have_nas=no
         if test -r /usr/X11R6/include/audio/audiolib.h; then
             have_nas=yes
-        fi
-        echo "$ac_t""$have_nas" 1>&6
-        if test x$have_nas = xyes; then
             CFLAGS="$CFLAGS -DNAS_SUPPORT"
             SYSTEM_LIBS="$SYSTEM_LIBS -laudio -lXt"
             AUDIO_SUBDIRS="$AUDIO_SUBDIRS nas"
-            AUDIO_DRIVERS="$AUDIO_DRIVERS nas/libaudio_nas.la"
+            AUDIO_DRIVERS="$AUDIO_DRIVERS nas/libaudio_nas.a"
+        elif test -r $ROOT/usr/freeware/include/nas/audiolib.h; then
+            have_nas=yes
+            CFLAGS="$CFLAGS -DNAS_SUPPORT"
+            SYSTEM_LIBS="$SYSTEM_LIBS -lnas -lXt"
+            AUDIO_SUBDIRS="$AUDIO_SUBDIRS nas"
+            AUDIO_DRIVERS="$AUDIO_DRIVERS nas/libaudio_nas.a"
         fi
+        echo "$ac_t""$have_nas" 1>&6
     fi
 }
 
@@ -3657,7 +3662,7 @@
     if test x$enable_audio = xyes -a x$enable_diskaudio = xyes; then
         CFLAGS="$CFLAGS -DDISKAUD_SUPPORT"
         AUDIO_SUBDIRS="$AUDIO_SUBDIRS disk"
-        AUDIO_DRIVERS="$AUDIO_DRIVERS disk/libaudio_disk.la"
+        AUDIO_DRIVERS="$AUDIO_DRIVERS disk/libaudio_disk.a"
     fi
 }
 
@@ -4700,7 +4705,7 @@
             fi
             SYSTEM_LIBS="$SYSTEM_LIBS $X_LIBS -lX11 -lXext"
             VIDEO_SUBDIRS="$VIDEO_SUBDIRS x11"
-            VIDEO_DRIVERS="$VIDEO_DRIVERS x11/libvideo_x11.la"
+            VIDEO_DRIVERS="$VIDEO_DRIVERS x11/libvideo_x11.a"
 
             # Check whether --enable-video-x11-vm or --disable-video-x11-vm was given.
 if test "${enable_video_x11_vm+set}" = set; then
@@ -4740,7 +4745,7 @@
                 if test x$video_x11_vm = xyes; then
                     CFLAGS="$CFLAGS -DXFREE86_VM"
                     VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xxf86vm"
-                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xxf86vm/libXFree86_Xxf86vm.la"
+                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xxf86vm/libXFree86_Xxf86vm.a"
                     echo $ac_n "checking for XFree86 VidMode gamma support""... $ac_c" 1>&6
 echo "configure:4746: checking for XFree86 VidMode gamma support" >&5
                     video_x11_vmgamma=no
@@ -4822,7 +4827,7 @@
                         CFLAGS="$CFLAGS -DDEFAULT_DGAMOUSE"
                     fi
                     VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xxf86dga"
-                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xxf86dga/libXFree86_Xxf86dga.la"
+                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xxf86dga/libXFree86_Xxf86dga.a"
                 fi
             fi
             # Check whether --enable-video-x11-xv or --disable-video-x11-xv was given.
@@ -4867,7 +4872,7 @@
                 if test x$video_x11_xv = xyes; then
                     CFLAGS="$CFLAGS -DXFREE86_XV"
                     VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xv"
-                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xv/libXFree86_Xv.la"
+                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xv/libXFree86_Xv.a"
                 fi
             fi
             # Check whether --enable-video-x11-xinerama or --disable-video-x11-xinerama was given.
@@ -4909,7 +4914,7 @@
                 if test x$video_x11_xinerama = xyes; then
                     CFLAGS="$CFLAGS -DHAVE_XINERAMA"
                     VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xinerama"
-                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xinerama/libXFree86_Xinerama.la"
+                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xinerama/libXFree86_Xinerama.a"
                 fi
             fi
             # Check whether --enable-video-x11-xme or --disable-video-x11-xme was given.
@@ -5415,7 +5420,7 @@
             SYSTEM_LIBS="$SYSTEM_LIBS -laa"
 
             VIDEO_SUBDIRS="$VIDEO_SUBDIRS aalib"
-            VIDEO_DRIVERS="$VIDEO_DRIVERS aalib/libvideo_aa.la"
+            VIDEO_DRIVERS="$VIDEO_DRIVERS aalib/libvideo_aa.a"
         fi
     fi
 }
@@ -5554,7 +5559,7 @@
     if test x$enable_video_dummy = xyes; then
       CFLAGS="$CFLAGS -DENABLE_DUMMYVIDEO"
       VIDEO_SUBDIRS="$VIDEO_SUBDIRS dummy"
-      VIDEO_DRIVERS="$VIDEO_DRIVERS dummy/libvideo_null.la"
+      VIDEO_DRIVERS="$VIDEO_DRIVERS dummy/libvideo_null.a"
     fi
 }
 
@@ -7586,13 +7591,13 @@
         # (No joystick support yet)
         if test x$enable_joystick = xyes; then
             JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS dummy"
-            JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS dummy/libjoystick_dummy.la"
+            JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS dummy/libjoystick_dummy.a"
         fi
         # Set up files for the cdrom library
         # (No CD-ROM support yet)
         if test x$enable_cdrom = xyes; then
             CDROM_SUBDIRS="$CDROM_SUBDIRS dummy"
-            CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la"
+            CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.a"
         fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then