Remove built-in speaker support

The changes to amiga, mac and msdos builds are untested.

sys/amiga/Makefile.ami

@@ -389,7 +389,7 @@ MAKEDEFOBJ = \
 	$(O)monstr.o
 
 AMIGAOBJ = \
-	$(O)amidos.o	$(O)amirip.o 	$(O)amisnd.o	$(O)amistack.o \
+	$(O)amidos.o	$(O)amirip.o 	$(O)amistack.o \
 	$(O)amiwind.o	$(O)winami.o	$(O)winchar.o	$(O)winfuncs.o	\
 	$(O)winkey.o	$(O)winmenu.o	$(O)winreq.o	$(O)winstr.o
 
@@ -475,16 +475,6 @@ XDFILES=	$(ADFILES) $(BDFILES) $(CDFILES) $(HDFILES) $(KDFILES) \
 		$(MDFILES) $(PDFILES) $(RDFILES) $(RANFILES) $(SDFILES) $(TDFILES) \
 		$(VDFILES) $(WDFILES)
 
-SOUNDFILES= \
-	$(SBIN)cvtsnd \
-	$(SLIB)sounds \
-	$(SLIB)sounds/Bell $(SLIB)sounds/Bugle \
-	$(SLIB)sounds/Drum_Of_Earthquake \
-	$(SLIB)sounds/Fire_Horn $(SLIB)sounds/Frost_Horn \
-	$(SLIB)sounds/Leather_Drum $(SLIB)sounds/Magic_Flute \
-	$(SLIB)sounds/Magic_Harp $(SLIB)sounds/Tooled_Horn \
-	$(SLIB)sounds/Wooden_Flute $(SLIB)sounds/Wooden_Harp
-
 TILEFILES= \
 	$(SBIN)txt2iff \
 	$(NETHACK)tiles \
@@ -533,7 +523,7 @@ LIBFILES= \
 all:  $(COMPACT_HEADERS) $(SBIN)lev_comp $(SBIN)dgn_comp $(SBIN)NetHack \
 	$(SBIN)dlb $(NETHACK)recover
 
-install: all inst-data inst-dungeon inst-fonts inst-sounds inst-tiles \
+install: all inst-data inst-dungeon inst-fonts inst-tiles \
 	$(NETHACK)nhdat $(NETHACK)NetHack
 
 $(SBIN)NetHack:  $(HOBJ) $(AMI)ami.lnk
@@ -604,7 +594,7 @@ clean:
 
 spotless:  clean
 	-delete $(SBIN)NetHack $(SBIN)lev_comp $(SBIN)makedefs $(SBIN)dgn_comp
-	-delete $(SBIN)cvtsnd $(SBIN)dlb $(SBIN)txt2iff $(SBIN)splitter
+	-delete $(SBIN)dlb $(SBIN)txt2iff $(SBIN)splitter
 	-delete $(SBIN)tilemap
 	-delete $(SLIB)data $(SLIB)rumors
 	-delete $(SLIB)\#?.lev
@@ -839,8 +829,6 @@ $(O)amirip.o:  $(AMI)amirip.c $(HDEP)
 $(O)aglue.o:  $(AMI)aglue.a
 	$(ASM) $(AFLAGS) $(AOBJSPEC)$(O)aglue.o $(AMI)aglue.a
 
-$(O)amisnd.o:	$(AMI)amisnd.c $(HDEP)
-
 $(O)winchar.o:	$(AMI)winchar.c $(NHS)tile.c $(HDEP)
 
 $(NHS)tile.c:	$(WSHARE)tilemap.c
@@ -972,82 +960,6 @@ $(NETHACK)tiles/monsters.iff: $(WSHARE)monsters.txt $(SBIN)txt2iff
 $(NETHACK)tiles/other.iff: $(WSHARE)other.txt $(SBIN)txt2iff
 	$(SBIN)txt2iff $(WSHARE)other.txt $(NETHACK)tiles/other.iff
 
