--- sv7/Makefile.orig	2007-12-17 10:02:42.000000000 -0800
+++ sv7/Makefile	2007-12-17 10:07:16.000000000 -0800
@@ -254,20 +254,19 @@
 
 # Lists of object and C files
 
-MPPDEC_OBJ = cpu_feat.o decode.o http.o huffsv7.o huffsv46.o id3tag.o mppdec.o profile.o requant.o synth.o synthasm.o synthtab.o toolsd.o wave_out.o stderr.o _setargv.o
-MPPDEC_SRC =            decode.c http.c huffsv7.c huffsv46.c id3tag.c mppdec.c profile.c requant.c synth.c            synthtab.c tools.c  wave_out.c stderr.c _setargv.c
-MPPDEC_ASO = cpu_feat.o                                                                                     synthasm.o
+MPPDEC_OBJ = decode.o http.o huffsv7.o huffsv46.o id3tag.o mppdec.o profile.o requant.o synth.o synthtab.o toolsd.o wave_out.o stderr.o _setargv.o
+MPPDEC_SRC = decode.c http.c huffsv7.c huffsv46.c id3tag.c mppdec.c profile.c requant.c synth.c synthtab.c tools.c  wave_out.c stderr.c _setargv.c
+MPPDEC_ASO =
 
-
-MPPENC_OBJ = analy_filter.o ans.o bitstream.o cvd.o fft4g.o fft4gasm.o fft_routines.o mppenc.o profile.o psy.o psy_tab.o quant.o huffsv7e.o encode_sv7.o wave_in.o tags.o toolse.o fastmath.o pipeopen.o stderr.o regress.o keyboard.o
+MPPENC_OBJ = analy_filter.o ans.o bitstream.o cvd.o fft4g.o fft_routines.o mppenc.o profile.o psy.o psy_tab.o quant.o huffsv7e.o encode_sv7.o wave_in.o tags.o toolse.o fastmath.o pipeopen.o stderr.o regress.o keyboard.o
 ifdef MINGW
 MPPENC_OBJ += winmsg.o
 endif
-MPPENC_SRC = analy_filter.c ans.c bitstream.c cvd.c fft4g.c            fft_routines.c mppenc.c profile.c psy.c psy_tab.c quant.c huffsv7.c  encode_sv7.c wave_in.c tags.c tools.c  fastmath.c pipeopen.c stderr.c regress.c keyboard.c
+MPPENC_SRC = analy_filter.c ans.c bitstream.c cvd.c fft4g.c fft_routines.c mppenc.c profile.c psy.c psy_tab.c quant.c huffsv7.c  encode_sv7.c wave_in.c tags.c tools.c fastmath.c pipeopen.c stderr.c regress.c keyboard.c
 ifdef MINGW
 MPPENC_SRC += winmsg.c
 endif
-MPPENC_ASO =                                                fft4gasm.o
+MPPENC_ASO = 
 
 
 REPLAY_OBJ = replaygain.o gain_analysis.o pipeopen.o stderr.o _setargv.o
@@ -436,15 +435,6 @@
 wave_out.o: $(OTHER_DEPEND_DEC)
 	$(CC) -c -DMPP_DECODER $(CFLAGS) wave_out.c
 
-synthasm.o: $(OTHER_DEPEND_ASM) synthasm.nas
-	$(RM_F) synthasm.lst
-	$(NASM) $(NASMFLAGS) synthasm.nas -o synthasm.o -l synthasm.lst
-
-cpu_feat.o: $(OTHER_DEPEND_ASM) cpu_feat.nas
-	$(RM_F) cpu_feat.lst
-	$(NASM) $(NASMFLAGS) cpu_feat.nas -o cpu_feat.o -l cpu_feat.lst
-
-
 ################################################################################
 #
 # Compile mppenc source code files
@@ -479,9 +469,6 @@
 fft4g.o:        $(OTHER_DEPEND_ENC) fft4g.c
 	$(CC) -c $(CFLAGS) -DMPP_ENCODER -fno-omit-frame-pointer -O fft4g.c
 
-fft4gasm.o:     $(OTHER_DEPEND_ASM) fft4gasm.nas
-	$(NASM) $(NASMFLAGS) fft4gasm.nas -o fft4gasm.o -l fft4gasm.lst
-
 fft_routines.o: $(OTHER_DEPEND_ENC)
 	$(CC) -c $(CFLAGS) -DMPP_ENCODER fft_routines.c