[SCM] libav/experimental: suppressed nasm stuff

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 4300403eca3e9071f09bcd7871cf0c3eab5bdfef
Author: Fabrice Bellard <fabrice at bellard.org>
Date:   Wed Aug 15 22:30:51 2001 +0000

    suppressed nasm stuff
    
    
    Originally committed as revision 108 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 8738ddd..1c34c1c 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -25,10 +25,9 @@ endif
 
 # i386 mmx specific stuff
 ifeq ($(TARGET_MMX),yes)
-ASM_OBJS += i386/fdct_mmx.o i386/sad_mmx.o
-OBJS += i386/fdctdata.o i386/cputest.o \
+OBJS += i386/fdct_mmx.o i386/cputest.o \
 	i386/dsputil_mmx.o i386/mpegvideo_mmx.o \
-        i386/idct_mmx.o
+        i386/idct_mmx.o i386/motion_est_mmx.o
 endif
 
 # armv4l specific stuff
@@ -40,7 +39,7 @@ endif
 SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
 
 LIB= libavcodec.a
-TESTS= imgresample-test dct-test
+TESTS= imgresample-test dct-test motion-test
 
 all: $(LIB)
 tests: apiexample cpuid_test $(TESTS)
@@ -57,9 +56,6 @@ dsputil.o: dsputil.c dsputil.h
 %.o: %.S
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-%.o: %.s
-	nasm -f elf -o $@ $<
-
 # depend only used by mplayer now
 dep:	depend
 
@@ -89,10 +85,13 @@ cpuid_test: i386/cputest.c
 imgresample-test: imgresample.c
 	$(CC) $(CFLAGS) -DTEST -o $@ $^ 
 
-dct-test: dct-test.o jfdctfst.o i386/fdct_mmx.o i386/fdctdata.o \
+dct-test: dct-test.o jfdctfst.o i386/fdct_mmx.o \
           fdctref.o jrevdct.o i386/idct_mmx.o
 	$(CC) -o $@ $^
 
+motion-test: motion_test.o $(LIB)
+	$(CC) -o $@ $^
+
 #
 # include dependency files if they exist
 #

-- 
Libav/FFmpeg packaging