-# Sound installation rules.
-inst-sounds: $(SOUNDFILES)
-	list to T:nhsdat.lst $(SLIB)sounds QUICK NOHEAD
-	echo  >T:make-nhsdat $(SBIN)dlb cCfI $(SLIB)sounds $(NETHACK)nhsdat T:nhsdat.lst
-	echo >>T:make-nhsdat if not exists $(NETHACK)nhsdat
-	echo >>T:make-nhsdat copy $(SLIB)sounds/\#? $(NETHACK)sounds
-	echo >>T:make-nhsdat endif
-	execute T:make-nhsdat
-	-delete T:make-nhsdat
-
-#SFD_INSTEAD $(SLIB)sounds: $(SLIB)sounds
-$(SLIB)sounds:
-	-makedir $(SLIB)sounds
-
-$(SBIN)cvtsnd: $(OO)cvtsnd.o
-	$(LINK) $(LNSPEC) $@ $(LIN) $(OO)cvtsnd.o $(FLLIB)
-
-$(OO)cvtsnd.o: $(AMI)cvtsnd.c
-#SFD_INSTEAD $(CC) $(CFLAGS) $(OBJSPEC)%(left) %(right)
-#none
-
-$(SLIB)sounds/Bell: $(SHARE)sounds/bell.uu
-	$(UUDEC) $(SHARE)sounds/bell.uu
-	$(SBIN)cvtsnd Bell $(SLIB)sounds/Bell
-	-delete Bell
-
-$(SLIB)sounds/Bugle: $(SHARE)sounds/bugle.uu
-	$(UUDEC) $(SHARE)sounds/bugle.uu
-	$(SBIN)cvtsnd Bugle $(SLIB)sounds/Bugle
-	-delete Bugle
-
-$(SLIB)sounds/Drum_Of_Earthquake: $(SHARE)sounds/erthdrum.uu
-	$(UUDEC) $(SHARE)sounds/erthdrum.uu
-	$(SBIN)cvtsnd Drum_Of_Earthquake $(SLIB)sounds/Drum_Of_Earthquake
-	-delete Drum_Of_Earthquake
-
-$(SLIB)sounds/Fire_Horn: $(SHARE)sounds/firehorn.uu
-	$(UUDEC) $(SHARE)sounds/firehorn.uu
-	$(SBIN)cvtsnd Fire_Horn $(SLIB)sounds/Fire_Horn
-	-delete Fire_Horn
-
-$(SLIB)sounds/Frost_Horn: $(SHARE)sounds/frsthorn.uu
-	$(UUDEC) $(SHARE)sounds/frsthorn.uu
-	$(SBIN)cvtsnd Frost_Horn $(SLIB)sounds/Frost_Horn
-	-delete Frost_Horn
-
-$(SLIB)sounds/Leather_Drum: $(SHARE)sounds/lethdrum.uu
-	$(UUDEC) $(SHARE)sounds/lethdrum.uu
-	$(SBIN)cvtsnd Leather_Drum $(SLIB)sounds/Leather_Drum
-	-delete Leather_Drum
-
-$(SLIB)sounds/Magic_Flute: $(SHARE)sounds/mgcflute.uu
-	$(UUDEC) $(SHARE)sounds/mgcflute.uu
-	$(SBIN)cvtsnd Magic_Flute $(SLIB)sounds/Magic_Flute
-	-delete Magic_Flute
-
-$(SLIB)sounds/Magic_Harp: $(SHARE)sounds/mgcharp.uu
-	$(UUDEC) $(SHARE)sounds/mgcharp.uu
-	$(SBIN)cvtsnd Magic_Harp $(SLIB)sounds/Magic_Harp
-	-delete Magic_Harp
-
-$(SLIB)sounds/Tooled_Horn: $(SHARE)sounds/toolhorn.uu
-	$(UUDEC) $(SHARE)sounds/toolhorn.uu
-	$(SBIN)cvtsnd Tooled_Horn $(SLIB)sounds/Tooled_Horn
-	-delete Tooled_Horn
-
-$(SLIB)sounds/Wooden_Flute: $(SHARE)sounds/wdnflute.uu
-	$(UUDEC) $(SHARE)sounds/wdnflute.uu
-	$(SBIN)cvtsnd Wooden_Flute $(SLIB)sounds/Wooden_Flute
-	-delete Wooden_Flute
-
-$(SLIB)sounds/Wooden_Harp: $(SHARE)sounds/wdnharp.uu
-	$(UUDEC) $(SHARE)sounds/wdnharp.uu
-	$(SBIN)cvtsnd Wooden_Harp $(SLIB)sounds/Wooden_Harp
-	-delete Wooden_Harp
-
 inst-dungeon: $(INSTDUNGEONFILES)
 
 $(NETHACK)options : $(DAT)options